From 53d9a174f4f05c94c0fe392a83deb310095310b1 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 20 Feb 2015 20:11:18 +0000 Subject: xymon: add smart monitor hobbit-myth-orphan.sh: add some help text --- abs/core/xymon/PKGBUILD | 23 ++++++++----- abs/core/xymon/clientlaunch.cfg.patch | 18 ++++++---- abs/core/xymon/hobbit-myth-orphan.sh | 36 +++++++------------ abs/core/xymon/tasks.d.mv | 8 ++++- abs/core/xymon/xymon-client.rules | 3 ++ abs/core/xymon/xymon-server.rules | 1 + abs/core/xymon/xymon-smart.sh | 65 +++++++++++++++++++++++++++++++++++ abs/core/xymon/xymonserver.cfg.diff | 2 +- 8 files changed, 116 insertions(+), 40 deletions(-) create mode 100644 abs/core/xymon/xymon-client.rules create mode 100755 abs/core/xymon/xymon-smart.sh diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD index e8908cc..f171831 100755 --- a/abs/core/xymon/PKGBUILD +++ b/abs/core/xymon/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=xymon pkgname=('xymonserver' 'xymonclient') pkgver=4.3.17 -pkgrel=11 +pkgrel=12 pkgdesc="Xymon is a system for monitoring of hosts and networks" license="GPL" arch=('i686' 'x86_64') @@ -25,14 +25,16 @@ source=("https://downloads.sourceforge.net/project/xymon/Xymon/$pkgver/$pkgbase- 'alerts.cfg' 'hobbit_myth_data.py' 'xymon-gputemp.sh' + 'xymon-smart.sh' 'logrotate-server.xymon' 'logrotate-client.xymon' 'log_list.sh' 'client-local.cfg.patch' 'led_themes.tar.gz' 'xymon-server.rules' + 'xymon-client.rules' 'hosts.cfg.patch') -depends=('rrdtool' 'fping' 'pcre' 'python2' 'graphviz') +depends=('rrdtool' 'fping' 'pcre' 'python2' 'graphviz' 'smartmontools') install=xymon.install build() { @@ -81,6 +83,7 @@ package_xymonserver(){ install -D -m755 ${srcdir}/hobbit_myth_data.py ${pkgdir}/home/xymon/server/ext/hobbit_myth_data.py install -D -m755 ${srcdir}/hobbit-mem-myth.sh ${pkgdir}/home/xymon/server/ext/hobbit-mem-myth.sh install -D -m755 ${srcdir}/xymon-gputemp.sh ${pkgdir}/home/xymon/server/ext/xymon-gputemp.sh + install -D -m755 ${srcdir}/xymon-smart.sh ${pkgdir}/home/xymon/server/ext/xymon-smart.sh install -D -m755 ${srcdir}/log_list.sh ${pkgdir}/home/xymon/client/bin/log_list.sh install -m755 analysis.cfg ${pkgdir}/home/xymon/etc/analysis.cfg @@ -134,14 +137,16 @@ package_xymonserver(){ package_xymonclient(){ #create client package as well - depends=() + depends=('smartmontools') backup=('data/srv/xymon/client/etc/xymonclient.cfg') install=xymon-client.install + install -D -m400 ${srcdir}/xymon-client.rules ${pkgdir}/etc/sudoers.d/xymon_client install -D -m755 ${srcdir}/log_list.sh ${pkgdir}/home/xymon/client/bin/log_list.sh install -D -m644 ${srcdir}/logrotate-client.xymon ${pkgdir}/etc/logrotate.d/xymon-client install -D -m755 ${srcdir}/hobbit-mem-myth.sh ${pkgdir}/home/xymon/client/ext/hobbit-mem-myth.sh install -D -m755 ${srcdir}/xymon-gputemp.sh ${pkgdir}/home/xymon/client/ext/xymon-gputemp.sh + install -D -m755 ${srcdir}/xymon-smart.sh ${pkgdir}/home/xymon/client/ext/xymon-smart.sh cp -rp ${pkgdir}/../xymonserver/home/xymon/client/ ${pkgdir}/home/xymon/ cd - @@ -154,12 +159,12 @@ md5sums=('d8d119a777e7b7204d1292fb27314312' 'a0fbb9cbeb3600a40943e6205790f22f' 'c60b0d59bb39505ee3d62c6dd65429c5' '53f1af1054d3c70f4d6b6fe952cf7e11' - 'b2f404913400a25f13c63b27f064ad2e' - 'e40c31eb53ef17c0c544389a525de957' - '3ad3ce12b84cca82dd34ef97984c315e' + '510f36dfada9439f09327da5278bcdb1' + 'c9f93372dce3489e23fb601a941818bb' + '8d024dfc58bacdfedfbddf8e78fd53eb' 'b2f98ac0df013332deedc1efae0a270d' '4a8244c1bb44fe35ca7372355b01cec4' - '526c169e020b570b5b02661a831aa4e6' + 'aa7c2eec6cd894dc171e90a4eed69de1' '166279c006c3ef7bf0c21537cf89fc83' '80d9cfac86c6d96836e6f406e35e7cf5' 'd210c43fb9ee9ad6cd7648e0c2e0efea' @@ -171,10 +176,12 @@ md5sums=('d8d119a777e7b7204d1292fb27314312' '9af2ad60ac4c3cb653754618f603e311' 'a9b7f0a22f29f55b2928160bc44f2c14' '6452d891d88bb46d07bcf7790a523ad0' + '1348bef3cdd20ec0ea66d61ac1834847' 'b4e8641e97e6b689dbc634af785e6799' 'e2844513e2c92e8b5084818f3b2a478d' '98e9242ae346f729b14cb195786571f2' '31ac5c1f6dcc9408b64c4107b325a9a6' 'c7178bbf384bbe86c318b60fef6faf10' - '72bf7caf0f53928d97ff5cd9810d6d4d' + '2871c53627e9e125922118013a868a95' + 'cdfbca43dbae4ce0ca72dd002ec22af1' '606f535a49f32b35802ed9d46bd7d068') diff --git a/abs/core/xymon/clientlaunch.cfg.patch b/abs/core/xymon/clientlaunch.cfg.patch index 8c1915a..0348c6c 100755 --- a/abs/core/xymon/clientlaunch.cfg.patch +++ b/abs/core/xymon/clientlaunch.cfg.patch @@ -1,9 +1,9 @@ ---- clientlaunch.cfg.orig 2014-10-25 11:56:01.947006791 -0500 -+++ clientlaunch.cfg 2014-10-25 11:57:02.632312788 -0500 -@@ -26,3 +26,14 @@ - LOGFILE $XYMONCLIENTLOGS/xymonclient.log - INTERVAL 5m - +--- clientlaunch.cfg.orig 2015-02-19 22:50:43.102571615 +0000 ++++ clientlaunch.cfg 2015-02-20 14:41:10.594633850 +0000 +@@ -26,3 +26,20 @@ + LOGFILE $XYMONCLIENTLOGS/xymonclient.log + INTERVAL 5m + +[memmyth] + ENVFILE $XYMONCLIENTHOME/etc/xymonclient.cfg + CMD /home/xymon/client/ext/hobbit-mem-myth.sh @@ -15,3 +15,9 @@ + CMD /home/xymon/client/ext/xymon-gputemp.sh + LOGFILE $XYMONCLIENTLOGS/xymon-gputemp.log + INTERVAL 5m ++ ++[smart] ++ ENVFILE $XYMONCLIENTHOME/etc/xymonclient.cfg ++ CMD /home/xymon/client/ext/xymon-smart.sh ++ LOGFILE $XYMONCLIENTLOGS/xymon-smart.log ++ INTERVAL 30m diff --git a/abs/core/xymon/hobbit-myth-orphan.sh b/abs/core/xymon/hobbit-myth-orphan.sh index cc4ca30..ff91fb5 100644 --- a/abs/core/xymon/hobbit-myth-orphan.sh +++ b/abs/core/xymon/hobbit-myth-orphan.sh @@ -2,13 +2,10 @@ TMPFILE=/tmp/oprhan.result MYTHCONFDIR=/usr/share/mythtv /usr/LH/bin/find_orphans.py --printonly > $TMPFILE - COLUMN=orphan # Name of the column COLOR=green # By default, everything is OK -MSG="No Orphans Found." - - +MSG="No Orphans Found." #yellow for i in "Orphaned video files" "Orphaned snapshots" "Database backups" "Other files" "Recordings with missing files" "Zero byte recordings" @@ -22,27 +19,18 @@ do fi done -#red -#for i in "Recordings with missing files" "Zero byte recordings" -#do -# grep -q "$i" $TMPFILE -# status=$? -# if [ $status -eq 0 ] -# then -# COLOR="red" -# MSG="Problems with $i" -# fi -#done - +if [[ $MSG != "No Orphans Found." ]] +then MSG=" ${MSG} - `cat $TMPFILE` " -# Tell Hobbit about it -$BB $BBDISP "status $MACHINE.$COLUMN $COLOR `date` - ${MSG} - " -exit 0 - - + `cat $TMPFILE` +From System >> Terminal run find_orphans.py to clean up these issues. +" +fi +# Tell Hobbit about it +$BB $BBDISP "status $MACHINE.$COLUMN $COLOR Results from find_orphans.py + ${MSG} + " +exit 0 diff --git a/abs/core/xymon/tasks.d.mv b/abs/core/xymon/tasks.d.mv index 02afc14..f8ce177 100755 --- a/abs/core/xymon/tasks.d.mv +++ b/abs/core/xymon/tasks.d.mv @@ -42,4 +42,10 @@ ENVFILE $XYMONCLIENTHOME/etc/xymonclient.cfg CMD /home/xymon/server/ext/xymon-gputemp.sh LOGFILE $BBSERVERLOGS/xymon-gputemp.log - INTERVAL 5m \ No newline at end of file + INTERVAL 5m + +[smart] + ENVFILE $XYMONCLIENTHOME/etc/xymonclient.cfg + CMD /home/xymon/server/ext/xymon-smart.sh + LOGFILE $BBSERVERLOGS/xymon-smart.log + INTERVAL 30m diff --git a/abs/core/xymon/xymon-client.rules b/abs/core/xymon/xymon-client.rules new file mode 100644 index 0000000..f13b3f6 --- /dev/null +++ b/abs/core/xymon/xymon-client.rules @@ -0,0 +1,3 @@ +#These rules are used by xymon-client +nobody ALL = NOPASSWD:/usr/bin/smartctl + diff --git a/abs/core/xymon/xymon-server.rules b/abs/core/xymon/xymon-server.rules index b0f6100..e4c515b 100644 --- a/abs/core/xymon/xymon-server.rules +++ b/abs/core/xymon/xymon-server.rules @@ -1,5 +1,6 @@ #These rules are used by xymon-server nobody ALL = NOPASSWD:/usr/bin/certmaster-ca +nobody ALL = NOPASSWD:/usr/bin/smartctl http ALL = NOPASSWD:/usr/LH/bin/lh_system_backup_job http ALL = NOPASSWD:/usr/LH/bin/lh_system_restore_job http ALL = NOPASSWD:/sbin/sv diff --git a/abs/core/xymon/xymon-smart.sh b/abs/core/xymon/xymon-smart.sh new file mode 100755 index 0000000..1ad3cc7 --- /dev/null +++ b/abs/core/xymon/xymon-smart.sh @@ -0,0 +1,65 @@ +#!/bin/sh + +# NOTE: Must be run as root, so you probably need to setup sudo for this. + +if test -f /tmp/dres; then rm -f /tmp/dres; fi + +# MODIFY below to match your setup - the "scsi-SATA" is pretty generic, but you +# can add more disks if you like. E.g. I have a USB disk permanently plugged in. + +ls /dev/disk/by-id/scsi-* /dev/disk/by-id/ata-* /dev/disk/by-id/usb-* | grep -v -- -part | sort | +while read DISK +do + DISKDEV=`ls -l $DISK | awk -F/ '{print $NF}'` + + #check if disk is removable + RM=`cat /sys/block/$DISKDEV/removable` + if test $RM -ne 0 + then + continue + fi + + DRES=`sudo /usr/sbin/smartctl -H -n standby $DISK` + DCODE=$? + DSTBY=$(( $DCODE & 2 )) + DFAIL=$(( $DCODE & 8 )) + DWARN=$(( $DCODE & 32 )) + + if test $DSTBY -ne 0 + then + COLOR="4&clear" + elif test $DFAIL -ne 0 + then + COLOR="1&red" + elif test $DWARN -ne 0 + then + COLOR="2&yellow" + else + COLOR="3&green" + fi + + echo "${COLOR} $DISK (/dev/$DISKDEV)" + + echo "${COLOR} $DISK (/dev/$DISKDEV)" | cut -c2- >>/tmp/dres + echo "" >>/tmp/dres + echo "$DRES" | egrep -v "^smartctl|^Copyright|^$|^===" >>/tmp/dres + echo "-----------------------------------------------------------------------------" >>/tmp/dres + echo "" >>/tmp/dres + echo "" >>/tmp/dres +done >/tmp/dcheck + +COLOR=`cat /tmp/dcheck | awk '{print $1}' | sort | uniq | head -1 | cut -c3-` + +$XYMON $XYMSRV "status ${MACHINE}.smart ${COLOR} SMART Health Check + +`cat /tmp/dcheck | cut -c2-` + +============================== Detailed status ============================== + +`cat /tmp/dres` +" + +rm -f /tmp/dres /tmp/dcheck + +exit 0 + diff --git a/abs/core/xymon/xymonserver.cfg.diff b/abs/core/xymon/xymonserver.cfg.diff index 8850670..5432767 100755 --- a/abs/core/xymon/xymonserver.cfg.diff +++ b/abs/core/xymon/xymonserver.cfg.diff @@ -18,7 +18,7 @@ # status view of a test should include a graph. -TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond" +#TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond" -+TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage=ncv,memmbe=ncv,memmfe=ncv,gputemp=ncv" ++TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage=ncv,memmbe=ncv,memmfe=ncv,gputemp=ncv,smart" # This defines which RRD files to include on the "trends" column webpage, # and the order in which they appear. -- cgit v0.12 From 4fa58e575df074c999db5cbc13a2488131597fcc Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 5 Mar 2015 01:10:11 +0000 Subject: xymon: add hddtemp module --- abs/core/xymon/PKGBUILD | 20 ++++++----- abs/core/xymon/clientlaunch.cfg.patch | 10 ++++-- abs/core/xymon/graphs.cfg.diff | 63 +++++++++++++++++++++++++++++++++++ abs/core/xymon/tasks.d.mv | 6 ++++ abs/core/xymon/xymon-hddtemp.sh | 50 +++++++++++++++++++++++++++ abs/core/xymon/xymon-smart.sh | 7 ++-- abs/core/xymon/xymonserver.cfg.diff | 19 ++++++----- 7 files changed, 151 insertions(+), 24 deletions(-) create mode 100755 abs/core/xymon/graphs.cfg.diff create mode 100755 abs/core/xymon/xymon-hddtemp.sh diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD index f171831..e7b9577 100755 --- a/abs/core/xymon/PKGBUILD +++ b/abs/core/xymon/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=xymon pkgname=('xymonserver' 'xymonclient') pkgver=4.3.17 -pkgrel=12 +pkgrel=13 pkgdesc="Xymon is a system for monitoring of hosts and networks" license="GPL" arch=('i686' 'x86_64') @@ -9,7 +9,7 @@ url="http://www.xymon.com/" source=("https://downloads.sourceforge.net/project/xymon/Xymon/$pkgver/$pkgbase-$pkgver.tar.gz" 'hobbitadd.py' 'xymon_ghost_check' - 'graph.cfg.diff' + 'graphs.cfg.diff' 'xymonserver.cfg.diff' 'tasks.d.mv' 'clientlaunch.cfg.patch' @@ -25,6 +25,7 @@ source=("https://downloads.sourceforge.net/project/xymon/Xymon/$pkgver/$pkgbase- 'alerts.cfg' 'hobbit_myth_data.py' 'xymon-gputemp.sh' + 'xymon-hddtemp.sh' 'xymon-smart.sh' 'logrotate-server.xymon' 'logrotate-client.xymon' @@ -83,6 +84,7 @@ package_xymonserver(){ install -D -m755 ${srcdir}/hobbit_myth_data.py ${pkgdir}/home/xymon/server/ext/hobbit_myth_data.py install -D -m755 ${srcdir}/hobbit-mem-myth.sh ${pkgdir}/home/xymon/server/ext/hobbit-mem-myth.sh install -D -m755 ${srcdir}/xymon-gputemp.sh ${pkgdir}/home/xymon/server/ext/xymon-gputemp.sh + install -D -m755 ${srcdir}/xymon-hddtemp.sh ${pkgdir}/home/xymon/server/ext/xymon-hddtemp.sh install -D -m755 ${srcdir}/xymon-smart.sh ${pkgdir}/home/xymon/server/ext/xymon-smart.sh install -D -m755 ${srcdir}/log_list.sh ${pkgdir}/home/xymon/client/bin/log_list.sh @@ -110,7 +112,7 @@ package_xymonserver(){ #apply patches to conf file install -D -m775 ${srcdir}/tasks.d.mv ${pkgdir}/home/xymon/etc/tasks.d/mv.cfg cd ${pkgdir}/home/xymon/etc - patch -p0 < ${srcdir}/graph.cfg.diff || return 1 + patch -p0 < ${srcdir}/graphs.cfg.diff || return 1 patch -p0 < ${srcdir}/xymonserver.cfg.diff || return 1 patch -p3 < ${srcdir}/client-local.cfg.patch || return 1 patch -p3 < ${srcdir}/hosts.cfg.patch || return 1 @@ -146,6 +148,7 @@ package_xymonclient(){ install -D -m644 ${srcdir}/logrotate-client.xymon ${pkgdir}/etc/logrotate.d/xymon-client install -D -m755 ${srcdir}/hobbit-mem-myth.sh ${pkgdir}/home/xymon/client/ext/hobbit-mem-myth.sh install -D -m755 ${srcdir}/xymon-gputemp.sh ${pkgdir}/home/xymon/client/ext/xymon-gputemp.sh + install -D -m755 ${srcdir}/xymon-hddtemp.sh ${pkgdir}/home/xymon/client/ext/xymon-hddtemp.sh install -D -m755 ${srcdir}/xymon-smart.sh ${pkgdir}/home/xymon/client/ext/xymon-smart.sh cp -rp ${pkgdir}/../xymonserver/home/xymon/client/ ${pkgdir}/home/xymon/ @@ -158,10 +161,10 @@ package_xymonclient(){ md5sums=('d8d119a777e7b7204d1292fb27314312' 'a0fbb9cbeb3600a40943e6205790f22f' 'c60b0d59bb39505ee3d62c6dd65429c5' - '53f1af1054d3c70f4d6b6fe952cf7e11' - '510f36dfada9439f09327da5278bcdb1' - 'c9f93372dce3489e23fb601a941818bb' - '8d024dfc58bacdfedfbddf8e78fd53eb' + '92bd5e8279c688fd854d514443bc733c' + 'f0fca78520f434918bd1be717d165073' + 'a19c8c546dcd95049476bb19f9d4e3ae' + '079833e3af5d74b93a86b5819dbf453b' 'b2f98ac0df013332deedc1efae0a270d' '4a8244c1bb44fe35ca7372355b01cec4' 'aa7c2eec6cd894dc171e90a4eed69de1' @@ -176,7 +179,8 @@ md5sums=('d8d119a777e7b7204d1292fb27314312' '9af2ad60ac4c3cb653754618f603e311' 'a9b7f0a22f29f55b2928160bc44f2c14' '6452d891d88bb46d07bcf7790a523ad0' - '1348bef3cdd20ec0ea66d61ac1834847' + '374ce9cc7b7cb8ae04bf89ed4d79a7be' + '6eb413053fde2110859c30737032b916' 'b4e8641e97e6b689dbc634af785e6799' 'e2844513e2c92e8b5084818f3b2a478d' '98e9242ae346f729b14cb195786571f2' diff --git a/abs/core/xymon/clientlaunch.cfg.patch b/abs/core/xymon/clientlaunch.cfg.patch index 0348c6c..980da4c 100755 --- a/abs/core/xymon/clientlaunch.cfg.patch +++ b/abs/core/xymon/clientlaunch.cfg.patch @@ -1,6 +1,6 @@ --- clientlaunch.cfg.orig 2015-02-19 22:50:43.102571615 +0000 -+++ clientlaunch.cfg 2015-02-20 14:41:10.594633850 +0000 -@@ -26,3 +26,20 @@ ++++ clientlaunch.cfg 2015-03-04 23:45:50.087484982 +0000 +@@ -26,3 +26,26 @@ LOGFILE $XYMONCLIENTLOGS/xymonclient.log INTERVAL 5m @@ -16,6 +16,12 @@ + LOGFILE $XYMONCLIENTLOGS/xymon-gputemp.log + INTERVAL 5m + ++[hddtemp] ++ ENVFILE $XYMONCLIENTHOME/etc/xymonclient.cfg ++ CMD /home/xymon/client/ext/xymon-hddtemp.sh ++ LOGFILE $XYMONCLIENTLOGS/xymon-hddtemp.log ++ INTERVAL 5m ++ +[smart] + ENVFILE $XYMONCLIENTHOME/etc/xymonclient.cfg + CMD /home/xymon/client/ext/xymon-smart.sh diff --git a/abs/core/xymon/graphs.cfg.diff b/abs/core/xymon/graphs.cfg.diff new file mode 100755 index 0000000..8b1b438 --- /dev/null +++ b/abs/core/xymon/graphs.cfg.diff @@ -0,0 +1,63 @@ +--- graphs.cfg.orig 2015-03-04 21:46:31.493387574 +0000 ++++ graphs.cfg 2015-03-04 21:47:26.972936010 +0000 +@@ -2100,4 +2100,60 @@ + GPRINT:qlen@RRDIDX@:AVERAGE: %6.1lf (avg)\n + + ########### end of ifmib graphs ########### ++[storage] ++ TITLE Storage Groups ++ YAXIS recordings ++ DEF:storage1=storage.rrd:rectvtotal:AVERAGE ++ LINE2:storage1#00CCCC:current recorded + ++ DEF:rectime=storage.rrd:rectvtime:AVERAGE ++ LINE2:rectime#000000:current recorded time ++ ++ DEF:livetime=storage.rrd:livetvtime:AVERAGE ++ LINE2:livetime#00CC11:current live time ++ ++ ++[memmbe] ++ TITLE Memory usage for MythBackend ++ YAXIS mythbackend ++ DEF:vmsize=memmbe.rrd:VmSize:AVERAGE ++ LINE2:vmsize#00CCCC:vmsize ++ ++ DEF:vmpeak=memmbe.rrd:VmPeak:AVERAGE ++ LINE2:vmpeak#000000:vmpeak ++ ++ DEF:vmrss=memmbe.rrd:VmRSS:AVERAGE ++ LINE2:vmrss#00CC11:vmrss ++ ++[memmfe] ++ TITLE Memory usage for MythFrontend ++ YAXIS mythfrontend ++ DEF:vmsize=memmfe.rrd:VmSize:AVERAGE ++ LINE2:vmsize#00CCCC:vmsize ++ ++ DEF:vmpeak=memmfe.rrd:VmPeak:AVERAGE ++ LINE2:vmpeak#000000:vmpeak ++ ++ DEF:vmrss=memmfe.rrd:VmRSS:AVERAGE ++ LINE2:vmrss#00CC11:vmrss ++ ++[gputemp] ++ TITLE GPU Temperature ++ YAXIS Temperature ++ DEF:gputemp=gputemp.rrd:GPUTEMP:AVERAGE ++ LINE2:gputemp#00CC11:gputemp ++ GPRINT:gputemp:LAST: \: %5.1lf (cur) ++ GPRINT:gputemp:MAX: \: %5.1lf (max) ++ GPRINT:gputemp:MIN: \: %5.1lf (min) ++ GPRINT:gputemp:AVERAGE: \: %5.1lf (avg)\n ++ ++[hddtemp] ++ FNPATTERN ^hddtemp.(.*).rrd ++ TITLE Hard Drive Temperatures ++ YAXIS Celsius ++ DEF:p@RRDIDX@=@RRDFN@:lambda:AVERAGE ++ LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@\n ++ GPRINT:p@RRDIDX@:LAST: %5.1lf °C (cur) ++ GPRINT:p@RRDIDX@:MAX: \: %5.1lf °C (max) ++ GPRINT:p@RRDIDX@:MIN: \: %5.1lf °C (min) ++ GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf °C (avg)\n diff --git a/abs/core/xymon/tasks.d.mv b/abs/core/xymon/tasks.d.mv index f8ce177..2cdaebb 100755 --- a/abs/core/xymon/tasks.d.mv +++ b/abs/core/xymon/tasks.d.mv @@ -44,6 +44,12 @@ LOGFILE $BBSERVERLOGS/xymon-gputemp.log INTERVAL 5m +[hddtemp] + ENVFILE $XYMONCLIENTHOME/etc/xymonclient.cfg + CMD /home/xymon/server/ext/xymon-hddtemp.sh + LOGFILE $BBSERVERLOGS/xymon-hddtemp.log + INTERVAL 5m + [smart] ENVFILE $XYMONCLIENTHOME/etc/xymonclient.cfg CMD /home/xymon/server/ext/xymon-smart.sh diff --git a/abs/core/xymon/xymon-hddtemp.sh b/abs/core/xymon/xymon-hddtemp.sh new file mode 100755 index 0000000..6961919 --- /dev/null +++ b/abs/core/xymon/xymon-hddtemp.sh @@ -0,0 +1,50 @@ +#!/bin/sh + +# NOTE: Must be run as root, so you probably need to setup sudo for this. + +ls /dev/disk/by-id/* | grep -ve '-part' -ve '/wwn-' | +while read DISK +do + DISKDEV=`ls -l $DISK | awk -F/ '{print $NF}'` + DISKNAME=`echo $DISK | awk -F/ '{print $5}'` + + #check if disk is removable + RM=0 + RM=`cat /sys/block/$DISKDEV/removable` + if test $RM -ne 0 + then + continue + fi + + hddtemp=`sudo smartctl -A $DISK | grep Temperature_Celsius | awk '{print $10}'` + + TEMP=": $hddtemp" + if [[ $hddtemp == "" ]] + then + TEMP="- No Temp Sensor Found" + COLOR="4&clear" + elif test $hddtemp -gt 50 + then + COLOR="1&red" + elif test $hddtemp -ge 45 + then + COLOR="2&yellow" + else + COLOR="3&green" + fi + + echo "${COLOR} $DISKNAME $TEMP" + +done > /tmp/hddcheck + +COLOR=`cat /tmp/hddcheck | awk '{print $1}' | sort | uniq | head -1 | cut -c3-` + +# Report status to Xymon Server +$XYMON $XYMSRV "status ${MACHINE}.hddtemp ${COLOR} Hard Drive Temperatures (in °C) + +`cat /tmp/hddcheck | cut -c2-` +" + +rm -f /tmp/hddcheck + +exit 0 diff --git a/abs/core/xymon/xymon-smart.sh b/abs/core/xymon/xymon-smart.sh index 1ad3cc7..f951158 100755 --- a/abs/core/xymon/xymon-smart.sh +++ b/abs/core/xymon/xymon-smart.sh @@ -4,15 +4,13 @@ if test -f /tmp/dres; then rm -f /tmp/dres; fi -# MODIFY below to match your setup - the "scsi-SATA" is pretty generic, but you -# can add more disks if you like. E.g. I have a USB disk permanently plugged in. - -ls /dev/disk/by-id/scsi-* /dev/disk/by-id/ata-* /dev/disk/by-id/usb-* | grep -v -- -part | sort | +ls /dev/disk/by-id/* | grep -ve '-part' -ve '/wwn-' | while read DISK do DISKDEV=`ls -l $DISK | awk -F/ '{print $NF}'` #check if disk is removable + RM=0 RM=`cat /sys/block/$DISKDEV/removable` if test $RM -ne 0 then @@ -62,4 +60,3 @@ $XYMON $XYMSRV "status ${MACHINE}.smart ${COLOR} SMART Health Check rm -f /tmp/dres /tmp/dcheck exit 0 - diff --git a/abs/core/xymon/xymonserver.cfg.diff b/abs/core/xymon/xymonserver.cfg.diff index 5432767..48631dc 100755 --- a/abs/core/xymon/xymonserver.cfg.diff +++ b/abs/core/xymon/xymonserver.cfg.diff @@ -1,30 +1,31 @@ ---- xymonserver.cfg.orig 2014-10-25 22:05:16.611876375 -0500 -+++ xymonserver.cfg 2014-10-25 22:07:35.818604144 -0500 -@@ -145,6 +145,11 @@ +--- xymonserver.cfg.orig 2015-03-04 21:28:58.618598840 +0000 ++++ xymonserver.cfg 2015-03-04 21:31:55.352569106 +0000 +@@ -145,6 +145,12 @@ RRDHEIGHT="120" RRDWIDTH="576" # The RRD's contain 576 data points, so this is a good value - + +NCV_storage="*:GAUGE" +NCV_memmbe="*:GAUGE" +NCV_memmfe="*:GAUGE" +NCV_gputemp="*:GAUGE" ++SPLITNCV_hddtemp="*:GAUGE" + # TEST2RRD defines the status- and data-messages you want to collect RRD data # about. You will normally not need to modify this, unless you have added a # script to pick up RRD data from custom tests (the xymond_rrd --extra-script -@@ -156,11 +161,13 @@ +@@ -156,11 +162,13 @@ # # This is also used by the svcstatus.cgi script to determine if the detailed # status view of a test should include a graph. -TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond" +#TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond" -+TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage=ncv,memmbe=ncv,memmfe=ncv,gputemp=ncv,smart" - ++TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage=ncv,memmbe=ncv,memmfe=ncv,gputemp=ncv,hddtemp=ncv,smart" + # This defines which RRD files to include on the "trends" column webpage, # and the order in which they appear. -GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond" +#GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond" -+GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage,memmbe,memmfe,gputemp" - ++GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage,memmbe,memmfe,gputemp,hddtemp" + # These two settings can be used to restrict what filesystems are being # tracked (i.e. have their utilisation graphed) by Xymon. -- cgit v0.12 From 85638dcc2204d62dfb31eda4f177fcfd807b9b9e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 5 Mar 2015 02:24:49 +0000 Subject: mythtv & plugins: update to latest fixes --- abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index 9e121ae..01588e7 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -ca4a2d68aab8723e4424cd808d6865bad2b950f1 +f1115fcd2b5cef93e870f926f53bf32cf546da9d diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 193c126..e0bc885 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.4 -pkgrel=10 +pkgrel=11 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index 89cc513..f648788 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.4 -pkgrel=10 +pkgrel=11 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12 From 44dc1f4f2896adb5282fdb1f11d716af16b308a7 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 5 Mar 2015 02:27:16 +0000 Subject: xymon: rebuild and remove old graph.cfg.diff --- abs/core/xymon/PKGBUILD | 4 ++-- abs/core/xymon/graph.cfg.diff | 54 ------------------------------------------- 2 files changed, 2 insertions(+), 56 deletions(-) delete mode 100755 abs/core/xymon/graph.cfg.diff diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD index e7b9577..3b11a68 100755 --- a/abs/core/xymon/PKGBUILD +++ b/abs/core/xymon/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=xymon pkgname=('xymonserver' 'xymonclient') pkgver=4.3.17 -pkgrel=13 +pkgrel=14 pkgdesc="Xymon is a system for monitoring of hosts and networks" license="GPL" arch=('i686' 'x86_64') @@ -180,7 +180,7 @@ md5sums=('d8d119a777e7b7204d1292fb27314312' 'a9b7f0a22f29f55b2928160bc44f2c14' '6452d891d88bb46d07bcf7790a523ad0' '374ce9cc7b7cb8ae04bf89ed4d79a7be' - '6eb413053fde2110859c30737032b916' + '9569e07936e337b06c194e0fb29e7e6b' 'b4e8641e97e6b689dbc634af785e6799' 'e2844513e2c92e8b5084818f3b2a478d' '98e9242ae346f729b14cb195786571f2' diff --git a/abs/core/xymon/graph.cfg.diff b/abs/core/xymon/graph.cfg.diff deleted file mode 100755 index a105bd7..0000000 --- a/abs/core/xymon/graph.cfg.diff +++ /dev/null @@ -1,54 +0,0 @@ ---- graphs.cfg.orig 2014-10-25 12:01:22.209825001 -0500 -+++ graphs.cfg 2014-10-25 21:55:22.065856064 -0500 -@@ -2100,4 +2100,50 @@ - GPRINT:qlen@RRDIDX@:AVERAGE: %6.1lf (avg)\n - - ########### end of ifmib graphs ########### -+[storage] -+ TITLE Storage Groups -+ YAXIS recordings -+ DEF:storage1=storage.rrd:rectvtotal:AVERAGE -+ LINE2:storage1#00CCCC:current recorded -+ -+ DEF:rectime=storage.rrd:rectvtime:AVERAGE -+ LINE2:rectime#000000:current recorded time -+ -+ DEF:livetime=storage.rrd:livetvtime:AVERAGE -+ LINE2:livetime#00CC11:current live time -+ -+ -+[memmbe] -+ TITLE Memory usage for MythBackend -+ YAXIS mythbackend -+ DEF:vmsize=memmbe.rrd:VmSize:AVERAGE -+ LINE2:vmsize#00CCCC:vmsize -+ -+ DEF:vmpeak=memmbe.rrd:VmPeak:AVERAGE -+ LINE2:vmpeak#000000:vmpeak -+ -+ DEF:vmrss=memmbe.rrd:VmRSS:AVERAGE -+ LINE2:vmrss#00CC11:vmrss -+ -+[memmfe] -+ TITLE Memory usage for MythFrontend -+ YAXIS mythfrontend -+ DEF:vmsize=memmfe.rrd:VmSize:AVERAGE -+ LINE2:vmsize#00CCCC:vmsize -+ -+ DEF:vmpeak=memmfe.rrd:VmPeak:AVERAGE -+ LINE2:vmpeak#000000:vmpeak -+ -+ DEF:vmrss=memmfe.rrd:VmRSS:AVERAGE -+ LINE2:vmrss#00CC11:vmrss -+ -+[gputemp] -+ TITLE GPU Temperature -+ YAXIS Temperature -+ DEF:gputemp=gputemp.rrd:GPUTEMP:AVERAGE -+ LINE2:gputemp#00CC11:gputemp -+ GPRINT:gputemp:LAST: \: %5.1lf (cur) -+ GPRINT:gputemp:MAX: \: %5.1lf (max) -+ GPRINT:gputemp:MIN: \: %5.1lf (min) -+ GPRINT:gputemp:AVERAGE: \: %5.1lf (avg)\n - - -- cgit v0.12 From e2e9871666fc207bc453329ef8cc1b9656a9ab31 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 5 Mar 2015 15:03:29 +0000 Subject: google-chrome: update to 41.0.2272.76 --- abs/extra/google-chrome/PKGBUILD | 18 +++++++----------- abs/extra/google-chrome/google-chrome.install | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD index 7cb2ad9..02438f4 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=40.0.2214.111 +pkgver=41.0.2272.76 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -21,19 +21,18 @@ install=$pkgname.install _channel=stable _arch=amd64 [[ $CARCH = i686 ]] && _arch=i386 -source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb" +source=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb" 'eula_text.html') -[[ $CARCH = i686 ]] && md5sums[0]='b2e60863b171bfc152b25030df196ecb' package() { msg2 "Extracting the data.tar.lzma..." - bsdtar -xf data.tar.lzma -C "$pkgdir/" + bsdtar -xf data.tar.xz -C "$pkgdir/" msg2 "Moving stuff in place..." # 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 + for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do + install -Dm644 "$pkgdir"/opt/google/chrome/product_logo_${i/x*}.png \ + "$pkgdir"/usr/share/icons/hicolor/$i/apps/google-chrome.png done # Man page @@ -42,9 +41,6 @@ package() { # 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 "Fixing Chrome icon resolution..." sed -i "/Exec=/i\StartupWMClass=Google-chrome-$_channel" "$pkgdir"/usr/share/applications/google-chrome.desktop @@ -61,5 +57,5 @@ package() { msg2 "Rename google-chrome-stable to google-chrome..." mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome } -md5sums=('7814ce4a8c941a918d48ace4a2362ebd' +md5sums=('ab26799a646dfee5ad6fceb250fbd6c1' 'b7e752f549b215ac77f284b6486794b6') diff --git a/abs/extra/google-chrome/google-chrome.install b/abs/extra/google-chrome/google-chrome.install index c958cc3..320179c 100644 --- a/abs/extra/google-chrome/google-chrome.install +++ b/abs/extra/google-chrome/google-chrome.install @@ -16,7 +16,7 @@ _update() { msg_blue "Updating desktop MIME database..." update-desktop-database -q msg_blue "Updating icon cache.." - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + xdg-icon-resource forceupdate --theme hicolor &>/dev/null } post_install() { -- cgit v0.12 From d25a4fbd6a135c232c447dd17b0f15d7391cd40f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 5 Mar 2015 19:45:15 +0000 Subject: plex-home-theater: update to 1.3.6 --- abs/extra/plex-home-theater/PKGBUILD | 12 ++++++---- abs/extra/plex-home-theater/plex-lirc-socket.patch | 27 ---------------------- 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/abs/extra/plex-home-theater/PKGBUILD b/abs/extra/plex-home-theater/PKGBUILD index 122105a..2f2c087 100755 --- a/abs/extra/plex-home-theater/PKGBUILD +++ b/abs/extra/plex-home-theater/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Daniel Wallace pkgname=plex-home-theater -_pkgver=1.2.3.378-0c92ed32 +_pkgver=1.3.6.441-309e72d1 pkgver=${_pkgver%-*} pkgrel=1 pkgdesc='Plex Home Theater' @@ -14,11 +14,12 @@ depends=('boost-libs' 'curl' 'ffmpeg-compat' 'glew' 'libcdio' 'libmad' 'libmicrohttpd' 'libmpeg2' 'libsamplerate' 'libssh' 'libusb-compat' 'libvdpau' 'libxrandr' 'lzo' 'sdl_image' 'sdl_mixer' 'smbclient' 'taglib' 'tinyxml' 'yajl') -makedepends=('boost' 'cmake' 'doxygen' 'java-environment' 'libcec' 'libplist' - 'libshairport' 'nasm' 'swig' 'unzip' 'zip') +makedepends=('boost' 'cmake' 'doxygen' 'java-environment' 'libcec' + 'libplist' 'libshairport' 'nasm' 'swig' 'unzip' 'zip') optdepends=('libplist: AirPlay support' 'libshairport: AirPlay support' 'libcec: Pulse-Eight USB-CEC adapter support') +install="${pkgname}.install" source=("https://github.com/plexinc/plex-home-theater-public/archive/v${_pkgver}.tar.gz" 'plex-ffmpeg-compat.patch' 'plex-libcec-2.2.0.patch' @@ -58,6 +59,7 @@ package() { install -dm 755 "${pkgdir}"/usr/{lib/plexhometheater,share/{applications,pixmaps}} mv "${pkgdir}"/usr/bin/{system,xbmc-xrandr} "${pkgdir}"/usr/lib/plexhometheater/ mv "${pkgdir}"/usr/share/XBMC "${pkgdir}"/usr/share/plexhometheater + rm -rf "${pkgdir}"/usr/bin/*.so install -m 755 "${srcdir}"/plexhometheater.sh "${pkgdir}"/usr/bin/ install -m 644 ../plex/Resources/plexhometheater.desktop "${pkgdir}"/usr/share/applications/ install -m 644 ../plex/Resources/plex-icon-256.png "${pkgdir}"/usr/share/pixmaps/plexhometheater.png @@ -68,9 +70,9 @@ package() { } # vim: ts=2 sw=2 et: -md5sums=('59f6d8386d9533b7c9a0c9e559a83c0f' +md5sums=('370627c3d9e190e7af2cb8cf2a67f488' '6704244166497db7fa6b3ddd43a0e53b' '066484ad4949f96ddddaa8b1d4d709e1' - 'b96a1d70174d80d3f2272bdc5b48e4a3' + '09e67d694093eb6bd243fb9a4ddf5d70' '8735a4e7857bc85085482c4f8bcb1d01' '8fae1350cc36f40ed65fbf96128a02d0') diff --git a/abs/extra/plex-home-theater/plex-lirc-socket.patch b/abs/extra/plex-home-theater/plex-lirc-socket.patch index 7110252..0a7ebf3 100644 --- a/abs/extra/plex-home-theater/plex-lirc-socket.patch +++ b/abs/extra/plex-home-theater/plex-lirc-socket.patch @@ -27,30 +27,3 @@ index 002245a..85ad398 100644 AC_ARG_ENABLE([udev], diff --git a/plex/CMakeModules/PlatformConfigLINUX.cmake b/plex/CMakeModules/PlatformConfigLINUX.cmake index 078fafb..3afa5c1 100644 ---- a/plex/CMakeModules/PlatformConfigLINUX.cmake -+++ b/plex/CMakeModules/PlatformConfigLINUX.cmake -@@ -126,7 +126,7 @@ if(DEFINED OPENGL_FOUND) - endif() - - #### default lircdevice --set(LIRC_DEVICE "/dev/lircd") -+set(LIRC_DEVICE "/var/run/lirc/lircd") - - #### on linux we want to use a "easy" name - set(EXECUTABLE_NAME "plexhometheater") -diff --git a/plex/CMakeModules/PlatformConfigRPI.cmake b/plex/CMakeModules/PlatformConfigRPI.cmake -index 82aa751..367cdc9 100644 ---- a/plex/CMakeModules/PlatformConfigRPI.cmake -+++ b/plex/CMakeModules/PlatformConfigRPI.cmake -@@ -103,7 +103,7 @@ list(APPEND CONFIG_INTERNAL_LIBS lib_dllsymbols) - - - #### default lircdevice --set(LIRC_DEVICE "/dev/lircd") -+set(LIRC_DEVICE "/var/run/lirc/lircd") - - #### on linux we want to use a "easy" name - set(EXECUTABLE_NAME "plexhometheater") --- -2.1.3 - -- cgit v0.12 From 83d724ff9bfe884bc4ee7d65fbc3846082a3fcca Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 5 Mar 2015 19:47:39 +0000 Subject: LinHES-system: find_orphans.py: add quit option to list --- abs/core/LinHES-system/PKGBUILD | 4 ++-- abs/core/LinHES-system/find_orphans.py | 24 +++++++++++++++++------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index d6b4bac..a0f182b 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.3 -pkgrel=9 +pkgrel=10 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -120,7 +120,7 @@ md5sums=('8415c4b2587a8a1e6a312484c1edafcb' '8e02efe1ad0df9a179075147eebb05b9' '8b0298f70f97cc1dc2a58b9a73c64bd3' '716710e0db42147b079c9ec1c7080efa' - '34fc1f58ad1eabf4eff4979d420760c0' + 'cd28dd67a78f3b7da704e31db0298916' '69ecfe682f1b61c2c4c95d890b9f523c' 'a94fe6d980f4b810f2e2ae5352084b39' '384956b4fd9bf40907856bab0e67b169' diff --git a/abs/core/LinHES-system/find_orphans.py b/abs/core/LinHES-system/find_orphans.py index cdc03d4..c134e82 100644 --- a/abs/core/LinHES-system/find_orphans.py +++ b/abs/core/LinHES-system/find_orphans.py @@ -12,7 +12,7 @@ def human_size(s): while s > 1000: s /= 1000 o += 1 - return str(round(s,1))+('B ','KB','MB','GB')[o] + return str(round(s,1))+('B ','KB','MB','GB','TB')[o] class File( str ): def __new__(self, host, group, path, name, size): @@ -120,7 +120,7 @@ def populate(host=None): def delete_recs(recs): printrecs('The following recordings will be deleted', recs) - print 'Are you sure you want to continue?' + print 'Are you sure you want to continue? (yes/no)' try: res = raw_input('> ') while True: @@ -144,7 +144,7 @@ def delete_recs(recs): def delete_files(files): printfiles('The following files will be deleted', files) - print 'Are you sure you want to continue?' + print 'Are you sure you want to continue? (yes/no)' try: res = raw_input('> ') while True: @@ -190,10 +190,15 @@ def main(host=None): if len(unfiltered): opts.append(['Delete other files', delete_files, unfiltered]) opts.append(['Refresh list', None, None]) - print 'Please select from the following' + print 'Please select from the following:' for i, opt in enumerate(opts): - print ' {0}. {1}'.format(i+1, opt[0]) + if opt[0] == "Refresh list": + print ' R. {1}'.format(i+1, opt[0]) + refreshNum=i+1 + else: + print ' {0}. {1}'.format(i+1, opt[0]) + print ' Q. Quit' try: inner = True res = raw_input('> ') @@ -201,10 +206,15 @@ def main(host=None): try: res = int(res) except: - res = raw_input('input number. ctrl-c to exit > ') + if res == "Q" or res == "q": + sys.exit(0) + elif res == "R" or res == "r": + res = refreshNum + else: + res = raw_input('Invalid selection > ') continue if (res <= 0) or (res > len(opts)): - res = raw_input('input number within range > ') + res = raw_input('Invalid selection > ') continue break opt = opts[res-1] -- cgit v0.12 From 9b1a9f4424c6aebcf775234de19691c6bd46eeca Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 6 Mar 2015 20:19:29 +0000 Subject: xymon: add myth_mtc for xymon clients. closes #990 --- abs/core/xymon/PKGBUILD | 5 +++-- abs/core/xymon/clientlaunch.cfg.patch | 10 ++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD index 3b11a68..310e2a5 100755 --- a/abs/core/xymon/PKGBUILD +++ b/abs/core/xymon/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=xymon pkgname=('xymonserver' 'xymonclient') pkgver=4.3.17 -pkgrel=14 +pkgrel=15 pkgdesc="Xymon is a system for monitoring of hosts and networks" license="GPL" arch=('i686' 'x86_64') @@ -146,6 +146,7 @@ package_xymonclient(){ install -D -m400 ${srcdir}/xymon-client.rules ${pkgdir}/etc/sudoers.d/xymon_client install -D -m755 ${srcdir}/log_list.sh ${pkgdir}/home/xymon/client/bin/log_list.sh install -D -m644 ${srcdir}/logrotate-client.xymon ${pkgdir}/etc/logrotate.d/xymon-client + install -D -m755 ${srcdir}/hobbit_myth_data.py ${pkgdir}/home/xymon/client/ext/hobbit_myth_data.py install -D -m755 ${srcdir}/hobbit-mem-myth.sh ${pkgdir}/home/xymon/client/ext/hobbit-mem-myth.sh install -D -m755 ${srcdir}/xymon-gputemp.sh ${pkgdir}/home/xymon/client/ext/xymon-gputemp.sh install -D -m755 ${srcdir}/xymon-hddtemp.sh ${pkgdir}/home/xymon/client/ext/xymon-hddtemp.sh @@ -164,7 +165,7 @@ md5sums=('d8d119a777e7b7204d1292fb27314312' '92bd5e8279c688fd854d514443bc733c' 'f0fca78520f434918bd1be717d165073' 'a19c8c546dcd95049476bb19f9d4e3ae' - '079833e3af5d74b93a86b5819dbf453b' + 'c9a31ea9ae131fb351db913e922c25aa' 'b2f98ac0df013332deedc1efae0a270d' '4a8244c1bb44fe35ca7372355b01cec4' 'aa7c2eec6cd894dc171e90a4eed69de1' diff --git a/abs/core/xymon/clientlaunch.cfg.patch b/abs/core/xymon/clientlaunch.cfg.patch index 980da4c..dba5876 100755 --- a/abs/core/xymon/clientlaunch.cfg.patch +++ b/abs/core/xymon/clientlaunch.cfg.patch @@ -1,6 +1,6 @@ --- clientlaunch.cfg.orig 2015-02-19 22:50:43.102571615 +0000 -+++ clientlaunch.cfg 2015-03-04 23:45:50.087484982 +0000 -@@ -26,3 +26,26 @@ ++++ clientlaunch.cfg 2015-03-06 19:23:04.010103917 +0000 +@@ -26,3 +26,32 @@ LOGFILE $XYMONCLIENTLOGS/xymonclient.log INTERVAL 5m @@ -10,6 +10,12 @@ + LOGFILE $XYMONCLIENTLOGS/mythmem.log + INTERVAL 5m + ++[mtc] ++ ENVFILE $XYMONCLIENTHOME/etc/xymonclient.cfg ++ CMD /home/xymon/client/ext/hobbit_myth_data.py ++ LOGFILE $XYMONCLIENTLOGS/mtc.log ++ INTERVAL 5m ++ +[gputemp] + ENVFILE $XYMONCLIENTHOME/etc/xymonclient.cfg + CMD /home/xymon/client/ext/xymon-gputemp.sh -- cgit v0.12 From b482316c7454c1b7ee060537339b84043f26ed5a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 13 Mar 2015 21:37:47 +0000 Subject: xymon: fix mythtv binding for xymonclient --- abs/core/xymon/PKGBUILD | 9 +++++---- abs/core/xymon/hobbit_myth_data.py | 3 +-- abs/core/xymon/xymon-hddtemp.sh | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD index 310e2a5..b8e6355 100755 --- a/abs/core/xymon/PKGBUILD +++ b/abs/core/xymon/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=xymon pkgname=('xymonserver' 'xymonclient') pkgver=4.3.17 -pkgrel=15 +pkgrel=17 pkgdesc="Xymon is a system for monitoring of hosts and networks" license="GPL" arch=('i686' 'x86_64') @@ -99,8 +99,9 @@ package_xymonserver(){ install -D -m644 ${srcdir}/logrotate-server.xymon ${pkgdir}/etc/logrotate.d/xymon-server - # fix env for mythtb bindingds + # fix env for mythtv bindings echo "MYTHCONFDIR=/usr/share/mythtv" >> ${pkgdir}/home/xymon/etc/xymonserver.cfg + echo "MYTHCONFDIR=/usr/share/mythtv" >> ${pkgdir}/home/xymon/client/etc/xymonclient.cfg #copy in replacment icon set DOCDIR=${pkgdir}/data/srv/httpd/htdocs/xymon @@ -178,9 +179,9 @@ md5sums=('d8d119a777e7b7204d1292fb27314312' '270e13da6cbc9d49079d994edaa71e64' '22d4c9065fd959efe82f121dcb511305' '9af2ad60ac4c3cb653754618f603e311' - 'a9b7f0a22f29f55b2928160bc44f2c14' + '313b11e7a22c3c08fb2afaadbfb46d87' '6452d891d88bb46d07bcf7790a523ad0' - '374ce9cc7b7cb8ae04bf89ed4d79a7be' + 'f0486d82a56a0e28a20278daabbc4c53' '9569e07936e337b06c194e0fb29e7e6b' 'b4e8641e97e6b689dbc634af785e6799' 'e2844513e2c92e8b5084818f3b2a478d' diff --git a/abs/core/xymon/hobbit_myth_data.py b/abs/core/xymon/hobbit_myth_data.py index ec16818..618e2ac 100755 --- a/abs/core/xymon/hobbit_myth_data.py +++ b/abs/core/xymon/hobbit_myth_data.py @@ -7,7 +7,7 @@ import urllib2 import string import time , datetime import sys,os -from MythTV import MythBE,MythDB,MythLog +from MythTV import MythDB,MythLog #0=green @@ -77,7 +77,6 @@ def find_data_left(): days_left = 0 today = datetime.datetime.today() try: - be=MythBE() db = MythDB() cursor = db.cursor() except: diff --git a/abs/core/xymon/xymon-hddtemp.sh b/abs/core/xymon/xymon-hddtemp.sh index 6961919..6c0f109 100755 --- a/abs/core/xymon/xymon-hddtemp.sh +++ b/abs/core/xymon/xymon-hddtemp.sh @@ -6,7 +6,7 @@ ls /dev/disk/by-id/* | grep -ve '-part' -ve '/wwn-' | while read DISK do DISKDEV=`ls -l $DISK | awk -F/ '{print $NF}'` - DISKNAME=`echo $DISK | awk -F/ '{print $5}'` + DISKNAME=`echo $DISK | awk -F/ '{print $5}' | tr ":" "_"` #check if disk is removable RM=0 @@ -23,10 +23,10 @@ do then TEMP="- No Temp Sensor Found" COLOR="4&clear" - elif test $hddtemp -gt 50 + elif test $hddtemp -gt 55 then COLOR="1&red" - elif test $hddtemp -ge 45 + elif test $hddtemp -ge 50 then COLOR="2&yellow" else -- cgit v0.12 From ebbfaf23e1ed288ecc282946dd589f9681d91e38 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 16 Mar 2015 14:01:59 +0000 Subject: linux: update to 3.18.9 --- abs/core/linux/PKGBUILD | 16 +++++++--------- abs/core/linux/linux.install.pkg | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/abs/core/linux/PKGBUILD b/abs/core/linux/PKGBUILD index 3de6095..ca33abc 100644 --- a/abs/core/linux/PKGBUILD +++ b/abs/core/linux/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=linux # Build stock -ARCH kernel #pkgbase=linux-custom # Build kernel with a different name _srcname=linux-3.18 -pkgver=3.18.4 +pkgver=3.18.9 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -22,14 +22,6 @@ source=("https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz" 'linux.preset' 'change-default-console-loglevel.patch' ) -sha256sums=('becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd' - #'SKIP' - '57c74ba5266bb10be335a89d30480739b3de67b5a72b3e0b0d37a27775b1862a' - #'SKIP' - 'd3794c8b2cd11b71914b41f7a4e861369d4fa3c29fdd9e1d677ff0c2167eeb52' - 'df7886f5d57f8f85e89987066dfa5c316e922dc0b22e6e6ad01331333db52377' - 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman @@ -302,3 +294,9 @@ for _p in ${pkgname[@]}; do done # vim:set ts=8 sts=2 sw=2 et: +md5sums=('9e854df51ca3fef8bfe566dbd7b89241' + '41077062d4b7beefd88d4df6e598e376' + 'ed1d392d9feb77674e7a71c3eda060e6' + 'c2d4e432167a2bbd43ad09e07fc73e1e' + 'eb14dcfd80c00852ef81ded6e826826a' + 'df7fceae6ee5d7e7be7b60ecd7f6bb35') diff --git a/abs/core/linux/linux.install.pkg b/abs/core/linux/linux.install.pkg index 891013c..4a0b843 100644 --- a/abs/core/linux/linux.install.pkg +++ b/abs/core/linux/linux.install.pkg @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.18.4-1-ARCH +KERNEL_VERSION=3.18.9-1-ARCH post_install () { # updating module dependencies -- cgit v0.12 From bffdf5a43c9981269890bd148aebab20b37e6870 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 16 Mar 2015 16:50:55 +0000 Subject: lirc: update to 0.9.2a --- .../lirc/0001-doc-Add-Doxyfile-to-tarball.patch | 25 -------- ...pc-Fix-bad-variable-reference-ordering-86.patch | 26 -------- abs/core/lirc/0004-lirc-lsplugins-Bugfix.patch | 25 -------- ...tions.conf-Add-effective-user-to-template.patch | 24 -------- .../lirc/0006-doc-Clean-up-irsend-1-manpage.patch | 55 ----------------- ...g-Add-priority-labels-info-error.-to-sysl.patch | 70 ---------------------- ...p-Fix-remote-config-file-display-problems.patch | 38 ------------ .../0012-lib-Bad-bugfix-for-finding-.lircrc.patch | 27 --------- ...ools-Make-make_rel_symlink.py-use-python3.patch | 42 ------------- abs/core/lirc/PKGBUILD | 38 ++---------- abs/core/lirc/__changelog | 2 +- 11 files changed, 6 insertions(+), 366 deletions(-) delete mode 100644 abs/core/lirc/0001-doc-Add-Doxyfile-to-tarball.patch delete mode 100644 abs/core/lirc/0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch delete mode 100644 abs/core/lirc/0004-lirc-lsplugins-Bugfix.patch delete mode 100644 abs/core/lirc/0005-lirc_options.conf-Add-effective-user-to-template.patch delete mode 100644 abs/core/lirc/0006-doc-Clean-up-irsend-1-manpage.patch delete mode 100644 abs/core/lirc/0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch delete mode 100644 abs/core/lirc/0010-lirc-setup-Fix-remote-config-file-display-problems.patch delete mode 100644 abs/core/lirc/0012-lib-Bad-bugfix-for-finding-.lircrc.patch delete mode 100644 abs/core/lirc/0013-tools-Make-make_rel_symlink.py-use-python3.patch diff --git a/abs/core/lirc/0001-doc-Add-Doxyfile-to-tarball.patch b/abs/core/lirc/0001-doc-Add-Doxyfile-to-tarball.patch deleted file mode 100644 index 1ca5165..0000000 --- a/abs/core/lirc/0001-doc-Add-Doxyfile-to-tarball.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 945e44ffe2296bc37dc58363e5beaf5b4eca73fa Mon Sep 17 00:00:00 2001 -From: Alec Leamas -Date: Thu, 11 Dec 2014 05:34:26 +0100 -Subject: [PATCH 01/13] doc: Add Doxyfile to tarball. - ---- - doc/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/doc/Makefile.am b/doc/Makefile.am -index 8a05a7d..1b6730e 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -3,6 +3,8 @@ ACLOCAL_AMFLAGS = -I m4 - - DISTCLEANFILES = man/* html/* man-html/* - -+EXTRA_DIST = Doxyfile -+ - LIB_SRC = $(srcdir)/../lib - API_SRC = $(LIB_SRC)/*.c \ - $(LIB_SRC)/*.h \ --- -2.2.2 - diff --git a/abs/core/lirc/0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch b/abs/core/lirc/0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch deleted file mode 100644 index b65ab0f..0000000 --- a/abs/core/lirc/0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d733314ef8293a447568ef48af8b0ddd83a4ad42 Mon Sep 17 00:00:00 2001 -From: Inando -Date: Mon, 29 Dec 2014 14:45:08 +0100 -Subject: [PATCH 02/13] lirc.pc: Fix bad variable reference/ordering (#86) - ---- - lirc.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lirc.pc.in b/lirc.pc.in -index 43f2b9b..432f51a 100644 ---- a/lirc.pc.in -+++ b/lirc.pc.in -@@ -2,8 +2,8 @@ Name: lirc - Description: LIRC Linux Infrared Control client libs. - Version: @VERSION@ - --datarootdir=@datarootdir@ - prefix=@prefix@ -+datarootdir=@datarootdir@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ --- -2.2.2 - diff --git a/abs/core/lirc/0004-lirc-lsplugins-Bugfix.patch b/abs/core/lirc/0004-lirc-lsplugins-Bugfix.patch deleted file mode 100644 index 3517e50..0000000 --- a/abs/core/lirc/0004-lirc-lsplugins-Bugfix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ad094a827e37219b76cf6b6bf3d6fab49a32e913 Mon Sep 17 00:00:00 2001 -From: Alec Leamas -Date: Fri, 9 Jan 2015 12:46:36 +0100 -Subject: [PATCH 04/13] lirc-lsplugins: Bugfix. - ---- - tools/lirc-lsplugins.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/lirc-lsplugins.c b/tools/lirc-lsplugins.c -index 10403a7..9eceb3b 100644 ---- a/tools/lirc-lsplugins.c -+++ b/tools/lirc-lsplugins.c -@@ -212,7 +212,7 @@ static void line_print_long(const line_t* line) - } - - printf("Plugin path:\t%s\n", line->path); -- printf("Driver name:\t%s\n", line->path ? line->name : "-"); -+ printf("Driver name:\t%s\n", line->name ? line->name : "-"); - printf("Load state:\t%s\n", loadstate); - printf("Timing info:\t%s\n", handles_timing); - printf("Can send:\t%s\n", can_send); --- -2.2.2 - diff --git a/abs/core/lirc/0005-lirc_options.conf-Add-effective-user-to-template.patch b/abs/core/lirc/0005-lirc_options.conf-Add-effective-user-to-template.patch deleted file mode 100644 index 8910905..0000000 --- a/abs/core/lirc/0005-lirc_options.conf-Add-effective-user-to-template.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 502af4fcca53c81025446bb73fa29570abb34feb Mon Sep 17 00:00:00 2001 -From: Alec Leamas -Date: Thu, 11 Dec 2014 10:28:47 +0100 -Subject: [PATCH 05/13] lirc_options.conf: Add effective-user to template. - ---- - lirc_options.conf | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lirc_options.conf b/lirc_options.conf -index 9dc672a..9346de8 100644 ---- a/lirc_options.conf -+++ b/lirc_options.conf -@@ -12,6 +12,7 @@ plugindir = /usr/lib/lirc/plugins - permission = 666 - allow-simulate = No - repeat-max = 600 -+#effective-user = - #listen = [address:]port - #connect = host[:port] - #debug = 6 --- -2.2.2 - diff --git a/abs/core/lirc/0006-doc-Clean-up-irsend-1-manpage.patch b/abs/core/lirc/0006-doc-Clean-up-irsend-1-manpage.patch deleted file mode 100644 index 1a7f279..0000000 --- a/abs/core/lirc/0006-doc-Clean-up-irsend-1-manpage.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ed1eab5e685df76426709b2c12284d61de0470b5 Mon Sep 17 00:00:00 2001 -From: Alec Leamas -Date: Tue, 16 Dec 2014 11:18:00 +0100 -Subject: [PATCH 06/13] doc: Clean up irsend(1) manpage. - ---- - doc/man-source/irsend.1 | 18 ++++++++---------- - 1 file changed, 8 insertions(+), 10 deletions(-) - -diff --git a/doc/man-source/irsend.1 b/doc/man-source/irsend.1 -index 51f57ab..12d2db8 100644 ---- a/doc/man-source/irsend.1 -+++ b/doc/man-source/irsend.1 -@@ -1,4 +1,4 @@ --.TH IRSEND "1" "Last change: Sep 2014" "irsend @version@" "User Commands" -+.TH IRSEND "1" "Last change: Dec 2014" "irsend @version@" "User Commands" - .SH NAME - irsend - basic LIRC program to send infra-red commands - .SH SYNOPSIS -@@ -63,6 +63,12 @@ connect to lircd at this address - .TP - \-# \fB\-\-count\fR=\fIn\fR - send command n times -+ -+.SH ENVIRONMENT -+.TP 4 -+LIRC_SOCKET_PATH -+The lircd socket to connect to, defaults to a hardcoded default value -+usually /var/run/lirc/lircd - .SH FILES - .TP - .I /etc/lirc/lircd.conf -@@ -94,18 +100,10 @@ irsend SIMULATE "0000000000000476 00 OK TECHNISAT_ST3004S" - Drivers are loaded dynamically. The directory used for this is determined by (falling - priority): - .IP \- 2 --The --plugindir option if available. --.IP \- 2 - The 'plugindir' entry in the [lircd] section of the lirc_options.conf file. - .IP \- 2 - The environment variable LIRC_PLUGINDIR. - .IP \- 2 - A hardcoded default (usually /usr/lib[64]/lirc/plugins). - .SH "SEE ALSO" --The documentation for --.B lirc --is maintained as html pages. They are located under html/ in the --documentation directory. -- --.BR lircd(8), mode2(1), xmode2(1) --.BR irrecord(1) irw(1), http://www.lirc.org . -+.B lircd(8), mode2(1), xmode2(1), irrecord(1), irw(1) --- -2.2.2 - diff --git a/abs/core/lirc/0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch b/abs/core/lirc/0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch deleted file mode 100644 index c186054..0000000 --- a/abs/core/lirc/0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch +++ /dev/null @@ -1,70 +0,0 @@ -From dfe0f3c3170a029a47edd9adf2a1b9a975d496ae Mon Sep 17 00:00:00 2001 -From: Alec Leamas -Date: Sat, 10 Jan 2015 01:30:32 +0100 -Subject: [PATCH 09/13] lib/lirc_log: Add priority labels (info, error...) to - syslog msg (#89). - ---- - lib/lirc_log.c | 23 +++++++---------------- - 1 file changed, 7 insertions(+), 16 deletions(-) - -diff --git a/lib/lirc_log.c b/lib/lirc_log.c -index 307fb77..cf37e6d 100644 ---- a/lib/lirc_log.c -+++ b/lib/lirc_log.c -@@ -2,22 +2,8 @@ - ** lircd.c ***************************************************************** - **************************************************************************** - * -- * lircd - LIRC Decoder Daemon -+ * lirc_log - simple logging module. - * -- * Copyright (C) 1996,97 Ralph Metzler -- * Copyright (C) 1998,99 Christoph Bartelmus -- * -- * ======= -- * HISTORY -- * ======= -- * -- * 0.1: 03/27/96 decode SONY infra-red signals -- * create mousesystems mouse signals on pipe /dev/lircm -- * 04/07/96 send ir-codes to clients via socket (see irpty) -- * 05/16/96 now using ir_remotes for decoding -- * much easier now to describe new remotes -- * -- * 0.5: 09/02/98 finished (nearly) complete rewrite (Christoph) - * - */ - -@@ -59,6 +45,8 @@ const char *logfile = "syslog"; - char progname[128] = {'?','\0'}; - static int nodaemon = 0; - -+static const int PRIO_LEN = 16; /**< Longest priority label, some margin. */ -+ - - static const char* prio2text(int prio) - { -@@ -246,6 +234,7 @@ void logprintf(loglevel_t prio, const char *format_str, ...) - { - int save_errno = errno; - va_list ap; -+ char buff[PRIO_LEN + strlen(format_str)]; - - #ifdef SYSTEMD_LOGPERROR_FIX - if (nodaemon && prio <= loglevel) { -@@ -258,8 +247,10 @@ void logprintf(loglevel_t prio, const char *format_str, ...) - } - #endif - if (use_syslog) { -+ snprintf(buff, sizeof(buff), -+ "%s: %s", prio2text(prio), format_str); - va_start(ap, format_str); -- vsyslog(prio, format_str, ap); -+ vsyslog(prio, buff, ap); - va_end(ap); - } else if (lf && prio <= loglevel) { - time_t current; --- -2.2.2 - diff --git a/abs/core/lirc/0010-lirc-setup-Fix-remote-config-file-display-problems.patch b/abs/core/lirc/0010-lirc-setup-Fix-remote-config-file-display-problems.patch deleted file mode 100644 index 5f5803d..0000000 --- a/abs/core/lirc/0010-lirc-setup-Fix-remote-config-file-display-problems.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f3714b04a20069b70b9cbba7558bb3cb5d28caa9 Mon Sep 17 00:00:00 2001 -From: Alec Leamas -Date: Wed, 14 Jan 2015 01:13:00 +0100 -Subject: [PATCH 10/13] lirc-setup: Fix remote config file display problems. - ---- - tools/lirc-setup/mvc_control.py | 2 +- - tools/lirc-setup/mvc_view.py | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tools/lirc-setup/mvc_control.py b/tools/lirc-setup/mvc_control.py -index a922df5..8cf216b 100644 ---- a/tools/lirc-setup/mvc_control.py -+++ b/tools/lirc-setup/mvc_control.py -@@ -244,7 +244,7 @@ class Controller(object): - errors='ignore') - except urllib.error.URLError as ex: - text = "Sorry: cannot download: " + uri + ' (' + str(ex) + ')' -- self.view.show_text(text, 'lirc: download error') -+ self.view.show_text(text, 'lirc: Remote config file') - - - def main(): -diff --git a/tools/lirc-setup/mvc_view.py b/tools/lirc-setup/mvc_view.py -index a50ce73..19e8df7 100644 ---- a/tools/lirc-setup/mvc_view.py -+++ b/tools/lirc-setup/mvc_view.py -@@ -156,6 +156,7 @@ class View(baseview.Baseview): - else: - return True - -+ text = text.replace("&", "&") - self.builder.get_object("show_text_label").set_markup(text) - w = self.builder.get_object('view_text_window') - w.set_title(title) --- -2.2.2 - diff --git a/abs/core/lirc/0012-lib-Bad-bugfix-for-finding-.lircrc.patch b/abs/core/lirc/0012-lib-Bad-bugfix-for-finding-.lircrc.patch deleted file mode 100644 index dc97b13..0000000 --- a/abs/core/lirc/0012-lib-Bad-bugfix-for-finding-.lircrc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 96292ce20b75ef27851ba75aed1aafb15a207a79 Mon Sep 17 00:00:00 2001 -From: Alec Leamas -Date: Thu, 15 Jan 2015 02:01:57 +0100 -Subject: [PATCH 12/13] lib: Bad bugfix for finding ~/.lircrc - -Basically, the common library code did not find ~/.lircrc, just -~/.config/lircrc. Fixed. ---- - lib/lirc_client.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/lirc_client.c b/lib/lirc_client.c -index c441803..df2eaef 100644 ---- a/lib/lirc_client.c -+++ b/lib/lirc_client.c -@@ -807,7 +807,7 @@ static char *lirc_getfilename(const char *file, const char *current_file) - if (filename == NULL) { - return NULL; - } -- strcat(filename, LIRCRC_USER_FILE); -+ strcat(filename, "/" LIRCRC_USER_FILE); - } - filename = realloc(filename, strlen(filename) + 1); - } else if (strncmp(file, "~/", 2) == 0) { --- -2.2.2 - diff --git a/abs/core/lirc/0013-tools-Make-make_rel_symlink.py-use-python3.patch b/abs/core/lirc/0013-tools-Make-make_rel_symlink.py-use-python3.patch deleted file mode 100644 index 4ef3c15..0000000 --- a/abs/core/lirc/0013-tools-Make-make_rel_symlink.py-use-python3.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4c30c6f87dda6614978dfab69d417ef3ca83dccf Mon Sep 17 00:00:00 2001 -From: Alec Leamas -Date: Thu, 11 Dec 2014 04:44:49 +0100 -Subject: [PATCH 13/13] tools: Make make_rel_symlink.py use python3. - ---- - tools/make_rel_symlink.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tools/make_rel_symlink.py b/tools/make_rel_symlink.py -index 5c89305..896637f 100755 ---- a/tools/make_rel_symlink.py -+++ b/tools/make_rel_symlink.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - import os - import os.path -@@ -32,16 +32,16 @@ if sys.argv[1] == "-p": - sys.argv = sys.argv[ 1:] - - if len( sys.argv ) != 3: -- print USAGE -+ print(USAGE) - sys.exit( 1 ) - - if os.path.isdir( sys.argv[2] ): -- print "Removing link target dir:" + sys.argv[2] -+ print("Removing link target dir:" + sys.argv[2]) - shutil.rmtree( sys.argv[2]) - - link_path = relative_ln_s( sys.argv[1], sys.argv[2] ) - if just_print: -- print link_path -+ print(link_path) - else: - os.chdir( os.path.dirname( sys.argv[2])) - target = os.path.basename( sys.argv[2]) --- -2.2.2 - diff --git a/abs/core/lirc/PKGBUILD b/abs/core/lirc/PKGBUILD index 6a5f803..bfd259f 100644 --- a/abs/core/lirc/PKGBUILD +++ b/abs/core/lirc/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Paul Mattal pkgname=lirc -_pkgver=0.9.2 +_pkgver=0.9.2a [[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver" pkgrel=1 epoch=1 @@ -19,46 +19,18 @@ replaces=('lirc-utils') backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf') install=lirc.install source=("http://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2" - 0001-doc-Add-Doxyfile-to-tarball.patch - 0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch - 0004-lirc-lsplugins-Bugfix.patch - 0005-lirc_options.conf-Add-effective-user-to-template.patch - 0006-doc-Clean-up-irsend-1-manpage.patch - 0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch - 0010-lirc-setup-Fix-remote-config-file-display-problems.patch - 0012-lib-Bad-bugfix-for-finding-.lircrc.patch lirc.logrotate lirc.tmpfiles) -md5sums=('3afc84e79c0839823cc20e7a710dd06d' - '1e1a68f08c2ecb2b766973e4f1721bae' - 'c04b2ed646dbaaec2fa9f4e1ad2cc802' - '2e60e1b3c19b0898d1d5f69e76891a60' - '9fe1e650858ca91e3a0fe4d63ee4b946' - '8b5c11ab325d4bef998c41b5b1160513' - '96475d718dbeb336a3282a5e9f9fdadd' - '308c3e1fd769b38caa6fd548f54f2440' - '497c4bb4ac8fc6febac94abe1922595c' +md5sums=('639a14ed0b3b34ae227a047b952ea368' '3deb02604b37811d41816e9b4385fcc3' 'febf25c154a7d36f01159e84f26c2d9a') -prepare() { - cd "${srcdir}/lirc-${_pkgver}" - - patch -p1 -i ../0001-doc-Add-Doxyfile-to-tarball.patch - patch -p1 -i ../0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch - patch -p1 -i ../0004-lirc-lsplugins-Bugfix.patch - patch -p1 -i ../0005-lirc_options.conf-Add-effective-user-to-template.patch - patch -p1 -i ../0006-doc-Clean-up-irsend-1-manpage.patch - patch -p1 -i ../0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch - patch -p1 -i ../0010-lirc-setup-Fix-remote-config-file-display-problems.patch - patch -p1 -i ../0012-lib-Bad-bugfix-for-finding-.lircrc.patch - - autoreconf -} - build() { cd "${srcdir}/lirc-${_pkgver}" + # don't user python3 + sed -i 's:#!/usr/bin/env python3:#!/usr/bin/env python:' ./tools/make_rel_symlink.py + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --localstatedir=/var \ --with-transmitter --enable-sandboxed make diff --git a/abs/core/lirc/__changelog b/abs/core/lirc/__changelog index adf4a9c..65391d7 100644 --- a/abs/core/lirc/__changelog +++ b/abs/core/lirc/__changelog @@ -1,7 +1,7 @@ PKGBUILD: add 'iguanair' to depends PKGBUILD: change dep python to python2 PKGBUILD: comment out optdepends -PKGBUILD: don't use 0013-tools-Make-make_rel_symlink.py-use-python3.patch +PKGBUILD: add sed to not use python3 PKGBUILD: # LinHES remotes service uses /etc/lircd.conf so create symlink ln -s "/etc/lircd.conf" "${pkgdir}/etc/lirc/lircd.conf.d/mv_ir_lircd.conf" lirc.install: comment out service message -- cgit v0.12 From ef9afbd5cb377d942a6604929cc2ed5edd8e9cbb Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 16 Mar 2015 17:19:17 +0000 Subject: nvidia & nvidia-utils: update to 346.47 --- abs/core/nvidia-utils/PKGBUILD | 6 +++--- abs/core/nvidia-utils/nvidia-utils.install | 18 +++++++----------- abs/core/nvidia/PKGBUILD | 16 +++++++--------- abs/core/nvidia/__changelog | 1 + 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD index 9e9cd62..ac935eb 100644 --- a/abs/core/nvidia-utils/PKGBUILD +++ b/abs/core/nvidia-utils/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: James Rayner pkgbase=nvidia-utils pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia') -pkgver=346.35 +pkgver=346.47 pkgrel=2 arch=('i686' 'x86_64') url="http://www.nvidia.com/" @@ -12,8 +12,8 @@ license=('custom') options=('!strip') source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -sha1sums=('b011f4767ac6fef2aa677923626dc235317af2c6' - 'deb4535a9546b56ee1dbd1053bc56a3dd9c62117') +sha1sums=('fff888527a89b95e2f32bdc8fe00d9e7c6112415' + 'fc5f00fe21d48c0cafec6048837e53f6ef402aa8') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" diff --git a/abs/core/nvidia-utils/nvidia-utils.install b/abs/core/nvidia-utils/nvidia-utils.install index df17a32..1955c64 100644 --- a/abs/core/nvidia-utils/nvidia-utils.install +++ b/abs/core/nvidia-utils/nvidia-utils.install @@ -1,14 +1,10 @@ -post_install() { - if ! getent group nvidia-persistenced >/dev/null; then - groupadd -g 143 nvidia-persistenced - fi - if ! getent passwd nvidia-persistenced >/dev/null; then - useradd -c 'NVIDIA Persistence Daemon' -u 143 -g nvidia-persistenced -d '/' -s /sbin/nologin nvidia-persistenced - fi +post_upgrade() { + echo "If you run into trouble with CUDA not being available, run nvidia-modprobe first." } -post_remove() { - if getent group nvidia-persistenced >/dev/null; then - userdel -f nvidia-persistenced - fi +post_install() { + getent group nvidia-persistenced &>/dev/null || groupadd -g 143 nvidia-persistenced + getent passwd nvidia-persistenced &>/dev/null || useradd -c 'NVIDIA Persistence Daemon' -u 143 -g nvidia-persistenced -d '/' -s /sbin/nologin nvidia-persistenced + + post_upgrade } diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD index 991e153..f541e58 100644 --- a/abs/core/nvidia/PKGBUILD +++ b/abs/core/nvidia/PKGBUILD @@ -1,10 +1,11 @@ # $Id$ -# Maintainer : Thomas Baechler +# Maintainer: Sven-Hendrik Haase +# Maintainer: Thomas Baechler pkgname=nvidia -pkgver=346.35 +pkgver=346.47 _extramodules=extramodules-3.18-ARCH -pkgrel=4 +pkgrel=9 pkgdesc="NVIDIA drivers for linux" arch=('i686' 'x86_64') url="http://www.nvidia.com/" @@ -14,11 +15,9 @@ license=('custom') install=nvidia.install options=(!strip) source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" - "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" - nv-drm-343.36.patch) -md5sums=('d2b8f7f90ef5037f03f94519f9809511' - '9ca9f07f91361362f304ca8317ddd453' - 'ff8a5f979e4428f8c847423fb007042c') + "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") +md5sums=('ae61b6c3c081383f991bcc64ee0844b1' + '115b5b2d136c4b44c658ef823b8a4bab') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" @@ -27,7 +26,6 @@ prepare() { sh "${_pkg}.run" --extract-only cd "${_pkg}" # patches here - patch -p1 -i ../nv-drm-343.36.patch } build() { diff --git a/abs/core/nvidia/__changelog b/abs/core/nvidia/__changelog index a8f8250..8bc0490 100644 --- a/abs/core/nvidia/__changelog +++ b/abs/core/nvidia/__changelog @@ -1 +1,2 @@ +PKGBUILD: use dep "nvidia-libgl" instead of libgl nvidia.install: post_upgrade add root cron job to run xconfig.cron -- cgit v0.12 From e48d10bab10c9a87fed652fb97af655977476862 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 16 Mar 2015 17:43:15 +0000 Subject: nvidia-340xx & nvidia-340xx-utils: update to 340.76 --- abs/core/nvidia-340xx-utils/PKGBUILD | 8 ++++---- abs/core/nvidia-340xx-utils/nvidia-340xx-utils.install | 18 +++++++----------- abs/core/nvidia-340xx/PKGBUILD | 8 ++++---- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/abs/core/nvidia-340xx-utils/PKGBUILD b/abs/core/nvidia-340xx-utils/PKGBUILD index 46681f7..5edb627 100644 --- a/abs/core/nvidia-340xx-utils/PKGBUILD +++ b/abs/core/nvidia-340xx-utils/PKGBUILD @@ -4,16 +4,16 @@ # Contributor: James Rayner pkgbase=nvidia-340xx-utils pkgname=('nvidia-340xx-utils' 'nvidia-340xx-libgl' 'opencl-nvidia-340xx') -pkgver=340.65 -pkgrel=1 +pkgver=340.76 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.nvidia.com/" license=('custom') options=('!strip') source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -sha1sums=('051a5b6aad243c5b57ed18455a91f9aa028de86d' - '2b1a102e87740ebb5367a5e8cd76d4f38de2add1') +sha1sums=('1335af174324f5c752388110e65c3c51beea729b' + '2df59750d9fdeed613e84379108fb2bec67afd14') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" diff --git a/abs/core/nvidia-340xx-utils/nvidia-340xx-utils.install b/abs/core/nvidia-340xx-utils/nvidia-340xx-utils.install index df17a32..1955c64 100644 --- a/abs/core/nvidia-340xx-utils/nvidia-340xx-utils.install +++ b/abs/core/nvidia-340xx-utils/nvidia-340xx-utils.install @@ -1,14 +1,10 @@ -post_install() { - if ! getent group nvidia-persistenced >/dev/null; then - groupadd -g 143 nvidia-persistenced - fi - if ! getent passwd nvidia-persistenced >/dev/null; then - useradd -c 'NVIDIA Persistence Daemon' -u 143 -g nvidia-persistenced -d '/' -s /sbin/nologin nvidia-persistenced - fi +post_upgrade() { + echo "If you run into trouble with CUDA not being available, run nvidia-modprobe first." } -post_remove() { - if getent group nvidia-persistenced >/dev/null; then - userdel -f nvidia-persistenced - fi +post_install() { + getent group nvidia-persistenced &>/dev/null || groupadd -g 143 nvidia-persistenced + getent passwd nvidia-persistenced &>/dev/null || useradd -c 'NVIDIA Persistence Daemon' -u 143 -g nvidia-persistenced -d '/' -s /sbin/nologin nvidia-persistenced + + post_upgrade } diff --git a/abs/core/nvidia-340xx/PKGBUILD b/abs/core/nvidia-340xx/PKGBUILD index 30134be..2f7a95a 100644 --- a/abs/core/nvidia-340xx/PKGBUILD +++ b/abs/core/nvidia-340xx/PKGBUILD @@ -2,9 +2,9 @@ # Maintainer : Thomas Baechler pkgname=nvidia-340xx -pkgver=340.65 +pkgver=340.76 _extramodules=extramodules-3.18-ARCH -pkgrel=8 +pkgrel=5 pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" arch=('i686' 'x86_64') url="http://www.nvidia.com/" @@ -17,8 +17,8 @@ options=(!strip) source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" nv-drm.patch) -md5sums=('4aa6039b8543312b41a924bb87b0b2db' - '4558104f8601d27c7fd3e5cec7892345' +md5sums=('8064c0a0998c3e7ee3c98ac1832b8194' + '440df290e213280d6e20d4d4be6f8b4c' '79671a27131da619a33eb02ed0c2c031') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" -- cgit v0.12 From 548b212c280e9de289466870364300d869a73178 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 16 Mar 2015 17:49:40 +0000 Subject: nvidia-304xx: recompile --- abs/core/nvidia-304xx/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/nvidia-304xx/PKGBUILD b/abs/core/nvidia-304xx/PKGBUILD index 56595a6..28be9c7 100644 --- a/abs/core/nvidia-304xx/PKGBUILD +++ b/abs/core/nvidia-304xx/PKGBUILD @@ -5,7 +5,7 @@ pkgname=nvidia-304xx pkgver=304.125 _extramodules=extramodules-3.18-ARCH -pkgrel=7 +pkgrel=8 pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" arch=('i686' 'x86_64') url="http://www.nvidia.com/" -- cgit v0.12 From 066b443d7dd1e4f923c1053b9f67912e5a43bafd Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 16 Mar 2015 18:26:03 +0000 Subject: ceton_infinitv: rebuild --- abs/core/ceton_infinitv/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/ceton_infinitv/PKGBUILD b/abs/core/ceton_infinitv/PKGBUILD index ee86b84..87dde5c 100755 --- a/abs/core/ceton_infinitv/PKGBUILD +++ b/abs/core/ceton_infinitv/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: Cecil Watson pkgname=ceton_infinitv -_kernver=3.18.4-1-ARCH +_kernver=3.18.9-1-ARCH _extramods="extramodules-3.18-ARCH" pkgver=2013_0326_2226 -pkgrel=8 +pkgrel=9 usb_pkgver=0.1.0 pkgdesc="Drivers for Ceton InfiniTV4 - pci/usb " arch=('i686' 'x86_64') -- cgit v0.12 From 17647fa586e84751187af765373f1059e15b549e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 16 Mar 2015 18:55:24 +0000 Subject: LinHES-system: stop_xss.sh: add kodi and plexhometheater --- 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 a0f182b..5bb8454 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.3 -pkgrel=10 +pkgrel=11 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -117,7 +117,7 @@ md5sums=('8415c4b2587a8a1e6a312484c1edafcb' 'd8f30983055dcfe2f53197d0f9a62158' '17f678d37187be0f12d67f64e40429c6' 'bacc813b48bafcc6fe906e5969930501' - '8e02efe1ad0df9a179075147eebb05b9' + 'dedd3fcb1abec6361f4060d8149c7d6d' '8b0298f70f97cc1dc2a58b9a73c64bd3' '716710e0db42147b079c9ec1c7080efa' 'cd28dd67a78f3b7da704e31db0298916' diff --git a/abs/core/LinHES-system/stop_xss.sh b/abs/core/LinHES-system/stop_xss.sh index b03169b..b73be85 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 google-chrome)" -o "$(pidof huludesktop)" -o "$(pidof xbmc.bin)" ] + if [ "$(pidof google-chrome)" -o "$(pidof huludesktop)" -o "$(pidof kodi.bin)" -o "$(pidof plexhometheater)" ] then xscreensaver-command -deactivate fi -- cgit v0.12 From 31841a335c75534c56a8d336a2a8db82e49df7da Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 16 Mar 2015 23:51:01 +0000 Subject: plex-home-theater: stop xscreensaver --- abs/extra/plex-home-theater/PKGBUILD | 8 ++++---- abs/extra/plex-home-theater/__changelog | 3 ++- abs/extra/plex-home-theater/plex-home-theater.install | 4 ++++ abs/extra/plex-home-theater/plex_lib.conf | 2 +- abs/extra/plex-home-theater/plexhometheater.sh | 8 +++++++- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/abs/extra/plex-home-theater/PKGBUILD b/abs/extra/plex-home-theater/PKGBUILD index 2f2c087..cbb8cb1 100755 --- a/abs/extra/plex-home-theater/PKGBUILD +++ b/abs/extra/plex-home-theater/PKGBUILD @@ -5,7 +5,7 @@ pkgname=plex-home-theater _pkgver=1.3.6.441-309e72d1 pkgver=${_pkgver%-*} -pkgrel=1 +pkgrel=2 pkgdesc='Plex Home Theater' arch=('i686' 'x86_64') url='http://www.plexapp.com/' @@ -60,7 +60,7 @@ package() { mv "${pkgdir}"/usr/bin/{system,xbmc-xrandr} "${pkgdir}"/usr/lib/plexhometheater/ mv "${pkgdir}"/usr/share/XBMC "${pkgdir}"/usr/share/plexhometheater rm -rf "${pkgdir}"/usr/bin/*.so - install -m 755 "${srcdir}"/plexhometheater.sh "${pkgdir}"/usr/bin/ + install -Dm 755 "${srcdir}"/plexhometheater.sh "${pkgdir}"/usr/LH/bin/plexhometheater.sh install -m 644 ../plex/Resources/plexhometheater.desktop "${pkgdir}"/usr/share/applications/ install -m 644 ../plex/Resources/plex-icon-256.png "${pkgdir}"/usr/share/pixmaps/plexhometheater.png @@ -74,5 +74,5 @@ md5sums=('370627c3d9e190e7af2cb8cf2a67f488' '6704244166497db7fa6b3ddd43a0e53b' '066484ad4949f96ddddaa8b1d4d709e1' '09e67d694093eb6bd243fb9a4ddf5d70' - '8735a4e7857bc85085482c4f8bcb1d01' - '8fae1350cc36f40ed65fbf96128a02d0') + 'c1eedd9f89ee727230833db9ef1e5d29' + '4ceae60ed2f9e4304eda4f80d407e799') diff --git a/abs/extra/plex-home-theater/__changelog b/abs/extra/plex-home-theater/__changelog index 83f5069..e631336 100644 --- a/abs/extra/plex-home-theater/__changelog +++ b/abs/extra/plex-home-theater/__changelog @@ -1,3 +1,4 @@ PKGBUILD - Remove opt dep pulseaudio PKGBUILD - Added plex_lib.conf, this file goes in /etc/gen_lib_xml.d/ -plexhometheater.install - add gen_lib_xml.py to post_install and post_remove +PKGBUILD - Install plexhometheater.sh to /usr/LH/bin +plexhometheater.install - add gen_lib_xml.py to post_install and post_remove and post_update diff --git a/abs/extra/plex-home-theater/plex-home-theater.install b/abs/extra/plex-home-theater/plex-home-theater.install index 3633bdc..6788abc 100644 --- a/abs/extra/plex-home-theater/plex-home-theater.install +++ b/abs/extra/plex-home-theater/plex-home-theater.install @@ -2,6 +2,10 @@ post_install() { gen_lib_xml.py } +post_upgrade() { + gen_lib_xml.py +} + post_remove() { gen_lib_xml.py } diff --git a/abs/extra/plex-home-theater/plex_lib.conf b/abs/extra/plex-home-theater/plex_lib.conf index 70db20a..1aa78f3 100644 --- a/abs/extra/plex-home-theater/plex_lib.conf +++ b/abs/extra/plex-home-theater/plex_lib.conf @@ -3,7 +3,7 @@ MENU_PLEX Launch Plex Open Plex Home Theater - EXEC /usr/bin/plexhometheater.sh + EXEC /usr/LH/bin/plexhometheater.sh diff --git a/abs/extra/plex-home-theater/plexhometheater.sh b/abs/extra/plex-home-theater/plexhometheater.sh index 53276ff..579bed6 100755 --- a/abs/extra/plex-home-theater/plexhometheater.sh +++ b/abs/extra/plex-home-theater/plexhometheater.sh @@ -1,5 +1,11 @@ #!/bin/sh +#Stop XScreensaver +stop_xss.sh & +#Launch plex export XBMC_BIN_HOME='/usr/lib/plexhometheater' export XBMC_HOME='/usr/share/plexhometheater' -exec plexhometheater +plexhometheater + +#Start Xscreensaver again +killall stop_xss.sh -- cgit v0.12 From c92b80f37680a17f20bbf2b73d16a99efa1b8aeb Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 17 Mar 2015 17:12:23 +0000 Subject: libva: update to 1.5. refs #992 --- abs/extra/libva/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/extra/libva/PKGBUILD b/abs/extra/libva/PKGBUILD index dad11fd..c72c8c4 100644 --- a/abs/extra/libva/PKGBUILD +++ b/abs/extra/libva/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Bartłomiej Piotrowski pkgname=libva -pkgver=1.4.1 +pkgver=1.5.0 pkgrel=1 pkgdesc='Video Acceleration (VA) API for Linux' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('mesa') optdepends=('libva-vdpau-driver: backend for Nvidia and AMD cards' 'libva-intel-driver: backend for Intel cards') source=(http://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('8e3e7096750c14d1f98da807df7c1ba5') +md5sums=('ad0b55794308ec397d249a0a2a6df27a') build() { cd $pkgname-$pkgver -- cgit v0.12 From f3dc167e69299c96c759c86c96a8af44e05e2ff1 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 17 Mar 2015 17:19:09 +0000 Subject: libva-intel-driver: initial inclusion. closes #992 --- abs/extra/libva-intel-driver/PKGBUILD | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 abs/extra/libva-intel-driver/PKGBUILD diff --git a/abs/extra/libva-intel-driver/PKGBUILD b/abs/extra/libva-intel-driver/PKGBUILD new file mode 100644 index 0000000..3e6e18a --- /dev/null +++ b/abs/extra/libva-intel-driver/PKGBUILD @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Ionut Biru +# Maintainer: Bartłomiej Piotrowski + +pkgname=libva-intel-driver +pkgver=1.5.0 +pkgrel=1 +pkgdesc='VA-API implementation for Intel G45 and HD Graphics family' +arch=('i686' 'x86_64') +url='http://freedesktop.org/wiki/Software/vaapi' +license=('MIT') +depends=('libva') +replaces=('libva-driver-intel') +source=(http://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('16752f1584398265072129553b7907ce') + +prepare() { + cd $pkgname-$pkgver + + # Only relevant if intel-gpu-tools is installed, + # since then the shaders will be recompiled + sed -i '1s/python$/&2/' src/shaders/gpp.py +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} -- cgit v0.12 From 21454b205c83cacadc9773dfda8db67fd5820bfb Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 25 Mar 2015 19:25:59 +0000 Subject: LinHES-config: mv_ir.py: mv /etc/lircd.conf to /etc/lircd.conf.d/ for lirc 0.9.2 --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/mv_ir.py | 30 +++++++++++++++++++++--------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index e35f4a4..4bdde13 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.3 -pkgrel=12 +pkgrel=13 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' @@ -162,7 +162,7 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff' 'c0549457750c4f8e8038d904a0f3012a' 'cb7abd558b6540bc5e2232866a2a42f8' 'b845de3e05c1734cce4b9ac5e8f1baaf' - '077ebce663edba30ba7f93e4d245d125' + '02b4378b17bca6bebdcc2258a80dfc6b' '8b7dce4a3a0a281fa6656aa8781a648e' '4b10fff21a0274f950f97f2b61e92463' '824e49d9b01fed295c704ab68908b464' diff --git a/abs/core/LinHES-config/mv_ir.py b/abs/core/LinHES-config/mv_ir.py index 8eab7b0..bab77a5 100755 --- a/abs/core/LinHES-config/mv_ir.py +++ b/abs/core/LinHES-config/mv_ir.py @@ -34,13 +34,15 @@ def setup_lirc_links(mythhome): if os.path.exists("/etc/lircrc"): if not os.path.exists(mythhome+"/.mythtv/lircrc"): logging.debug(" Creating symlink for myth lircrc") - os.symlink("/etc/lircrc",mythhome+"/.mythtv/lircrc") + #os.symlink("/etc/lircrc",mythhome+"/.mythtv/lircrc") + mv_common.link_file("/etc/lircrc",mythhome+"/.mythtv/lircrc") else: logging.debug(" %s/lircrc already present",mythhome) if not os.path.exists(mythhome+"/.lircrc"): logging.debug(" Creating symlink for lircrc") - os.symlink("/etc/lircrc",mythhome+"/.lircrc") + #os.symlink("/etc/lircrc",mythhome+"/.lircrc") + mv_common.link_file("/etc/lircrc",mythhome+"/.lircrc") else: logging.debug(" %s/.lircrc already present",mythhome) else: @@ -49,7 +51,8 @@ def setup_lirc_links(mythhome): if os.path.exists("/etc/wol-lircrc"): if not os.path.exists(mythhome+"/.wol-lircrc"): logging.debug(" Creating symlink for .wol-lircrc") - os.symlink("/etc/wol-lircrc",mythhome+"/.wol-lircrc") + #os.symlink("/etc/wol-lircrc",mythhome+"/.wol-lircrc") + mv_common.link_file("/etc/wol-lircrc",mythhome+"/.wol-lircrc") else: logging.debug(" %s/.wol-lircrc already present",mythhome) else: @@ -108,6 +111,12 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket): currenttime = strftime("%b-%d-%Y-%H:%M:%S", localtime()) cmd = "mv /etc/lircd.conf /etc/lircd.conf-%s" %currenttime mv_common.runcmd(cmd) + cmd = "mv /etc/lirc/lircd.conf.d/remote_lircd.conf /etc/lirc/lircd.conf.d/remote_lircd.conf-%s" %currenttime + mv_common.runcmd(cmd) + cmd = "mv /etc/lirc/lircd.conf.d/blaster_lircd.conf /etc/lirc/lircd.conf.d/blaster_lircd.conf-%s" %currenttime + mv_common.runcmd(cmd) + cmd = "mv /etc/lirc/lircd.conf.d/lcd_lircd.conf /etc/lirc/lircd.conf.d/lcd_lircd.conf-%s" %currenttime + mv_common.runcmd(cmd) cmd = "mv /etc/lircrc /etc/lircrc-%s" %currenttime mv_common.runcmd(cmd) cmd = "mv /etc/wol-lircrc /etc/wol-lircrc-%s" %currenttime @@ -121,13 +130,14 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket): files = remote_path + "/lircd*" logging.debug(" Using %s",files) - # /etc/lircd.conf symlink + # was /etc/lircd.conf symlink + # /etc/lirc/lircd.conf.d/remote_lircd.conf symlink for filename in glob.glob(files): # Ignore subfolders if os.path.isdir (filename): logging.debug(" %s is a dir, skipping",filename) continue - os.symlink(filename,"/etc/lircd.conf") + mv_common.link_file(filename,"/etc/lirc/lircd.conf.d/remote_lircd.conf") #files = templates + "/remotes/" + Remotetype + "/lircrc*" # include lircrc @@ -198,7 +208,7 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket): cmd = ''' rm -f %s''' %(userLircmap) mv_common.runcmd(cmd) logging.debug(" Creating symlink for %s Lircmap.xml",app) - os.symlink(kodifile, mythhome+"/"+userdirname+"/userdata/Lircmap.xml") + mv_common.link_file(kodifile, mythhome+"/"+userdirname+"/userdata/Lircmap.xml") except: pass else: @@ -316,8 +326,9 @@ def setup_blaster_proto(HostBlasterType,Hostnumblaster,TEMPLATES,systemconfig): continue template=TEMPLATES+"/transmit/%s/lircd.conf" %proto if os.path.exists(template): - logging.debug(" include blaster template: %s",proto) - include_file("/etc/lircd.conf",template) + logging.debug(" link blaster template: %s",proto) + mv_common.link_file(template,"/etc/lirc/lircd.conf.d/blaster_lircd.conf") + #include_file("/etc/lircd.conf",template) else: logging.debug(" template: %s is not present",template) @@ -400,7 +411,8 @@ def setup_lcd(LCDtype, TEMPLATES, Remotetype, this_is_install): if os.path.isdir (filename): logging.debug(" %s is a dir, skipping",filename) continue - include_file("/etc/lircd.conf",filename) + mv_common.link_file(filename,"/etc/lirc/lircd.conf.d/lcd_lircd.conf") + #include_file("/etc/lircd.conf",filename) files = lcdlirc+"/lircrc*" logging.debug(" Using %s",files) for filename in glob.glob(files): -- cgit v0.12 From 07adb017098ed9f932975371c8c8d4b622bb31d8 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 25 Mar 2015 19:43:15 +0000 Subject: system-templates: remove lircd.conf.ff2 --- abs/core/system-templates/PKGBUILD | 2 +- .../ATI/snapstream_firefly_ch3/lircd.conf.ff2 | 111 --------------------- 2 files changed, 1 insertion(+), 112 deletions(-) delete mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircd.conf.ff2 diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD index 372fe8f..26e2013 100755 --- a/abs/core/system-templates/PKGBUILD +++ b/abs/core/system-templates/PKGBUILD @@ -1,6 +1,6 @@ pkgname=system-templates pkgver=8.3 -pkgrel=7 +pkgrel=8 conflicts=( ) pkgdesc="Templates used for system configuration" depends=() diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircd.conf.ff2 b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircd.conf.ff2 deleted file mode 100644 index 6218b7f..0000000 --- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircd.conf.ff2 +++ /dev/null @@ -1,111 +0,0 @@ -#Snapstream Firefly Channel 2 -begin remote - name Snapstream_Firefly - bits 40 - eps 30 - aeps 100 - one 0 0 - zero 0 0 - gap 219964 - toggle_bit 0 - begin codes - MAXI 0x0000001491AC1000 - MAXI 0x00000014112C1000 - CLOSE 0x00000014E7021000 - CLOSE 0x0000001467821000 - 1 0x00000014728D1000 - 1 0x00000014F20D1000 - 2 0x00000014F30E1000 - 2 0x00000014738E1000 - 3 0x00000014748F1000 - 3 0x00000014F40F1000 - 4 0x00000014F5101000 - 4 0x0000001475901000 - 5 0x0000001476911000 - 5 0x00000014F6111000 - 6 0x00000014F7121000 - 6 0x0000001477921000 - 7 0x0000001478931000 - 7 0x00000014F8131000 - 8 0x00000014F9141000 - 8 0x0000001479941000 - 9 0x000000147A951000 - 9 0x00000014FA151000 - 0 0x00000014FC171000 - 0 0x000000147C971000 - BACK 0x000000147B961000 - BACK 0x00000014FB161000 - ENT 0x00000014FD181000 - ENT 0x000000147D981000 - VOL+ 0x000000146E891000 - VOL+ 0x00000014EE091000 - VOL- 0x000000146D881000 - VOL- 0x00000014ED081000 - MUTE 0x000000146F8A1000 - MUTE 0x00000014EF0A1000 - FIREFLY 0x0000001465801000 - FIREFLY 0x00000014E5001000 - CH+ 0x00000014708B1000 - CH+ 0x00000014F00B1000 - CH- 0x00000014718C1000 - CH- 0x00000014F10C1000 - INFO 0x0000001493AE1000 - INFO 0x00000014132E1000 - OPTION 0x0000001494AF1000 - OPTION 0x00000014142F1000 - UP 0x000000147F9A1000 - UP 0x00000014FF1A1000 - LEFT 0x00000014829D1000 - LEFT 0x00000014021D1000 - DOWN 0x0000001487A21000 - DOWN 0x0000001407221000 - RIGHT 0x00000014849F1000 - RIGHT 0x00000014041F1000 - OK 0x00000014839E1000 - OK 0x00000014031E1000 - MENU 0x00000014819C1000 - MENU 0x00000014011C1000 - EXIT 0x0000001485A01000 - EXIT 0x0000001405201000 - REC 0x000000140C271000 - REC 0x000000148CA71000 - PLAY 0x000000140A251000 - PLAY 0x000000148AA51000 - STOP 0x000000140D281000 - STOP 0x000000148DA81000 - REW 0x0000001409241000 - REW 0x0000001489A41000 - FWD 0x000000140B261000 - FWD 0x000000148BA61000 - PREV 0x00000014102B1000 - PREV 0x0000001490AB1000 - PAUSE 0x000000140E291000 - PAUSE 0x000000148EA91000 - NEXT 0x000000140F2A1000 - NEXT 0x000000148FAA1000 - MUSIC 0x00000014EB061000 - MUSIC 0x000000146B861000 - PHOTOS 0x00000014EA051000 - PHOTOS 0x000000146A851000 - DVD 0x00000014E9041000 - DVD 0x0000001469841000 - TV 0x00000014E8031000 - TV 0x0000001468831000 - VIDEO 0x00000014EC071000 - VIDEO 0x000000146C871000 - HELP 0x00000014E6011000 - HELP 0x0000001466811000 - MOUSE 0x00000014122D1000 - MOUSE 0x0000001492AD1000 - A 0x00000014FE191000 - A 0x000000147E991000 - B 0x00000014001B1000 - B 0x00000014809B1000 - C 0x0000001406211000 - C 0x0000001486A11000 - D 0x0000001408231000 - D 0x0000001488A31000 - - end codes - -end remote -- cgit v0.12 From e32a120f7893a93053880f7a7b09ac3be7786b16 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 25 Mar 2015 20:57:41 +0000 Subject: lirc: remove symlink to /etc/lircd.conf --- abs/core/lirc/PKGBUILD | 7 ++----- abs/core/lirc/__changelog | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/abs/core/lirc/PKGBUILD b/abs/core/lirc/PKGBUILD index bfd259f..c9b70c1 100644 --- a/abs/core/lirc/PKGBUILD +++ b/abs/core/lirc/PKGBUILD @@ -4,7 +4,7 @@ pkgname=lirc _pkgver=0.9.2a [[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver" -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="Linux Infrared Remote Control utils" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('help2man' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2 provides=('lirc-utils') conflicts=('lirc-utils') replaces=('lirc-utils') -backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf') +#backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf') install=lirc.install source=("http://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2" lirc.logrotate @@ -44,8 +44,5 @@ package() { install -Dm644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf install -Dm644 "${srcdir}"/lirc.logrotate "${pkgdir}"/etc/logrotate.d/lirc - # LinHES remotes service uses /etc/lircd.conf so create symlink - ln -s "/etc/lircd.conf" "${pkgdir}/etc/lirc/lircd.conf.d/mv_ir_lircd.conf" - rmdir "${pkgdir}"/var/{run/lirc/,run/,} } diff --git a/abs/core/lirc/__changelog b/abs/core/lirc/__changelog index 65391d7..5d3d026 100644 --- a/abs/core/lirc/__changelog +++ b/abs/core/lirc/__changelog @@ -2,6 +2,4 @@ PKGBUILD: add 'iguanair' to depends PKGBUILD: change dep python to python2 PKGBUILD: comment out optdepends PKGBUILD: add sed to not use python3 -PKGBUILD: # LinHES remotes service uses /etc/lircd.conf so create symlink - ln -s "/etc/lircd.conf" "${pkgdir}/etc/lirc/lircd.conf.d/mv_ir_lircd.conf" lirc.install: comment out service message -- cgit v0.12 From 96bf89ed1c7d4e60200175fd7cef5e6d40adcac4 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 25 Mar 2015 21:27:58 +0000 Subject: google-chrome: update to 41.0.2272.101 --- abs/extra/google-chrome/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD index 02438f4..ee7f02a 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=41.0.2272.76 +pkgver=41.0.2272.101 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -57,5 +57,5 @@ package() { msg2 "Rename google-chrome-stable to google-chrome..." mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome } -md5sums=('ab26799a646dfee5ad6fceb250fbd6c1' +md5sums=('854249db290c76e024b734e77b49e72a' 'b7e752f549b215ac77f284b6486794b6') -- cgit v0.12 From a2bc885a821158d0548af0c762169a4dd1247c80 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 2 Apr 2015 18:44:55 +0000 Subject: mythtv: update to latest -fixes --- abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index 01588e7..de00569 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -f1115fcd2b5cef93e870f926f53bf32cf546da9d +628183a01b66a010e9cf510b9d1d08a348ed5889 diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index f648788..455eb8b 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.4 -pkgrel=11 +pkgrel=12 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12 From 630e90d4bea676f1252c53e9722d802003f741ee Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 2 Apr 2015 19:34:52 +0000 Subject: google-chrome: update to 41.0.2272.118 --- 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 ee7f02a..4475174 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=41.0.2272.101 +pkgver=41.0.2272.118 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' 'desktop-file-utils' 'flac' 'gconf' 'gtk2' 'harfbuzz' 'harfb 'icu' 'libcups' 'libpng' 'libxss' 'libxtst' 'nss' 'opus' 'snappy' 'speech-dispatcher' 'ttf-font' 'xdg-utils') optdepends=('kdebase-kdialog: needed for file dialogs in KDE' 'ttf-liberation: fix fonts for some PDFs') -provides=("google-chrome=$pkgver") +provides=('google-chrome' 'pepper-flash') options=('!emptydirs' '!strip') install=$pkgname.install _channel=stable @@ -57,5 +57,5 @@ package() { msg2 "Rename google-chrome-stable to google-chrome..." mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome } -md5sums=('854249db290c76e024b734e77b49e72a' +md5sums=('ef61d7c2b66ba26b1f297f82e7e1a52b' 'b7e752f549b215ac77f284b6486794b6') -- cgit v0.12 From c0713a8a1b174ed93a145ca666d963f931add8ae Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 15 Apr 2015 13:58:06 +0000 Subject: php: php.ini uncomment extension=pdo_mysql.so for zoneminder --- abs/core/php/PKGBUILD | 4 ++-- abs/core/php/php.ini.patch | 4 ++-- abs/core/php/php.install | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/abs/core/php/PKGBUILD b/abs/core/php/PKGBUILD index b092e71..d20dc55 100644 --- a/abs/core/php/PKGBUILD +++ b/abs/core/php/PKGBUILD @@ -23,7 +23,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.6.3 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' @@ -384,7 +384,7 @@ package_php-xsl() { } md5sums=('7635f344145a4edd7dff6ecec795aaea' 'SKIP' - '8768a43f8e435e9bbe56ef714214f9b6' + 'b1088bdc55787f55019a2853e28dff84' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '6bc1fc4ceee039d21ff3b56aa845cc5a' '25bc67ad828e8147a817410b68d8016c' diff --git a/abs/core/php/php.ini.patch b/abs/core/php/php.ini.patch index 78f51d4..920553e 100644 --- a/abs/core/php/php.ini.patch +++ b/abs/core/php/php.ini.patch @@ -1,5 +1,5 @@ --- php.ini-production.orig 2014-12-08 15:38:39.686053082 +0000 -+++ php.ini-production 2014-12-08 15:45:54.966578982 +0000 ++++ php.ini-production 2015-04-15 12:09:34.685705719 +0000 @@ -199,7 +199,7 @@ ; Development Value: Off ; Production Value: Off @@ -114,7 +114,7 @@ +;extension=odbc.so +;zend_extension=opcache.so +extension=openssl.so -+;extension=pdo_mysql.so ++extension=pdo_mysql.so +;extension=pdo_odbc.so +;extension=pdo_pgsql.so +;extension=pdo_sqlite.so diff --git a/abs/core/php/php.install b/abs/core/php/php.install index 772c0ea..49fe408 100755 --- a/abs/core/php/php.install +++ b/abs/core/php/php.install @@ -4,7 +4,7 @@ post_install() { . /etc/systemconfig if [ -f /etc/php/php.ini ] then - sed -i 's|^.*date.timezone.*$|date.timezone='${timezone}'|' /etc/php/php.ini + sed -i 's|^.*date.timezone.*=.*$|date.timezone='${timezone}'|' /etc/php/php.ini fi fi } -- cgit v0.12 From bc8986e4e2b000156dd643362b900b1e5ed62084 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 15 Apr 2015 15:39:14 +0000 Subject: zoneminder: fix path for http srv dir --- abs/core/zoneminder/PKGBUILD | 21 +++++++++++---------- abs/core/zoneminder/zoneminder.install | 10 +++++----- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/abs/core/zoneminder/PKGBUILD b/abs/core/zoneminder/PKGBUILD index 686ffb0..e5c6b5d 100644 --- a/abs/core/zoneminder/PKGBUILD +++ b/abs/core/zoneminder/PKGBUILD @@ -11,7 +11,7 @@ pkgbase=zoneminder pkgname=zoneminder pkgver=1.28.0 -pkgrel=4 +pkgrel=5 pkgdesc='Capture, analyse, record and monitor video security cameras' arch=( i686 x86_64 mips64el arm ) @@ -68,8 +68,8 @@ build() { cd $srcdir/ZoneMinder-$pkgver cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DZM_CGIDIR=/data/srv/http/cgi-bin \ - -DZM_WEBDIR=/data/srv/http/zoneminder \ + -DZM_CGIDIR=/data/srv/httpd/cgi-bin \ + -DZM_WEBDIR=/data/srv/httpd/zoneminder \ -DZM_WEB_USER=http \ -DZM_CONTENTDIR=/var/cache/zoneminder \ -DZM_LOGDIR=/var/log/zoneminder \ @@ -100,21 +100,22 @@ package() { for i in events images temp; do mkdir $pkgdir/var/cache/$pkgbase/$i # chown -v http.http $pkgdir/var/cache/$pkgbase/$i - ln -s /var/cache/$pkgbase/$i $pkgdir/data/srv/http/$pkgbase/$i - chown -v --no-dereference http.http $pkgdir/data/srv/http/$pkgbase/$i + ln -s /var/cache/$pkgbase/$i $pkgdir/data/srv/httpd/$pkgbase/$i + chown -v --no-dereference http.http $pkgdir/data/srv/httpd/$pkgbase/$i done # Create a link to the Zoneminder cgi binaries - ln -sv /data/srv/http/cgi-bin $pkgdir/data/srv/http/$pkgbase + ln -sv /data/srv/httpd/cgi-bin $pkgdir/data/srv/httpd/$pkgbase - chown -h http.http $pkgdir/data/srv/http/{cgi-bin,$pkgbase,$pkgbase/cgi-bin} + chown -h http.http $pkgdir/data/srv/httpd/{cgi-bin,$pkgbase,$pkgbase/cgi-bin} # Link Cambozola - ln -s /usr/share/cambozola/cambozola.jar $pkgdir/data/srv/http/$pkgbase + ln -s /usr/share/cambozola/cambozola.jar $pkgdir/data/srv/httpd/$pkgbase # Install configuration files - mkdir -p $pkgdir/etc/httpd/conf/extra - install -D -m 644 $srcdir/httpd-$pkgbase.conf $pkgdir/etc/httpd/conf/extra +# don't need these in LinHES as we use lighttpd not apache +# mkdir -p $pkgdir/etc/httpd/conf/extra +# install -D -m 644 $srcdir/httpd-$pkgbase.conf $pkgdir/etc/httpd/conf/extra mkdir -p $pkgdir/usr/lib/systemd/system install -D -m 644 $srcdir/$pkgbase.service $pkgdir/usr/lib/systemd/system install -D -m 644 COPYING $pkgdir/usr/share/license/$pkgbase diff --git a/abs/core/zoneminder/zoneminder.install b/abs/core/zoneminder/zoneminder.install index e074c32..a086b96 100644 --- a/abs/core/zoneminder/zoneminder.install +++ b/abs/core/zoneminder/zoneminder.install @@ -18,14 +18,14 @@ install_db() { pre_install() { set -e abort=false - if [ -L /data/srv/http/zoneminder/events ]; then - l=$(readlink /data/srv/http/zoneminder/events) + if [ -L /data/srv/httpd/zoneminder/events ]; then + l=$(readlink /data/srv/httpd/zoneminder/events) if [ $l != /var/cache/zoneminder/events ]; then abort=true fi fi - if [ -L /data/srv/http/zoneminder/images ]; then - l=$(readlink /data/srv/http/zoneminder/images) + if [ -L /data/srv/httpd/zoneminder/images ]; then + l=$(readlink /data/srv/httpd/zoneminder/images) if [ $l != /var/cache/zoneminder/images ]; then abort=true fi @@ -33,7 +33,7 @@ pre_install() { if [ $abort = true ]; then cat >&2 << EOF Aborting installation of zoneminder due to non-default symlinks in -/data/srv/http/zoneminder for the images and/or events directory, which could +/data/srv/httpd/zoneminder for the images and/or events directory, which could result in loss of data. Please move your data in each of these directories to /var/cache/zoneminder before installing zoneminder from the package. EOF -- cgit v0.12 From b55972cdaed6989cf757e8969d36a62d3f935b65 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 15 Apr 2015 17:38:02 +0000 Subject: mythtv, mythplugins, mythweb: update to latest fixes --- abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.27/git_src/git_hash_web | 2 +- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythweb/PKGBUILD | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index de00569..99e58be 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -628183a01b66a010e9cf510b9d1d08a348ed5889 +65ada0cff0b1a5c8c06846303cf2dad51980d1aa diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash_web b/abs/core/mythtv/stable-0.27/git_src/git_hash_web index e1c323c..49c87b1 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash_web +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash_web @@ -1 +1 @@ -e0c2a3aea94bc96be5836472a1c53e62b5e43c93 +a8c6695bc851887ed6d9ae565b9c2788f1d60a6a diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index e0bc885..d9b631f 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.4 -pkgrel=11 +pkgrel=13 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index 455eb8b..9ba2e36 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.4 -pkgrel=12 +pkgrel=13 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.27/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD index 9239c46..e9e94cc 100644 --- a/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweb pkgver=0.27 -pkgrel=6 +pkgrel=7 commit_hash=`cat ../git_src/git_hash_web` pkgdesc="Web interface for MythTV's backend, $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12 From 43ac79000851b71055195e4abea53d7485f7c8fd Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 15 Apr 2015 17:55:16 +0000 Subject: google-chrome: update to 42.0.2311.90 --- abs/extra/google-chrome/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD index 4475174..80a4297 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=41.0.2272.118 +pkgver=42.0.2311.90 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -57,5 +57,5 @@ package() { msg2 "Rename google-chrome-stable to google-chrome..." mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome } -md5sums=('ef61d7c2b66ba26b1f297f82e7e1a52b' +md5sums=('625ba01bb78602aad5577c8c0e0dc4d8' 'b7e752f549b215ac77f284b6486794b6') -- cgit v0.12 From 338facd2f16924a986dc272cc2496e40e7ce0e0a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 17 Apr 2015 13:40:47 +0000 Subject: system-templates: streamzap: add Lircmap.xml. closes #994 --- abs/core/system-templates/PKGBUILD | 2 +- .../remotes/favorites/streamzap/Lircmap.xml | 351 +++++++++++++++++++++ .../favorites/streamzap/lircd.conf.streamzap | 8 +- .../templates/remotes/favorites/streamzap/lircrc | 28 +- 4 files changed, 370 insertions(+), 19 deletions(-) create mode 100644 abs/core/system-templates/templates/remotes/favorites/streamzap/Lircmap.xml diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD index 26e2013..7ee11fc 100755 --- a/abs/core/system-templates/PKGBUILD +++ b/abs/core/system-templates/PKGBUILD @@ -1,6 +1,6 @@ pkgname=system-templates pkgver=8.3 -pkgrel=8 +pkgrel=9 conflicts=( ) pkgdesc="Templates used for system configuration" depends=() diff --git a/abs/core/system-templates/templates/remotes/favorites/streamzap/Lircmap.xml b/abs/core/system-templates/templates/remotes/favorites/streamzap/Lircmap.xml new file mode 100644 index 0000000..ed0a2b2 --- /dev/null +++ b/abs/core/system-templates/templates/remotes/favorites/streamzap/Lircmap.xml @@ -0,0 +1,351 @@ + + + + + LinHES - Lircmap.xml + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+ + +
+ +

Lircmap.xml

+ +
+

+ mattbatt, 04/16/2015 08:18 pm

+

Download (1.9 kB)

+ +
+  +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
1
<!-- ~/.kodi/userdata/Lircmap.xml                                                 -->
+
2
<!--                                                                              -->
+
3
<!-- This file maps XBMC_buttons to LIRC_buttons                                  -->
+
4
<!-- and is works with a custom ~/.kodi/userdata/remote.xml which maps            -->
+
5
<!-- XBMC_buttons to actions                                                      -->
+
6
<!--                                                                              -->
+
7
<!-- How to add remotes                                                           -->
+
8
<!-- <remote device="name_Lirc_calls_the_remote">                                 -->
+
9
<!--                                                                              -->
+
10
<!-- For the commands the layout following layout is used                         -->
+
11
<!-- <XBMC_button>LIRC_button</XBMC_button>                                       -->
+
12
+
13
<lircmap>
+
14
  <remote device="Streamzap_PC_Remote">
+
15
    <power>POWER</power>
+
16
    <play>PLAY</play>
+
17
    <pause>PAUSE</pause>
+
18
    <stop>STOP</stop>
+
19
    <forward>FOWARD</forward>
+
20
    <reverse>REWIND</reverse>
+
21
    <left>LEFT</left>
+
22
    <right>RIGHT</right>
+
23
    <up>UP</up>
+
24
    <down>DOWN</down>
+
25
    <pageplus>CHANNELUP</pageplus>
+
26
    <pageminus>CHANNELDOWN</pageminus>
+
27
    <select>OK</select>
+
28
    <back>EXIT</back>
+
29
    <menu>MENU</menu>
+
30
    <title>RED</title>
+
31
    <info>GREEN</info>
+
32
    <display>YELLOW</display>
+
33
    <blue>BLUE</blue>
+
34
    <skipplus>NEXT</skipplus>
+
35
    <skipminus>PREVIOUS</skipminus>
+
36
    <record>RECORD</record>
+
37
    <volumeplus>VOLUMEUP</volumeplus>
+
38
    <volumeminus>VOLUMEDOWN</volumeminus>
+
39
    <mute>MUTE</mute>
+
40
    <record>RECORD</record>
+
41
    <one>1</one>
+
42
    <two>2</two>
+
43
    <three>3</three>
+
44
    <four>4</four>
+
45
    <five>5</five>
+
46
    <six>6</six>
+
47
    <seven>7</seven>
+
48
    <eight>8</eight>
+
49
    <nine>9</nine>
+
50
    <zero>0</zero>
+
51
  </remote>
+
52
</lircmap>
+
+
+ + + + + + +
+
+
+ + + + +
+
+ + + diff --git a/abs/core/system-templates/templates/remotes/favorites/streamzap/lircd.conf.streamzap b/abs/core/system-templates/templates/remotes/favorites/streamzap/lircd.conf.streamzap index 36b52fa..c2a88da 100644 --- a/abs/core/system-templates/templates/remotes/favorites/streamzap/lircd.conf.streamzap +++ b/abs/core/system-templates/templates/remotes/favorites/streamzap/lircd.conf.streamzap @@ -53,11 +53,11 @@ begin remote PLAY 0x17 PAUSE 0x18 STOP 0x19 - |<< 0x1A - >>| 0x1B + PREVIOUS 0x1A + NEXT 0x1B RECORD 0x1C - << 0x1D - >> 0x1E + REWIND 0x1D + FOWARD 0x1E RED 0x20 GREEN 0x21 YELLOW 0x22 diff --git a/abs/core/system-templates/templates/remotes/favorites/streamzap/lircrc b/abs/core/system-templates/templates/remotes/favorites/streamzap/lircrc index 5e668b5..089c5d7 100644 --- a/abs/core/system-templates/templates/remotes/favorites/streamzap/lircrc +++ b/abs/core/system-templates/templates/remotes/favorites/streamzap/lircrc @@ -278,14 +278,14 @@ end begin prog = mythtv # skip backward -button = |<< +button = PREVIOUS config = PgUp end begin prog = mythtv # skip forward -button = >>| +button = NEXT config = PgDown end @@ -298,14 +298,14 @@ end begin prog = mythtv # rewind -button = << +button = REWIND config = Home end begin prog = mythtv # fast forward -button = >> +button = FOWARD config = End end @@ -418,28 +418,28 @@ end begin prog = mplayer # skip backward -button = |<< +button = PREVIOUS config = seek -600 end begin prog = mplayer # skip forward -button = >>| +button = NEXT config = seek +600 end begin prog = mplayer # slow forward -button = << +button = REWIND config = speed_mult 0.5 end begin prog = mplayer # fast forward -button = >> +button = FOWARD config = speed_mult 2.0 end @@ -507,14 +507,14 @@ end begin prog = xine -button = << +button = REWIND repeat = 4 config = SeekRelative-30 end begin prog = xine -button = >> +button = FOWARD repeat = 4 #config = SeekRelative+30 config = SpeedFaster @@ -719,25 +719,25 @@ begin xmms begin prog = xmms - button = >>| + button = NEXT config = NEXT end begin prog = xmms - button = |<< + button = PREVIOUS config = PREV end begin prog = xmms - button = << + button = FOWARD config = FWD 10 repeat = 2 end begin prog = xmms - button = << + button = REWIND config = BWD 10 repeat = 2 end -- cgit v0.12 From 666e008ca4a6acbf0621727840aa054cc77b4a39 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 17 Apr 2015 20:20:43 +0000 Subject: mpd: update 0.19.9. closes #993 --- abs/extra/mpd/PKGBUILD | 7 ++++--- abs/extra/mpd/__changelog | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 abs/extra/mpd/__changelog diff --git a/abs/extra/mpd/PKGBUILD b/abs/extra/mpd/PKGBUILD index c1803a4..bb73322 100644 --- a/abs/extra/mpd/PKGBUILD +++ b/abs/extra/mpd/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: Ben pkgname=mpd -pkgver=0.19.4 -pkgrel=1 +pkgver=0.19.9 +pkgrel=3 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://www.musicpd.org/' license=('GPL') @@ -16,10 +16,11 @@ depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'f 'sqlite' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl' 'libmpdclient' 'icu' 'libupnp' 'libnfs') makedepends=('boost' 'doxygen') +validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512') source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig} 'tmpfiles.d' 'conf') -sha1sums=('f0397d7e923cd11fef8dae238efe9ae9ff12120f' 'SKIP' +sha1sums=('6683bee5f132eda318c5a61ec14b2df8d9164d60' 'SKIP' 'f4d5922abb69abb739542d8e93f4dfd748acdad7' '291fd5cda9f0845834a553017327c4586bd853f6') diff --git a/abs/extra/mpd/__changelog b/abs/extra/mpd/__changelog new file mode 100644 index 0000000..7ee2eb2 --- /dev/null +++ b/abs/extra/mpd/__changelog @@ -0,0 +1,2 @@ +PKGBUILD: disable pulse and jack +PKGBUILD: remove jack as dep -- cgit v0.12 From a70b9ed2d9fe6887816049d788006fe3f8693a50 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 20 Apr 2015 21:07:30 +0000 Subject: mythtv & mythplugins: update to latest -fixes --- abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index 99e58be..5d870b6 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -65ada0cff0b1a5c8c06846303cf2dad51980d1aa +5d5eb048e9356ed43bcbb87294c0c1030ddc8c8e diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index d9b631f..460a6bb 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.4 -pkgrel=13 +pkgrel=14 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index 9ba2e36..b091574 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.4 -pkgrel=13 +pkgrel=14 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12 From db3af95838834daadde72f062103214afbadb128 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 24 Apr 2015 12:19:23 +0000 Subject: system-templates: fix streamzap Lircmap.xml. refs #994 --- abs/core/system-templates/PKGBUILD | 2 +- .../remotes/favorites/streamzap/Lircmap.xml | 403 +++------------------ 2 files changed, 53 insertions(+), 352 deletions(-) diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD index 7ee11fc..0c7b1a7 100755 --- a/abs/core/system-templates/PKGBUILD +++ b/abs/core/system-templates/PKGBUILD @@ -1,6 +1,6 @@ pkgname=system-templates pkgver=8.3 -pkgrel=9 +pkgrel=10 conflicts=( ) pkgdesc="Templates used for system configuration" depends=() diff --git a/abs/core/system-templates/templates/remotes/favorites/streamzap/Lircmap.xml b/abs/core/system-templates/templates/remotes/favorites/streamzap/Lircmap.xml index ed0a2b2..0960d0b 100644 --- a/abs/core/system-templates/templates/remotes/favorites/streamzap/Lircmap.xml +++ b/abs/core/system-templates/templates/remotes/favorites/streamzap/Lircmap.xml @@ -1,351 +1,52 @@ - - - - - LinHES - Lircmap.xml - - - - - - - - - - - - - - - - - - - -
-
- - - - -
- - -
- -

Lircmap.xml

- -
-

- mattbatt, 04/16/2015 08:18 pm

-

Download (1.9 kB)

- -
-  -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
1
<!-- ~/.kodi/userdata/Lircmap.xml                                                 -->
-
2
<!--                                                                              -->
-
3
<!-- This file maps XBMC_buttons to LIRC_buttons                                  -->
-
4
<!-- and is works with a custom ~/.kodi/userdata/remote.xml which maps            -->
-
5
<!-- XBMC_buttons to actions                                                      -->
-
6
<!--                                                                              -->
-
7
<!-- How to add remotes                                                           -->
-
8
<!-- <remote device="name_Lirc_calls_the_remote">                                 -->
-
9
<!--                                                                              -->
-
10
<!-- For the commands the layout following layout is used                         -->
-
11
<!-- <XBMC_button>LIRC_button</XBMC_button>                                       -->
-
12
-
13
<lircmap>
-
14
  <remote device="Streamzap_PC_Remote">
-
15
    <power>POWER</power>
-
16
    <play>PLAY</play>
-
17
    <pause>PAUSE</pause>
-
18
    <stop>STOP</stop>
-
19
    <forward>FOWARD</forward>
-
20
    <reverse>REWIND</reverse>
-
21
    <left>LEFT</left>
-
22
    <right>RIGHT</right>
-
23
    <up>UP</up>
-
24
    <down>DOWN</down>
-
25
    <pageplus>CHANNELUP</pageplus>
-
26
    <pageminus>CHANNELDOWN</pageminus>
-
27
    <select>OK</select>
-
28
    <back>EXIT</back>
-
29
    <menu>MENU</menu>
-
30
    <title>RED</title>
-
31
    <info>GREEN</info>
-
32
    <display>YELLOW</display>
-
33
    <blue>BLUE</blue>
-
34
    <skipplus>NEXT</skipplus>
-
35
    <skipminus>PREVIOUS</skipminus>
-
36
    <record>RECORD</record>
-
37
    <volumeplus>VOLUMEUP</volumeplus>
-
38
    <volumeminus>VOLUMEDOWN</volumeminus>
-
39
    <mute>MUTE</mute>
-
40
    <record>RECORD</record>
-
41
    <one>1</one>
-
42
    <two>2</two>
-
43
    <three>3</three>
-
44
    <four>4</four>
-
45
    <five>5</five>
-
46
    <six>6</six>
-
47
    <seven>7</seven>
-
48
    <eight>8</eight>
-
49
    <nine>9</nine>
-
50
    <zero>0</zero>
-
51
  </remote>
-
52
</lircmap>
-
-
- - - - - - -
-
-
- - - - -
-
- - - + + + + + + + + + + + + + + + POWER + PLAY + PAUSE + STOP + FOWARD + REWIND + LEFT + RIGHT + UP + DOWN + CHANNELUP + CHANNELDOWN + + EXIT + MENU + RED + GREEN + YELLOW + BLUE + NEXT + PREVIOUS + RECORD + VOLUMEUP + VOLUMEDOWN + MUTE + RECORD + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 0 + + -- cgit v0.12 From 0801c7ab964326d18748a0463f4f6f07d22f07ae Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 30 Apr 2015 21:09:11 +0000 Subject: plex-home-theater: update to 1.4.0.459 --- abs/extra/plex-home-theater/PKGBUILD | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/abs/extra/plex-home-theater/PKGBUILD b/abs/extra/plex-home-theater/PKGBUILD index cbb8cb1..d730273 100755 --- a/abs/extra/plex-home-theater/PKGBUILD +++ b/abs/extra/plex-home-theater/PKGBUILD @@ -3,9 +3,9 @@ # Contributor: Daniel Wallace pkgname=plex-home-theater -_pkgver=1.3.6.441-309e72d1 +_pkgver=1.4.0.459-b41b1814 pkgver=${_pkgver%-*} -pkgrel=2 +pkgrel=1 pkgdesc='Plex Home Theater' arch=('i686' 'x86_64') url='http://www.plexapp.com/' @@ -69,8 +69,7 @@ package() { install -D -m0744 ${srcdir}/plex_lib.conf ${pkgdir}/etc/gen_lib_xml.d/plex_lib.conf } -# vim: ts=2 sw=2 et: -md5sums=('370627c3d9e190e7af2cb8cf2a67f488' +md5sums=('23ac6ae1c7b3c093db67fcbc940d1ae0' '6704244166497db7fa6b3ddd43a0e53b' '066484ad4949f96ddddaa8b1d4d709e1' '09e67d694093eb6bd243fb9a4ddf5d70' -- cgit v0.12 From 4809b978afc67edcb5ca3b5886ac8e252b903ac9 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 30 Apr 2015 21:26:22 +0000 Subject: google-chrome: update to 42.0.2311.135 --- abs/extra/google-chrome/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD index 80a4297..5961212 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=42.0.2311.90 +pkgver=42.0.2311.135 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -57,5 +57,5 @@ package() { msg2 "Rename google-chrome-stable to google-chrome..." mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome } -md5sums=('625ba01bb78602aad5577c8c0e0dc4d8' +md5sums=('8f9eee6383c930006ea3d95093deae74' 'b7e752f549b215ac77f284b6486794b6') -- cgit v0.12 From 45bdcc8cd7b8e71a55df70a8cc57a89a93653034 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 1 May 2015 16:17:09 +0000 Subject: kodi: update to 14.2 --- abs/extra/kodi/PKGBUILD | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/abs/extra/kodi/PKGBUILD b/abs/extra/kodi/PKGBUILD index 91fe23c..134d325 100644 --- a/abs/extra/kodi/PKGBUILD +++ b/abs/extra/kodi/PKGBUILD @@ -13,9 +13,9 @@ _prefix=/usr pkgbase=kodi pkgname=('kodi' 'kodi-eventclients') -pkgver=14.0 +pkgver=14.2 _codename=Helix -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://kodi.tv" license=('GPL2') @@ -40,6 +40,11 @@ prepare() { find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" + sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl sed 's/python/python2/' -i tools/Linux/kodi.sh.in + sed 's/shell python/shell python2/' -i tools/EventClients/Makefile.in + # disable wiiremote due to incompatibility with bluez-5.29 + sed '/WiiRemote/d' -i tools/EventClients/Makefile.in + sed '/mkdir -p $(DESTDIR)$(bindir)/i \ +install:' -i tools/EventClients/Makefile.in } build() { @@ -58,7 +63,8 @@ build() { --enable-optimizations \ --enable-libbluray \ --enable-external-libraries \ - --with-lirc-device=/run/lirc/lircd + --with-lirc-device=/run/lirc/lircd \ + ac_cv_lib_bluetooth_hci_devid=no # Now (finally) build make @@ -102,6 +108,11 @@ package_kodi() { # Running make install make DESTDIR="$pkgdir" install + # We will no longer support the xbmc name + rm "$pkgdir/usr/share/xsessions/xbmc.desktop" + rm "$pkgdir/usr/bin/"xbmc{,-standalone} + # we will leave /usr/{include,lib,share}/xbmc for now + # Licenses install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname} for licensef in LICENSE.GPL copying.txt; do @@ -124,12 +135,8 @@ package_kodi-eventclients() { cd "$srcdir/xbmc-$pkgver-$_codename" make DESTDIR="$pkgdir" eventclients WII_EXTRA_OPTS=-DCWIID_OLD - - install -dm755 "$pkgdir/usr/lib/python2.7/$pkgbase" - #mv "$pkgdir/kodi"/* "$pkgdir/usr/lib/python2.7/$pkgbase" - #rmdir "$pkgdir/kodi" } -md5sums=('9717c539789789b8aeaf1dcfdb9f2c69' +md5sums=('aa534c483cdd6cda71e5350c2094175b' 'f6adc8e06d7076143ca2ad118126b158' 'f04d1c89f5108c6aba36cf708a74cc95') -- cgit v0.12 From d042a4cdc749cdef60460ab85168c214f22a8f63 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 1 May 2015 16:23:46 +0000 Subject: LinHES-config: change test sound to pinkNoise_3s.wav --- abs/core/LinHES-config/PKGBUILD | 7 +++++-- abs/core/LinHES-config/pinkNoise_3s.wav | Bin 0 -> 264646 bytes abs/core/LinHES-config/soundconfig.sh | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100755 abs/core/LinHES-config/pinkNoise_3s.wav diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 4bdde13..ad1ae88 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.3 -pkgrel=13 +pkgrel=14 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -48,6 +48,7 @@ source=(mv_install.py 09_mythvantge_runit_grub mv_fileshare.py mv_locale.py systemconfig.py + pinkNoise_3s.wav myth_user_call.py mythvantage.cfg config-sudo.rules @@ -83,6 +84,7 @@ package() { # install -m 0755 restore_default_settings.sh $MVDIR/bin/restore_default_settings.sh install -m 0755 myth_settings_wrapper.sh $MVDIR/bin/myth_settings_wrapper.sh install -m 0755 soundconfig.sh $MVDIR/bin/soundconfig.sh + install -Dm 0755 pinkNoise_3s.wav $pkgdir/usr/share/sounds/pinkNoise_3s.wav install -m 0755 networkconfig.sh $MVDIR/bin/networkconfig.sh install -m 0755 create_master.sh $MVDIR/bin/create_master.sh install -m 0755 build_diskless.sh $MVDIR/bin/build_diskless.sh @@ -149,7 +151,7 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff' '6e5639fff82fa2ba76113ac1ab8f2016' 'f0376c98a7986897406d393186c0365e' '157e73d0f90d7b306aba8f5921aeedd3' - 'f8f803cb5738ce0021cd37c1ab514c45' + '60d4dd50c8f9c91f5ad798c1e89be324' 'eef9b882ecb70648a8f253f85b73a274' '5f890ea9bda6aef652d2560ca19dac07' 'ab2aa42c2947148c2b1cac0ade6d1d55' @@ -175,6 +177,7 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff' '595663a2cb0b43c4ea3fb3dac915a3c8' '781f161a79c3188a31c8615b8258b241' '888a6c57f272d9fa3e77e216a421562b' + 'cdd5008ee77e67c1d51ad73a24612485' '2596460462cf6c889cf8f95485537b20' 'dc3c5270691a62600475705f4cb78b56' '4804aa93aaad3dfcfff08cd9ffd68836' diff --git a/abs/core/LinHES-config/pinkNoise_3s.wav b/abs/core/LinHES-config/pinkNoise_3s.wav new file mode 100755 index 0000000..bb75ca5 Binary files /dev/null and b/abs/core/LinHES-config/pinkNoise_3s.wav differ diff --git a/abs/core/LinHES-config/soundconfig.sh b/abs/core/LinHES-config/soundconfig.sh index 38687a4..34d81a4 100755 --- a/abs/core/LinHES-config/soundconfig.sh +++ b/abs/core/LinHES-config/soundconfig.sh @@ -6,7 +6,7 @@ echo $@ >/tmp/audio.call BASE="" MYTH_RUN_STATUS="1" . /etc/profile -TESTFILE="/usr/share/sounds/alsa/Front_Center.wav" +TESTFILE="/usr/share/sounds/pinkNoise_3s.wav" OSSinstalled="false" BLACKLIST=/etc/modprobe.d/soundconfig_blacklist.conf -- cgit v0.12 From 9f77bf47533c65bbd18e5b338a963a607853dc93 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 1 May 2015 17:32:20 +0000 Subject: mythinstall: use audio card name instead of number in case devices move around on boot --- abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp | 5 +++-- abs/core/mythinstall/PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp index 05acc5e..41b67c6 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp @@ -3109,7 +3109,8 @@ void SoundALSAsettings::fillALSAselection() } //card 0: I82801DBICH4:q [Intel 82801DB-ICH4], device 0: Intel ICH [Intel 82801DB-ICH4] alsadescription=line.section( ", " , 0 ,0 ); - alsadescription=alsadescription.section(":",1,1); + alsadescription=alsadescription.section(": ",1,1); + alsadescription=alsadescription.section(" ",0,0); alsadescription2=line.section( ", " , 1 ,1 ); //alsadescription2=alsadescription.section(":",0,0); @@ -3122,7 +3123,7 @@ void SoundALSAsettings::fillALSAselection() temphwdevice=temphwdevice.section(" ",-1,-1 ); hwdevice.append(","); hwdevice.append(temphwdevice); - simpleitem=alsadescription2 + "(plughw:" + hwdevice + ")"; + simpleitem=alsadescription + " " + alsadescription2 + "(plughw:" + alsadescription + "," + temphwdevice + ")"; if (line.contains("IEC958") || line.contains("Digital") || line.contains("PCM") || line.contains("HDMI")) HostSoundALSADigital->addSelection(simpleitem); else diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD index 901f6ad..e74402e 100644 --- a/abs/core/mythinstall/PKGBUILD +++ b/abs/core/mythinstall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jams pkgname=mythinstall pkgver=8.3 -pkgrel=6 +pkgrel=7 pkgdesc="LinHES installer/systemconfig GUI." arch=('i686' 'x86_64') depends=('mythtv>=0.27') -- cgit v0.12 From 072d3e9017bc4c318b1d71535864cc6a25955ff3 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 15 May 2015 19:22:19 +0000 Subject: google-chrome: 42.0.2311.152 --- abs/extra/google-chrome/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD index 5961212..674e587 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=42.0.2311.135 +pkgver=42.0.2311.152 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -57,5 +57,5 @@ package() { msg2 "Rename google-chrome-stable to google-chrome..." mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome } -md5sums=('8f9eee6383c930006ea3d95093deae74' +md5sums=('60258a9fd84a05c7af7621d248705318' 'b7e752f549b215ac77f284b6486794b6') -- cgit v0.12 From a681ad133e58c65548672fd849a3c86e9125596b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 15 May 2015 19:39:28 +0000 Subject: webmin: update to 1.750 --- abs/extra/webmin/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/extra/webmin/PKGBUILD b/abs/extra/webmin/PKGBUILD index edce250..be75967 100644 --- a/abs/extra/webmin/PKGBUILD +++ b/abs/extra/webmin/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Tobias Powalowski pkgname=webmin -pkgver=1.730 +pkgver=1.750 pkgrel=1 pkgdesc="a web-based interface for system administration" arch=(i686 x86_64) @@ -219,7 +219,7 @@ package() { # install license install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE } -md5sums=('a54d11c32372b8361da1ad363a2d3ad9' +md5sums=('4007c390323d840f26c2e0f43c5c81a3' 'b0b3e3fb231a12e60165b6b4d604dcfa' 'bfebb75bb94029b48c46b7f1ba1aa811' 'fc29ecb6a5cd8c278abe054e60381095') -- cgit v0.12 From 0a056b8f79436a568f31fe852cf5126d0999cd2c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 19 May 2015 17:05:17 +0000 Subject: google-chrome: update to 43.0.2357.65 --- abs/extra/google-chrome/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD index 674e587..9327c25 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=42.0.2311.152 +pkgver=43.0.2357.65 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -57,5 +57,5 @@ package() { msg2 "Rename google-chrome-stable to google-chrome..." mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome } -md5sums=('60258a9fd84a05c7af7621d248705318' +md5sums=('1ab215289f4318bb7109c4cc7a9c1621' 'b7e752f549b215ac77f284b6486794b6') -- cgit v0.12 From 2c0bb181c10b634ed7f91b6e8411435d716bf241 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 19 May 2015 18:30:06 +0000 Subject: mythtv, mythplugins, mythweb: update to latest fixes --- abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.27/git_src/git_hash_web | 2 +- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythweb/PKGBUILD | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index 5d870b6..92808ed 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -5d5eb048e9356ed43bcbb87294c0c1030ddc8c8e +8332919c43b51ab06db9516150a2762498713c86 diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash_web b/abs/core/mythtv/stable-0.27/git_src/git_hash_web index 49c87b1..2f37d37 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash_web +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash_web @@ -1 +1 @@ -a8c6695bc851887ed6d9ae565b9c2788f1d60a6a +799db438533acd7fed7b9137b63badb6f163b7da diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 460a6bb..9a974c2 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.4 -pkgrel=14 +pkgrel=15 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index b091574..39f83cf 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.4 -pkgrel=14 +pkgrel=15 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.27/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD index e9e94cc..37fd599 100644 --- a/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythweb/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweb pkgver=0.27 -pkgrel=7 +pkgrel=8 commit_hash=`cat ../git_src/git_hash_web` pkgdesc="Web interface for MythTV's backend, $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12 From 1c63efabec19c496e471d6f5af51c4c17e7e693e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 27 May 2015 12:56:00 +0000 Subject: google-chrome: update to 43.0.2357.81 --- abs/extra/google-chrome/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD index 9327c25..687c0d4 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=43.0.2357.65 +pkgver=43.0.2357.81 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -57,5 +57,5 @@ package() { msg2 "Rename google-chrome-stable to google-chrome..." mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome } -md5sums=('1ab215289f4318bb7109c4cc7a9c1621' +md5sums=('ec20af5dd812b770362d1a69507e1db1' 'b7e752f549b215ac77f284b6486794b6') -- cgit v0.12 From 4589b4981d9206d3503515c27e747d1b6ff9f356 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 27 May 2015 14:49:00 +0000 Subject: plex-home-theater: update to 1.4.1.469 --- abs/extra/plex-home-theater/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/extra/plex-home-theater/PKGBUILD b/abs/extra/plex-home-theater/PKGBUILD index d730273..906e49d 100755 --- a/abs/extra/plex-home-theater/PKGBUILD +++ b/abs/extra/plex-home-theater/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Daniel Wallace pkgname=plex-home-theater -_pkgver=1.4.0.459-b41b1814 +_pkgver=1.4.1.469-47a90f01 pkgver=${_pkgver%-*} pkgrel=1 pkgdesc='Plex Home Theater' @@ -69,7 +69,7 @@ package() { install -D -m0744 ${srcdir}/plex_lib.conf ${pkgdir}/etc/gen_lib_xml.d/plex_lib.conf } -md5sums=('23ac6ae1c7b3c093db67fcbc940d1ae0' +md5sums=('62456ec6266f769f2c873ed7132b26d3' '6704244166497db7fa6b3ddd43a0e53b' '066484ad4949f96ddddaa8b1d4d709e1' '09e67d694093eb6bd243fb9a4ddf5d70' -- cgit v0.12 From 38079a3274f3ddce0a43a0d232784acb3a8f8cc7 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 27 May 2015 15:31:54 +0000 Subject: xymon: only show OSD alert for full system partitions --- abs/core/xymon/PKGBUILD | 4 ++-- abs/core/xymon/hobbit_notify.sh | 28 +++++++++++++++++----------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD index b8e6355..932497b 100755 --- a/abs/core/xymon/PKGBUILD +++ b/abs/core/xymon/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=xymon pkgname=('xymonserver' 'xymonclient') pkgver=4.3.17 -pkgrel=17 +pkgrel=18 pkgdesc="Xymon is a system for monitoring of hosts and networks" license="GPL" arch=('i686' 'x86_64') @@ -176,7 +176,7 @@ md5sums=('d8d119a777e7b7204d1292fb27314312' '0c808fa12672289f86b0651545381308' '0469d775db9fdd18ea95dd41937ada82' '0757294eec13771f8e63da23cf066796' - '270e13da6cbc9d49079d994edaa71e64' + '3126ef4e5e82f096cf5ecb4dce4e2306' '22d4c9065fd959efe82f121dcb511305' '9af2ad60ac4c3cb653754618f603e311' '313b11e7a22c3c08fb2afaadbfb46d87' diff --git a/abs/core/xymon/hobbit_notify.sh b/abs/core/xymon/hobbit_notify.sh index 26b789f..9028fb0 100644 --- a/abs/core/xymon/hobbit_notify.sh +++ b/abs/core/xymon/hobbit_notify.sh @@ -40,28 +40,37 @@ function msg_func_out() { } function msg_local_out() { - /usr/LH/bin/msg_client.py --msg "${1}" - - } +} case x$BBSVCNAME in xdisk) - case $BBCOLORLEVEL in + case $BBCOLORLEVEL in red ) - msg_func_out "$BBHOSTNAME disk is at 95% full or greater|alert" + if [[ $BBALPHAMSG == *"&red / ("* ]] + then + msg_func_out "The OS (/) partition on $BBHOSTNAME is over 99% full|alert" + fi + if [[ $BBALPHAMSG == *"&red /home ("* ]] + then + msg_func_out "The home (/home) partition on $BBHOSTNAME is over 99% full|alert" + fi + if [[ $BBALPHAMSG == *"&red /data/srv/mysql ("* ]] + then + msg_func_out "The mysql (/data/srv/mysql) partition on $BBHOSTNAME is over 99% full|alert" + fi ;; yellow ) - msg_func_out "$BBHOSTNAME disk is almost full" + msg_func_out "A disk on $BBHOSTNAME is almost full" ;; esac ;; - + xfunc) - if [ "x$hostname" = "x$BBHOSTNAME" ] + if [ "x$hostname" = "x$BBHOSTNAME" ] then msg_local_out "System can not communicate with itself (func) |alert" else @@ -74,6 +83,3 @@ case x$BBSVCNAME in msg_func_out "Condition $BBCOLORLEVEL $BBSVCNAME on $BBHOSTNAME\nSee the system health webpage.|alert" ;; esac - - - -- cgit v0.12 From 49b921fe3fd7e72b3213b50d654ea2dbb216c46e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 27 May 2015 20:28:10 +0000 Subject: linux: update to 3.18.14 --- abs/core/linux/PKGBUILD | 4 ++-- abs/core/linux/linux.install.pkg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/linux/PKGBUILD b/abs/core/linux/PKGBUILD index ca33abc..901f265 100644 --- a/abs/core/linux/PKGBUILD +++ b/abs/core/linux/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=linux # Build stock -ARCH kernel #pkgbase=linux-custom # Build kernel with a different name _srcname=linux-3.18 -pkgver=3.18.9 +pkgver=3.18.14 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -295,7 +295,7 @@ done # vim:set ts=8 sts=2 sw=2 et: md5sums=('9e854df51ca3fef8bfe566dbd7b89241' - '41077062d4b7beefd88d4df6e598e376' + '92994dfdfd9787db3c0f845c3bc18e51' 'ed1d392d9feb77674e7a71c3eda060e6' 'c2d4e432167a2bbd43ad09e07fc73e1e' 'eb14dcfd80c00852ef81ded6e826826a' diff --git a/abs/core/linux/linux.install.pkg b/abs/core/linux/linux.install.pkg index 4a0b843..804bd1d 100644 --- a/abs/core/linux/linux.install.pkg +++ b/abs/core/linux/linux.install.pkg @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.18.9-1-ARCH +KERNEL_VERSION=3.18.14-1-ARCH post_install () { # updating module dependencies -- cgit v0.12 From 76cfee8d414e05914aff6adcaea49d9ee604c4eb Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 27 May 2015 20:41:08 +0000 Subject: ceton_infinitv: rebuild --- abs/core/ceton_infinitv/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/ceton_infinitv/PKGBUILD b/abs/core/ceton_infinitv/PKGBUILD index 87dde5c..a95a638 100755 --- a/abs/core/ceton_infinitv/PKGBUILD +++ b/abs/core/ceton_infinitv/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: Cecil Watson pkgname=ceton_infinitv -_kernver=3.18.9-1-ARCH +_kernver=3.18.14-1-ARCH _extramods="extramodules-3.18-ARCH" pkgver=2013_0326_2226 -pkgrel=9 +pkgrel=10 usb_pkgver=0.1.0 pkgdesc="Drivers for Ceton InfiniTV4 - pci/usb " arch=('i686' 'x86_64') -- cgit v0.12 From b4a6b571f0c3eb6b56d6467e9c501caeab2de314 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 27 May 2015 21:06:43 +0000 Subject: nvidia & nvidia-utils: update to 352.09 --- abs/core/nvidia-utils/PKGBUILD | 8 ++++---- abs/core/nvidia/PKGBUILD | 9 +++++---- abs/core/nvidia/nvidia.install | 11 +++-------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD index ac935eb..32ffbd6 100644 --- a/abs/core/nvidia-utils/PKGBUILD +++ b/abs/core/nvidia-utils/PKGBUILD @@ -4,16 +4,16 @@ # Contributor: James Rayner pkgbase=nvidia-utils pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia') -pkgver=346.47 -pkgrel=2 +pkgver=352.09 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.nvidia.com/" license=('custom') options=('!strip') source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -sha1sums=('fff888527a89b95e2f32bdc8fe00d9e7c6112415' - 'fc5f00fe21d48c0cafec6048837e53f6ef402aa8') +sha1sums=('1cc711e6c419ee03b0656cb4004aeb2e3effb4bd' + '3ab419b8ec442b6f59ff17d7aa53f72f66021810') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD index f541e58..c2264cf 100644 --- a/abs/core/nvidia/PKGBUILD +++ b/abs/core/nvidia/PKGBUILD @@ -3,9 +3,9 @@ # Maintainer: Thomas Baechler pkgname=nvidia -pkgver=346.47 +pkgver=352.09 _extramodules=extramodules-3.18-ARCH -pkgrel=9 +pkgrel=1 pkgdesc="NVIDIA drivers for linux" arch=('i686' 'x86_64') url="http://www.nvidia.com/" @@ -16,8 +16,8 @@ install=nvidia.install options=(!strip) source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums=('ae61b6c3c081383f991bcc64ee0844b1' - '115b5b2d136c4b44c658ef823b8a4bab') +md5sums=('0e009686400c522209eaa8ab835ff81f' + 'eb5ad6a07dc03e0a19d5f6fa069c494b') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" @@ -50,5 +50,6 @@ package() { gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko install -d -m755 "${pkgdir}/usr/lib/modprobe.d" + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" } diff --git a/abs/core/nvidia/nvidia.install b/abs/core/nvidia/nvidia.install index af0670c..1a56d94 100644 --- a/abs/core/nvidia/nvidia.install +++ b/abs/core/nvidia/nvidia.install @@ -1,20 +1,15 @@ post_install() { EXTRAMODULES='extramodules-3.18-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + depmod $(cat /usr/lib/modules/${EXTRAMODULES}/version) echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-3.18-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - if [ "$(vercmp $2 310.19-2)" -lt 0 ]; then - echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx' - fi echo "* * * * * /usr/bin/bash /usr/MythVantage/bin/xconfig.cron" >> /var/spool/cron/root echo "root" >> /var/spool/cron/cron.update + post_install } post_remove() { - EXTRAMODULES='extramodules-3.18-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + post_install } -- cgit v0.12 From 677f6ee2c220a9e6e9014c66f753fcd8df3c6e11 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 27 May 2015 21:11:02 +0000 Subject: nvidia-340xx: rebuild --- abs/core/nvidia-340xx/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/nvidia-340xx/PKGBUILD b/abs/core/nvidia-340xx/PKGBUILD index 2f7a95a..d20c718 100644 --- a/abs/core/nvidia-340xx/PKGBUILD +++ b/abs/core/nvidia-340xx/PKGBUILD @@ -4,7 +4,7 @@ pkgname=nvidia-340xx pkgver=340.76 _extramodules=extramodules-3.18-ARCH -pkgrel=5 +pkgrel=6 pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" arch=('i686' 'x86_64') url="http://www.nvidia.com/" -- cgit v0.12 From 67c89671dec1d42883d747773beb5cadd560e877 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 27 May 2015 21:14:31 +0000 Subject: nvidia-304xx: rebuild --- abs/core/nvidia-304xx/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/nvidia-304xx/PKGBUILD b/abs/core/nvidia-304xx/PKGBUILD index 28be9c7..1ef54d9 100644 --- a/abs/core/nvidia-304xx/PKGBUILD +++ b/abs/core/nvidia-304xx/PKGBUILD @@ -5,7 +5,7 @@ pkgname=nvidia-304xx pkgver=304.125 _extramodules=extramodules-3.18-ARCH -pkgrel=8 +pkgrel=9 pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" arch=('i686' 'x86_64') url="http://www.nvidia.com/" -- cgit v0.12 From 5818e0511f78c746c8486cf78dc14dff9e07e916 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 1 Jun 2015 17:43:19 +0000 Subject: mythtv & mythplugins: update to -fixes --- abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index 92808ed..b3293ca 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -8332919c43b51ab06db9516150a2762498713c86 +b7afc9b8e7d25e643e60daa07d7b8fae94d99a7f diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 9a974c2..288bc74 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.4 -pkgrel=15 +pkgrel=16 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index 39f83cf..b8c0c19 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.4 -pkgrel=15 +pkgrel=16 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12 From d8e53b6b71434285de8dc5e33da1f232fcaefc23 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 11 Jun 2015 17:34:54 +0000 Subject: oss: update to 4.2_2011 --- abs/extra/oss/PKGBUILD | 41 +++++++++++++++++++------------------ abs/extra/oss/gcc-5.patch | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 20 deletions(-) create mode 100644 abs/extra/oss/gcc-5.patch diff --git a/abs/extra/oss/PKGBUILD b/abs/extra/oss/PKGBUILD index 829c839..d7ba89a 100644 --- a/abs/extra/oss/PKGBUILD +++ b/abs/extra/oss/PKGBUILD @@ -1,5 +1,6 @@ -# Maintainer: Damian Nowak -# Maintainer: Julian Rother +# Maintainer: Alex Wiggins +# Contributor: Damian Nowak +# Contributor: Julian Rother # Contributor: Sebastian Schwarz # Contributor: Kyle Keen # Contributor: Florian Pritz @@ -9,26 +10,24 @@ pkgbase=oss pkgname=oss true && pkgname=(oss libflashsupport-oss) -pkgver=4.2_2008 +pkgver=4.2_2011 pkgrel=3 arch=(i686 x86_64) url="http://developer.opensound.com/" license=(GPL2) -makedepends=(gcc gtk2) +makedepends=(gtk2) source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2" - 'linux-3.8.0.patch::http://www.opensound.com/forum/download/file.php?id=113' - 'linux-3.10.0.patch::http://www.opensound.com/forum/download/file.php?id=126' - 'linux-3.10.7.patch::http://www.opensound.com/forum/download/file.php?id=129' + linux-4.0.patch::http://www.4front-tech.com/forum/download/file.php?id=164 + gcc-5.patch oss.service remove-hal.patch rm-init-scripts.patch soundon.patch kmod-link.patch ossvermagic.patch) -sha512sums=('bb80a5b6943724a668888684e0d8ec2c5799530ed6943a50a0f68b4eea2d639579e0bbaba4a614267bad4792252d0b3a431d926ae7bf15b01df9442988118b07' - '6483ed671b79a01dded17732e23a7cb8141329b62a2ddb812567f119389e98afc735d6b3cea20e801517d1a417dc823a3ebdbdcba004f44a0c3e6674a169a16e' - 'a2793ec82152167615428ed00ba423fa0571bafdb3e5eb790a02a276d5a4eb663c8a4bae6923f7b2536ed8ed5683254bb1efea26336810b7685aa2b1c9f4a5c5' - '609367d6eadc29a34535461db719b132fe675a06a0532ea3a451191b21a0499801a3a6e706a214833db8179741086a9c1a3f450b79d2d663ec8fb173c97c01f8' +sha512sums=('2e48bf5fa14521feedb18bc3b4c96ba996c5ef9d54f00f1e39c9412152db65972438b7408cb8161e32609af2c56207251d14e1106668cde32a8f0b56a98311fb' + '504efe3af933af69e14408215a8a71d6b94d181e076f90be538f859f1d2c2ae6d2e8e49499c1e50ee3f074004e3f79c1da2b734c95cc666b98d566d404cfc7a5' + '762a8e84d3106ae26ee50e4022c62bee551d2a46923945b291975d3c1ff7a87876ad4a94408fe1718a5dd4613d279a0f7a8820f8fcb0479ca1f210bc711ea835' '355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e' '6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be' '64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690' @@ -38,18 +37,20 @@ sha512sums=('bb80a5b6943724a668888684e0d8ec2c5799530ed6943a50a0f68b4eea2d639579e _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl prepare() { - cd "$srcdir/$_dir" + cd "$_dir" # OSS wants an empty build directory rm -rf build mkdir build # make OSS compile with current Linux kernels - patch -p0 < "$srcdir/linux-3.8.0.patch" - patch -p0 < "$srcdir/linux-3.10.0.patch" - patch -p0 < "$srcdir/linux-3.10.7.patch" + patch -p1 < "$srcdir/linux-4.0.patch" + # patch -p0 < "$srcdir/linux-3.14.0.patch" patch -p0 < "$srcdir/ossvermagic.patch" + # make OSS compile with gcc-5 + patch -p0 < "$srcdir/gcc-5.patch" + # remove outdated stuff cd setup/Linux patch -p2 < "$srcdir/rm-init-scripts.patch" @@ -65,7 +66,7 @@ prepare() { } build() { - cd "$srcdir/$_dir/build" + cd "$_dir/build" ../configure --enable-libsalsa=NO --regparm make build gcc $CFLAGS -shared -fPIC -Wall -Werror oss/lib/flashsupport.c \ @@ -74,7 +75,7 @@ build() { package_libflashsupport-oss() { pkgdesc="Adobe flash plugin support lib (OSSv4)" - conflicts=(libflashsupport libflashsupport-pulse) + conflicts=(libflashsupport libflashsupport-oss-nonfree libflashsupport-oss-git libflashsupport-pulse) depends=(oss) install -dm755 "$pkgdir/usr/lib" @@ -83,14 +84,14 @@ package_libflashsupport-oss() { package_oss() { pkgdesc="Open Sound System UNIX audio architecture" - depends=(gcc make linux-headers libtool sed) + depends=(linux-headers) optdepends=('gtk2: for graphical mixer (ossxmix)' 'libflashsupport-oss: Adobe flash plugin support') - conflicts=(oss-linux oss-linux-free oss-testing) + conflicts=(oss-git oss-nonfree libflashsupport-oss-git libflashsupport-oss-nonfree) backup=(usr/lib/oss/soundon.user) install=oss.install - cd "$srcdir/$_dir/build" + cd "$_dir/build" make DESTDIR="$pkgdir/" copy install -Dm755 libflashsupport.so \ "$pkgdir/usr/lib/oss/lib/libflashsupport.so" diff --git a/abs/extra/oss/gcc-5.patch b/abs/extra/oss/gcc-5.patch new file mode 100644 index 0000000..5b303b4 --- /dev/null +++ b/abs/extra/oss/gcc-5.patch @@ -0,0 +1,52 @@ +--- kernel/OS/Linux/os_linux.h 2015-01-28 08:07:23.000000000 +0000 ++++ kernel/OS/Linux/os_linux.h 2015-06-01 23:12:46.044784820 +0100 +@@ -119,7 +119,7 @@ + /* System wall timer access */ + #define GET_JIFFIES() oss_get_jiffies() + +-extern inline unsigned int ++__attribute__ ((gnu_inline)) extern inline unsigned int + __inb (unsigned short port) + { + unsigned int _v; +@@ -127,7 +127,7 @@ + "0" (0)); + return _v; + } +-extern inline unsigned int ++__attribute__ ((gnu_inline)) extern inline unsigned int + __inw (unsigned short port) + { + unsigned int _v; +@@ -135,7 +135,7 @@ + "0" (0)); + return _v; + } +-extern inline unsigned int ++__attribute__ ((gnu_inline)) extern inline unsigned int + __inl (unsigned short port) + { + unsigned int _v; +@@ -143,19 +143,19 @@ + return _v; + } + +-extern inline void ++__attribute__ ((gnu_inline)) extern inline unsigned int + __outb (unsigned char value, unsigned short port) + { + __asm__ __volatile__ ("out" "b" " %" "b" "0,%" "w" "1"::"a" (value), + "d" (port)); + } +-extern inline void ++__attribute__ ((gnu_inline)) extern inline unsigned int + __outw (unsigned short value, unsigned short port) + { + __asm__ __volatile__ ("out" "w" " %" "w" "0,%" "w" "1"::"a" (value), + "d" (port)); + } +-extern inline void ++__attribute__ ((gnu_inline)) extern inline unsigned int + __outl (unsigned int value, unsigned short port) + { + __asm__ __volatile__ ("out" "l" " %" "0,%" "w" "1"::"a" (value), -- cgit v0.12 From dfae09ca060df43f9101addfd429af8e1e0666da Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 11 Jun 2015 17:47:47 +0000 Subject: LinHES-config: soundconfig.sh: remove asound.conf when unloading ALSA. exit OSS installed loop after 20 iterations so it doesn't hang forever --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/soundconfig.sh | 32 ++++++++++++++++++-------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index ad1ae88..1f5ebd3 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.3 -pkgrel=14 +pkgrel=15 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' @@ -151,7 +151,7 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff' '6e5639fff82fa2ba76113ac1ab8f2016' 'f0376c98a7986897406d393186c0365e' '157e73d0f90d7b306aba8f5921aeedd3' - '60d4dd50c8f9c91f5ad798c1e89be324' + '932cf4a7a3891d1849cf8d3962adf78c' 'eef9b882ecb70648a8f253f85b73a274' '5f890ea9bda6aef652d2560ca19dac07' 'ab2aa42c2947148c2b1cac0ade6d1d55' diff --git a/abs/core/LinHES-config/soundconfig.sh b/abs/core/LinHES-config/soundconfig.sh index 34d81a4..6e7bf70 100755 --- a/abs/core/LinHES-config/soundconfig.sh +++ b/abs/core/LinHES-config/soundconfig.sh @@ -23,26 +23,17 @@ function testaudio () { function load_alsa() { echo "Loading ALSA ..." remove_service.sh alsa-utils 1> /dev/null 2> /dev/null - KER=`uname -r` - cd /lib/modules/$KER/ - echo " uncompressing ALSA modules" - tar -xf sound-preoss.tar.bz2 - #echo " installing alsa-lib" - #pacman -S --force --noconfirm alsa-lib echo " uninstalling oss" pacman -R --noconfirm oss echo "triggering udev module load" depmod -a - cd - > /dev/null - #udevadm trigger udevadm settle udevadm trigger - + udevadm settle add_service.sh alsa-utils - } @@ -54,6 +45,7 @@ function unload_alsa () { rm -rf /dev/adsp* rm -rf /dev/snd/* rm -rf /dev/audio + remove_asound modprobe -r $(lsmod |grep ^snd |awk '{print $1}') } @@ -136,13 +128,23 @@ function checkOSSinstalled () { fi } -function write_asound { - echo "writing asound.conf file" +function backup_asound { + echo "backup asound.conf file" if [ -f /etc/asound.conf ] then backdate=`date +%b-%d-%Y-%H:%M:%S` mv /etc/asound.conf /etc/asound.conf-$backdate fi +} + +function remove_asound { + echo "removing asound.conf file" + backup_asound +} + +function write_asound { + echo "writing asound.conf file" + backup_asound echo 'pcm.!default "'"$AUDIODEVICE"'"' > /etc/asound.conf } @@ -162,7 +164,8 @@ function loadsound (){ checkOSSinstalled if [ x$AUDIOTYPE = xOSS -o x$AUDIOTYPE = xoss ] then - while [ $OSSinstalled = "false" ] + i=1 + while [[ $OSSinstalled = "false" && $i -le 20 ]] do unload_alsa if [ -e /tmp/.alsatest ] @@ -171,6 +174,7 @@ function loadsound (){ fi installOSS checkOSSinstalled + i=$(( $i + 1 )) done else touch /tmp/.alsatest @@ -239,7 +243,7 @@ case $SOUNDOPTYPE in ossplay -d$AUDIODEVICE $TESTFILE else echo "testing ALSA $AUDIODEVICE " - echo aplay --device=$AUDIODEVICE $TESTFILE + #echo aplay --device=$AUDIODEVICE $TESTFILE aplay --device=$AUDIODEVICE $TESTFILE fi ;; -- cgit v0.12 From fe0f5b8a782211a521c843fe728d7fddb854efe9 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 12 Jun 2015 12:17:17 +0000 Subject: update81-82.sh: update repo to point to core.r8.2 --- abs/core/update81-82.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/update81-82.sh b/abs/core/update81-82.sh index 3667610..78e91be 100644 --- a/abs/core/update81-82.sh +++ b/abs/core/update81-82.sh @@ -46,7 +46,7 @@ else echo "filesystem package downloaded" fi -curl -o glibc-2.18-11-x86_64.pkg.tar.xz http://linhes.org/repo/x86_64/core/glibc-2.18-11-x86_64.pkg.tar.xz +curl -o glibc-2.18-11-x86_64.pkg.tar.xz http://linhes.org/repo/x86_64/core.r8.2/glibc-2.18-11-x86_64.pkg.tar.xz rc=$? if [ $rc != 0 ] then -- cgit v0.12 From 4fdceb659fb1756f9029a2ff1f07c0b8f701c045 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 21 Jun 2015 19:50:12 +0000 Subject: libepoxy: initial inclusion. dep of xorg-server --- abs/extra/libepoxy/PKGBUILD | 35 +++++++++++++++++++++++++++++++++++ abs/extra/libepoxy/__changelog | 1 + 2 files changed, 36 insertions(+) create mode 100644 abs/extra/libepoxy/PKGBUILD create mode 100644 abs/extra/libepoxy/__changelog diff --git a/abs/extra/libepoxy/PKGBUILD b/abs/extra/libepoxy/PKGBUILD new file mode 100644 index 0000000..5ba5cf8 --- /dev/null +++ b/abs/extra/libepoxy/PKGBUILD @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Laurent Carlier + +pkgname=libepoxy +pkgver=1.2 +pkgrel=2 +pkgdesc="A library for handling OpenGL function pointer management for you" +url="https://github.com/anholt/libepoxy" +arch=('i686' 'x86_64') +license=(MIT) +depends=('glibc') +makedepends=('xorg-util-macros' 'python2' 'mesa-libgl') +options=('!libtool') +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/anholt/${pkgname}/archive/v${pkgver}.tar.gz) +md5sums=('12d6b7621f086c0c928887c27d90bc30') + +build() { + cd "${pkgname}-${pkgver}" + + ./autogen.sh --prefix=/usr +} + +check() { + cd "${pkgname}-${pkgver}" + + make -k check +} + +package() { + cd "${pkgname}-${pkgver}" + + make DESTDIR="$pkgdir" install + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} + diff --git a/abs/extra/libepoxy/__changelog b/abs/extra/libepoxy/__changelog new file mode 100644 index 0000000..00bdcfb --- /dev/null +++ b/abs/extra/libepoxy/__changelog @@ -0,0 +1 @@ +-PKGBUILD: change dep python to python2 -- cgit v0.12 From 05ff5e6e6b9738987a55905939d575d1b141fb11 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 21 Jun 2015 19:58:03 +0000 Subject: libunwind: initial inclusion. dep of xorg-server --- abs/extra/libunwind/PKGBUILD | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 abs/extra/libunwind/PKGBUILD diff --git a/abs/extra/libunwind/PKGBUILD b/abs/extra/libunwind/PKGBUILD new file mode 100644 index 0000000..84ee163 --- /dev/null +++ b/abs/extra/libunwind/PKGBUILD @@ -0,0 +1,35 @@ +# $id$ +# Maintainer: Sébastien Luttringer +# Contributor: Lawrence Lee +# Contributor: Phillip Marvin +# Contributor: keystone + +pkgname=libunwind +pkgver=1.1 +pkgrel=2 +pkgdesc='Portable and efficient C programming interface (API) to determine the call-chain of a program' +arch=('i686' 'x86_64') +url='http://www.nongnu.org/libunwind/' +license=('GPL') +depends=('glibc' 'xz') +source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('fb4ea2f6fbbe45bf032cd36e586883ce') + +build() { + cd $pkgname-$pkgver + ./configure CFLAGS="$CFLAGS -U_FORTIFY_SOURCE" --prefix=/usr + make +} + +check() { + cd $pkgname-$pkgver + # This function is ``supposed'' to fail. Upstream know, but haven't fixed it. + make check || return 0 +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: -- cgit v0.12 From 1742ae9fcf1a677b3c9405b846217a27567f667c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 21 Jun 2015 20:23:43 +0000 Subject: xcb-util: update to 0.4.0 --- abs/core/xcb-util/LICENSE | 267 --------------------------------------------- abs/core/xcb-util/PKGBUILD | 21 ++-- 2 files changed, 9 insertions(+), 279 deletions(-) delete mode 100644 abs/core/xcb-util/LICENSE diff --git a/abs/core/xcb-util/LICENSE b/abs/core/xcb-util/LICENSE deleted file mode 100644 index 5e3822c..0000000 --- a/abs/core/xcb-util/LICENSE +++ /dev/null @@ -1,267 +0,0 @@ -/* Copyright (C) 2007 Bart Massey - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* - * Copyright (C) 2008-2009 Julien Danjou - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright (C) 2008 Arnaud Fontaine - * Copyright (C) 2007-2008 Vincent Torri - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - -/* - * Copyright © 2008 Bart Massey - * Copyright © 2008 Julien Danjou - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Keith Packard - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Bart Massey - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* - * Copyright © 2008 Ian Osgood - * Copyright © 2008 Jamey Sharp - * Copyright © 2008 Josh Triplett - * Copyright © 2008 Ulrich Eckhardt - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or - * their institutions shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from the authors. - */ - -/* Copyright © 2006 Jamey Sharp. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2006 Ian Osgood - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. - */ - -/* Copyright © 2000 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/abs/core/xcb-util/PKGBUILD b/abs/core/xcb-util/PKGBUILD index 42f3273..066ad31 100644 --- a/abs/core/xcb-util/PKGBUILD +++ b/abs/core/xcb-util/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160615 2012-06-02 21:14:55Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot # Maintainer: Andreas Radke # Contributor: Andrea Scarpino pkgname=xcb-util -pkgver=0.3.9 +pkgver=0.4.0 pkgrel=1 pkgdesc="Utility libraries for XC Binding" arch=('i686' 'x86_64') @@ -12,27 +12,24 @@ url="http://xcb.freedesktop.org" license=('custom') depends=('libxcb>=1.7') makedepends=('gperf' 'xorg-util-macros') -options=('!libtool') -source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" - 'LICENSE') -sha256sums=('c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4' - 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2") +sha256sums=('46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --disable-static 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 "${srcdir}/LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 COPYING \ + "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } -- cgit v0.12 From 450f7241266348e1de93e7f9fb75f4a61d2581b4 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 21 Jun 2015 20:29:32 +0000 Subject: xcb-util-keysyms: initial inclusion. dep of xorg-server --- abs/core/xcb-util-keysyms/LICENSE | 267 +++++++++++++++++++++++++++++++++++++ abs/core/xcb-util-keysyms/PKGBUILD | 36 +++++ 2 files changed, 303 insertions(+) create mode 100644 abs/core/xcb-util-keysyms/LICENSE create mode 100644 abs/core/xcb-util-keysyms/PKGBUILD diff --git a/abs/core/xcb-util-keysyms/LICENSE b/abs/core/xcb-util-keysyms/LICENSE new file mode 100644 index 0000000..5e3822c --- /dev/null +++ b/abs/core/xcb-util-keysyms/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine + * Copyright (C) 2007-2008 Vincent Torri + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey + * Copyright © 2008 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood + * Copyright © 2008 Jamey Sharp + * Copyright © 2008 Josh Triplett + * Copyright © 2008 Ulrich Eckhardt + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/abs/core/xcb-util-keysyms/PKGBUILD b/abs/core/xcb-util-keysyms/PKGBUILD new file mode 100644 index 0000000..17933ae --- /dev/null +++ b/abs/core/xcb-util-keysyms/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Jan de Groot +# Maintainer: Andreas Radke + +pkgname=xcb-util-keysyms +pkgver=0.4.0 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding - Standard X key constants and conversion to/from keycodes" +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7') +makedepends=('xorg-util-macros') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +sha256sums=('0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9' + 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd ${pkgname}-${pkgver} + make check +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} -- cgit v0.12 From 6630919c68990a5f482be34803d38df0c6e48976 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 21 Jun 2015 20:30:47 +0000 Subject: xcb-util-wm: initial inclusion. dep of xorg-server --- abs/core/xcb-util-wm/LICENSE | 267 ++++++++++++++++++++++++++++++++++++++++++ abs/core/xcb-util-wm/PKGBUILD | 36 ++++++ 2 files changed, 303 insertions(+) create mode 100644 abs/core/xcb-util-wm/LICENSE create mode 100644 abs/core/xcb-util-wm/PKGBUILD diff --git a/abs/core/xcb-util-wm/LICENSE b/abs/core/xcb-util-wm/LICENSE new file mode 100644 index 0000000..5e3822c --- /dev/null +++ b/abs/core/xcb-util-wm/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine + * Copyright (C) 2007-2008 Vincent Torri + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey + * Copyright © 2008 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood + * Copyright © 2008 Jamey Sharp + * Copyright © 2008 Josh Triplett + * Copyright © 2008 Ulrich Eckhardt + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/abs/core/xcb-util-wm/PKGBUILD b/abs/core/xcb-util-wm/PKGBUILD new file mode 100644 index 0000000..2d0af3f --- /dev/null +++ b/abs/core/xcb-util-wm/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Jan de Groot +# Maintainer: Andreas Radke + +pkgname=xcb-util-wm +pkgver=0.4.1 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM" +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7') +makedepends=('xorg-util-macros') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +sha256sums=('28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f' + 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd ${pkgname}-${pkgver} + make check +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} -- cgit v0.12 From 423982d0ad5273b12f8175abb5107f923a00c70b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 21 Jun 2015 20:32:58 +0000 Subject: xcb-util-renderutil: initial inclusion. dep of xorg-server --- abs/core/xcb-util-renderutil/LICENSE | 267 ++++++++++++++++++++++++++++++++++ abs/core/xcb-util-renderutil/PKGBUILD | 36 +++++ 2 files changed, 303 insertions(+) create mode 100644 abs/core/xcb-util-renderutil/LICENSE create mode 100644 abs/core/xcb-util-renderutil/PKGBUILD diff --git a/abs/core/xcb-util-renderutil/LICENSE b/abs/core/xcb-util-renderutil/LICENSE new file mode 100644 index 0000000..5e3822c --- /dev/null +++ b/abs/core/xcb-util-renderutil/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine + * Copyright (C) 2007-2008 Vincent Torri + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey + * Copyright © 2008 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood + * Copyright © 2008 Jamey Sharp + * Copyright © 2008 Josh Triplett + * Copyright © 2008 Ulrich Eckhardt + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/abs/core/xcb-util-renderutil/PKGBUILD b/abs/core/xcb-util-renderutil/PKGBUILD new file mode 100644 index 0000000..4bdd5fa --- /dev/null +++ b/abs/core/xcb-util-renderutil/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Jan de Groot +# Maintainer: Andreas Radke + +pkgname=xcb-util-renderutil +pkgver=0.3.9 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding - Convenience functions for the Render extension" +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7') +makedepends=('xorg-util-macros') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +sha256sums=('c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b' + 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd ${pkgname}-${pkgver} + make check +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} -- cgit v0.12 From a146b17b92c711f347dbe896cb7ba1139885079b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 21 Jun 2015 20:34:00 +0000 Subject: xcb-util-image: initial inclusion. dep of xorg-server --- abs/core/xcb-util-image/LICENSE | 267 +++++++++++++++++++++++++++++++++++++++ abs/core/xcb-util-image/PKGBUILD | 34 +++++ 2 files changed, 301 insertions(+) create mode 100644 abs/core/xcb-util-image/LICENSE create mode 100644 abs/core/xcb-util-image/PKGBUILD diff --git a/abs/core/xcb-util-image/LICENSE b/abs/core/xcb-util-image/LICENSE new file mode 100644 index 0000000..5e3822c --- /dev/null +++ b/abs/core/xcb-util-image/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine + * Copyright (C) 2007-2008 Vincent Torri + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey + * Copyright © 2008 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood + * Copyright © 2008 Jamey Sharp + * Copyright © 2008 Josh Triplett + * Copyright © 2008 Ulrich Eckhardt + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/abs/core/xcb-util-image/PKGBUILD b/abs/core/xcb-util-image/PKGBUILD new file mode 100644 index 0000000..54ed13d --- /dev/null +++ b/abs/core/xcb-util-image/PKGBUILD @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Jan de Groot +# Maintainer: Andreas Radke + +pkgname=xcb-util-image +pkgver=0.4.0 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding - Port of Xlib's XImage and XShmImage functions" +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7' 'xcb-util>=0.3.9') +makedepends=('xorg-util-macros') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2") +sha256sums=('2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc') + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd ${pkgname}-${pkgver} + make check +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + install -D -m644 COPYING \ + ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} -- cgit v0.12 From 21be973f7a18a7d2715048fca860204c1c64104c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 21 Jun 2015 21:01:00 +0000 Subject: glproto: update to 1.4.17 --- abs/core/glproto/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/abs/core/glproto/PKGBUILD b/abs/core/glproto/PKGBUILD index 94976fa..ef4a2eb 100644 --- a/abs/core/glproto/PKGBUILD +++ b/abs/core/glproto/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 163853 2012-07-21 11:21:24Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=glproto -pkgver=1.4.16 +pkgver=1.4.17 pkgrel=1 pkgdesc="X11 OpenGL extension wire protocol" arch=(any) url="http://xorg.freedesktop.org/" license=('custom') source=(http://xorg.freedesktop.org/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d') +sha256sums=('adaa94bded310a2bfcbb9deb4d751d965fcfe6fb3a2f6d242e2df2d6589dbe40') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 "COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/" -- cgit v0.12 From e3f981f017ed9e42afc1b7e4ac9d37537d3d9cf0 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 21 Jun 2015 21:06:11 +0000 Subject: xtrans: update to 1.3.5 --- abs/core/xtrans/PKGBUILD | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/abs/core/xtrans/PKGBUILD b/abs/core/xtrans/PKGBUILD index b2f225e..08e026b 100644 --- a/abs/core/xtrans/PKGBUILD +++ b/abs/core/xtrans/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 26847 2009-02-13 15:27:40Z andyrtr $ -# Maintainer: Alexander Baldeck -# Contributor: Jan de Groot +# $Id$ +# Maintainer: Andreas Radke +# Maintainer: Jan de Groot + pkgname=xtrans -pkgver=1.2.5 +pkgver=1.3.5 pkgrel=1 pkgdesc="X transport library" -arch=(i686 x86_64) +arch=('any') license=('custom') url="http://xorg.freedesktop.org/" +options=(!emptydirs) source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr } -package () { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + + install -m755 -d "${pkgdir}/usr/lib" + mv "${pkgdir}/usr/share/pkgconfig" "${pkgdir}/usr/lib/pkgconfig" } -md5sums=('2d1e57e82acc5f21797e92341415af2f') -- cgit v0.12 From c27c2e5cd8f47f9afa0df20ad0d91aa68a1c96c8 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 21 Jun 2015 21:07:09 +0000 Subject: xproto: update to 7.0.27 --- abs/core/xproto/PKGBUILD | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/abs/core/xproto/PKGBUILD b/abs/core/xproto/PKGBUILD index 5940df8..397f030 100644 --- a/abs/core/xproto/PKGBUILD +++ b/abs/core/xproto/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 153611 2012-03-16 17:10:15Z andyrtr $ +# $Id$ +# Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=xproto -pkgver=7.0.23 +pkgver=7.0.27 pkgrel=1 pkgdesc="X11 core wire protocol and auxiliary headers" arch=(any) license=('custom') url="http://xorg.freedesktop.org/" makedepends=('xorg-util-macros') -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('5d7f00d1dbe6cf8e725841ef663f0ee2491ba5b2') +source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2{,.sig}) +sha256sums=('246f23a6b235c8008183deeb1dcd76d529a099f93600b648b399811b10ea110c' + 'SKIP') +validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith " build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -- cgit v0.12 From 70ff9be5efbfc9db02563dd390828ae40f69594b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 21 Jun 2015 21:08:02 +0000 Subject: xextproto: update to 7.3.0 --- abs/core/xextproto/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/abs/core/xextproto/PKGBUILD b/abs/core/xextproto/PKGBUILD index c7bdb79..65320f7 100644 --- a/abs/core/xextproto/PKGBUILD +++ b/abs/core/xextproto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154144 2012-03-23 17:24:05Z andyrtr $ +# $Id$ #Maintainer: Jan de Groot pkgname=xextproto -pkgver=7.2.1 +pkgver=7.3.0 pkgrel=1 pkgdesc="X11 various extension wire protocol" arch=('any') @@ -10,16 +10,16 @@ license=('custom') makedepends=('xmlto' 'xorg-util-macros' 'docbook-xsl') url="http://xorg.freedesktop.org/" source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('f969e02009adf2d51fd1ba4583a859984728a461') +sha256sums=('f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } -- cgit v0.12 From 83fb6eab70199923f6c316f097c43249588a55a2 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 21 Jun 2015 21:09:05 +0000 Subject: inputproto: update to 2.3.1 --- abs/core/inputproto/PKGBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/abs/core/inputproto/PKGBUILD b/abs/core/inputproto/PKGBUILD index eadd915..4e102e7 100644 --- a/abs/core/inputproto/PKGBUILD +++ b/abs/core/inputproto/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 153286 2012-03-12 20:52:13Z andyrtr $ +# $Id$ +# Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=inputproto -pkgver=2.2 +pkgver=2.3.1 pkgrel=1 pkgdesc="X11 Input extension wire protocol" arch=(any) @@ -10,7 +11,7 @@ license=('custom') url="http://xorg.freedesktop.org/" makedepends=('xorg-util-macros' 'asciidoc') source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('500e0a6dac3523887c0b82753fe5e9d4bb982137') +sha256sums=('5a47ee62053a6acef3a83f506312494be1461068d0b9269d818839703b95c1d1') build() { cd "${srcdir}/${pkgname}-${pkgver}" -- cgit v0.12 From 9faedc796a708cfb4365322cc40d655cf658c9aa Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 21 Jun 2015 21:11:15 +0000 Subject: fontsproto: update to 2.1.3 --- abs/core/fontsproto/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/fontsproto/PKGBUILD b/abs/core/fontsproto/PKGBUILD index c4ddc51..91c1ff9 100644 --- a/abs/core/fontsproto/PKGBUILD +++ b/abs/core/fontsproto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154134 2012-03-23 17:17:02Z andyrtr $ +# $Id$ #Maintainer: Jan de Groot pkgname=fontsproto -pkgver=2.1.2 +pkgver=2.1.3 pkgrel=1 pkgdesc="X11 font extension wire protocol" arch=('any') @@ -10,7 +10,7 @@ url="http://xorg.freedesktop.org/" license=('custom') makedepends=('xorg-util-macros') source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('538f0880faa6981cb1a348ced93dc715c42840f7') +sha256sums=('259046b0dd9130825c4a4c479ba3591d6d0f17a33f54e294b56478729a6e5ab8') build() { cd "${srcdir}/${pkgname}-${pkgver}" -- cgit v0.12 From 5984430649def224368a9dcc208613d5f8277554 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 22 Jun 2015 15:23:37 +0000 Subject: check: initial inclusion. dep of libevdev --- abs/extra/check/PKGBUILD | 40 ++++++++++++++++++++++++++++++++++++++++ abs/extra/check/check.install | 20 ++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 abs/extra/check/PKGBUILD create mode 100644 abs/extra/check/check.install diff --git a/abs/extra/check/PKGBUILD b/abs/extra/check/PKGBUILD new file mode 100644 index 0000000..6ee17d2 --- /dev/null +++ b/abs/extra/check/PKGBUILD @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jaroslav Lichtblau +# Contributor: Jeremy Cowgar + +pkgname=check +pkgver=0.9.14 +pkgrel=1 +pkgdesc="A unit testing framework for C" +arch=('i686' 'x86_64') +url="http://check.sourceforge.net/" +license=('LGPL') +install=$pkgname.install +depends=('awk') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('38263d115d784c17aa3b959ce94be8b8') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd $pkgname-$pkgver + # Extremely long + #make -k check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + # get rid of the package's info directory, + # install-info adds entries for us at install-time + rm "$pkgdir/usr/share/info/dir" + + # svn log file is too big + rm "$pkgdir"/usr/share/doc/check/*ChangeLog* +} diff --git a/abs/extra/check/check.install b/abs/extra/check/check.install new file mode 100644 index 0000000..c4092e2 --- /dev/null +++ b/abs/extra/check/check.install @@ -0,0 +1,20 @@ +_infodir=/usr/share/info +_filelist=(check.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${_filelist[@]}; do + install-info $_infodir/$file $_infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${_filelist[@]}; do + install-info --delete $_infodir/$file $_infodir/dir 2> /dev/null + done +} -- cgit v0.12 From 31e30543fee5b3c776ae223af560724c7ed65ea2 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 22 Jun 2015 15:27:25 +0000 Subject: libevdev: initial inclusion. dep of xf86-input-evdev --- abs/core/libevdev/PKGBUILD | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 abs/core/libevdev/PKGBUILD diff --git a/abs/core/libevdev/PKGBUILD b/abs/core/libevdev/PKGBUILD new file mode 100644 index 0000000..5a9a09e --- /dev/null +++ b/abs/core/libevdev/PKGBUILD @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Andreas Radke + +pkgname=libevdev +pkgver=1.4.2 +pkgrel=1 +pkgdesc="Wrapper library for evdev devices" +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/libevdev/" +license=(custom:X11) +depends=('glibc') +makedepends=('python2' 'check' 'valgrind' 'doxygen') +#checkdepends=('kmod') +source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) +sha256sums=('7c77b213f075706d428a2af54b66bf86b03a68e9fb390e7ec48cf55065970643' + 'SKIP') +validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --disable-static + make +} +check() { + cd $pkgname-$pkgver + # test suite requires root access and needs to load uinput module + # that's not possible in our chroot + #modprobe uinput + make check || /bin/true +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} -- cgit v0.12 From 0e324da05a77aa3fa7cbc7c5e0921eb85e75f56d Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 22 Jun 2015 15:33:01 +0000 Subject: xf86-input-evdev: update to 2.9.2. dep of xorg-server --- abs/core/xf86-input-evdev/PKGBUILD | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/abs/core/xf86-input-evdev/PKGBUILD b/abs/core/xf86-input-evdev/PKGBUILD index daab499..7a5bda7 100644 --- a/abs/core/xf86-input-evdev/PKGBUILD +++ b/abs/core/xf86-input-evdev/PKGBUILD @@ -1,30 +1,32 @@ -# $Id: PKGBUILD 168556 2012-10-13 11:43:27Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck =19') -options=('!libtool' '!makeflags') +depends=('glibc' 'systemd' 'mtdev' 'libevdev') +makedepends=('xorg-server-devel' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.16.0' 'X-ABI-XINPUT_VERSION<21' 'X-ABI-XINPUT_VERSION>=22') +options=('!makeflags') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}) +sha256sums=('792329b531afc6928ccda94e4b51a5520d4ddf8ef9a00890a5d0d31898acefec' + 'SKIP') +validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -- cgit v0.12 From 75b0133774bb4069865e892304e78ade1964c7ff Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 23 Jun 2015 19:40:40 +0000 Subject: xorg-server: update to 1.17.2 --- ...accelerated-valuators-to-the-ValuatorMask.patch | 210 +++++++++++++++++++++ ...001-dix-fix-zaphod-screen-scrossing-54654.patch | 42 ----- ...-hook-up-the-unaccelerated-valuator-masks.patch | 134 +++++++++++++ abs/core/xorg-server/10-quirks.conf | 10 - abs/core/xorg-server/PKGBUILD | 143 ++++++++------ abs/core/xorg-server/Xwrapper.config | 3 + abs/core/xorg-server/__changelog | 5 +- abs/core/xorg-server/autoconfig-nvidia.patch | 28 --- abs/core/xorg-server/nvidia-drm-outputclass.conf | 6 + abs/core/xorg-server/xorg-server.install | 18 ++ 10 files changed, 463 insertions(+), 136 deletions(-) create mode 100644 abs/core/xorg-server/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch delete mode 100644 abs/core/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch create mode 100644 abs/core/xorg-server/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch delete mode 100644 abs/core/xorg-server/10-quirks.conf create mode 100644 abs/core/xorg-server/Xwrapper.config delete mode 100644 abs/core/xorg-server/autoconfig-nvidia.patch create mode 100644 abs/core/xorg-server/nvidia-drm-outputclass.conf create mode 100644 abs/core/xorg-server/xorg-server.install diff --git a/abs/core/xorg-server/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch b/abs/core/xorg-server/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch new file mode 100644 index 0000000..86744f1 --- /dev/null +++ b/abs/core/xorg-server/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch @@ -0,0 +1,210 @@ +From e1a7f4bb5333b0271d29f785eb55f1c3273e626a Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 5 May 2015 14:18:54 +1000 +Subject: [PATCH] dix: Add unaccelerated valuators to the ValuatorMask + +Allows a mask to carry both accelerated and unaccelerated motion at the same +time. + +This is required for xf86-input-libinput where the pointer acceleration +happens in libinput already, but parts of the server, specifically raw events +and DGA rely on device-specific unaccelerated data. + +To ease integration add this as a second set to the ValuatorMask rather than +extending all APIs to carry a second, possibly NULL set of valuators. + +Note that a valuator mask should only be used in either accel/unaccel or +standard mode at any time. Switching requires either a valuator_mask_zero() +call or unsetting all valuators one-by-one. Trying to mix the two will produce +a warning. + +The server has a shortcut for changing a mask with the +valuator_mask_drop_unaccelerated() call. This saves us from having to loop +through all valuators on every event, we can just drop the bits we know we +don't want. + +Signed-off-by: Peter Hutterer +Reviewed-by: Hans de Goede +--- + dix/inpututils.c | 82 +++++++++++++++++++++++++++++++++++++++--- + hw/xfree86/common/xf86Module.h | 2 +- + include/input.h | 15 ++++++++ + include/inpututils.h | 2 ++ + 4 files changed, 95 insertions(+), 6 deletions(-) + +diff --git a/dix/inpututils.c b/dix/inpututils.c +index 5c2a32d..1363988 100644 +--- a/dix/inpututils.c ++++ b/dix/inpututils.c +@@ -505,11 +505,8 @@ valuator_mask_isset(const ValuatorMask *mask, int valuator) + return mask->last_bit >= valuator && BitIsOn(mask->mask, valuator); + } + +-/** +- * Set the valuator to the given floating-point data. +- */ +-void +-valuator_mask_set_double(ValuatorMask *mask, int valuator, double data) ++static inline void ++_valuator_mask_set_double(ValuatorMask *mask, int valuator, double data) + { + mask->last_bit = max(valuator, mask->last_bit); + SetBit(mask->mask, valuator); +@@ -517,6 +514,17 @@ valuator_mask_set_double(ValuatorMask *mask, int valuator, double data) + } + + /** ++ * Set the valuator to the given floating-point data. ++ */ ++void ++valuator_mask_set_double(ValuatorMask *mask, int valuator, double data) ++{ ++ BUG_WARN_MSG(mask->has_unaccelerated, ++ "Do not mix valuator types, zero mask first\n"); ++ _valuator_mask_set_double(mask, valuator, data); ++} ++ ++/** + * Set the valuator to the given integer data. + */ + void +@@ -594,11 +602,15 @@ valuator_mask_unset(ValuatorMask *mask, int valuator) + + ClearBit(mask->mask, valuator); + mask->valuators[valuator] = 0.0; ++ mask->unaccelerated[valuator] = 0.0; + + for (i = 0; i <= mask->last_bit; i++) + if (valuator_mask_isset(mask, i)) + lastbit = max(lastbit, i); + mask->last_bit = lastbit; ++ ++ if (mask->last_bit == -1) ++ mask->has_unaccelerated = FALSE; + } + } + +@@ -611,6 +623,66 @@ valuator_mask_copy(ValuatorMask *dest, const ValuatorMask *src) + valuator_mask_zero(dest); + } + ++Bool ++valuator_mask_has_unaccelerated(const ValuatorMask *mask) ++{ ++ return mask->has_unaccelerated; ++} ++ ++void ++valuator_mask_drop_unaccelerated(ValuatorMask *mask) ++{ ++ memset(mask->unaccelerated, 0, sizeof(mask->unaccelerated)); ++ mask->has_unaccelerated = FALSE; ++} ++ ++/** ++ * Set both accelerated and unaccelerated value for this mask. ++ */ ++void ++valuator_mask_set_unaccelerated(ValuatorMask *mask, ++ int valuator, ++ double accel, ++ double unaccel) ++{ ++ BUG_WARN_MSG(mask->last_bit != -1 && !mask->has_unaccelerated, ++ "Do not mix valuator types, zero mask first\n"); ++ _valuator_mask_set_double(mask, valuator, accel); ++ mask->has_unaccelerated = TRUE; ++ mask->unaccelerated[valuator] = unaccel; ++} ++ ++double ++valuator_mask_get_accelerated(const ValuatorMask *mask, ++ int valuator) ++{ ++ return valuator_mask_get_double(mask, valuator); ++} ++ ++double ++valuator_mask_get_unaccelerated(const ValuatorMask *mask, ++ int valuator) ++{ ++ return mask->unaccelerated[valuator]; ++} ++ ++Bool ++valuator_mask_fetch_unaccelerated(const ValuatorMask *mask, ++ int valuator, ++ double *accel, ++ double *unaccel) ++{ ++ if (valuator_mask_isset(mask, valuator)) { ++ if (accel) ++ *accel = valuator_mask_get_accelerated(mask, valuator); ++ if (unaccel) ++ *unaccel = valuator_mask_get_unaccelerated(mask, valuator); ++ return TRUE; ++ } ++ else ++ return FALSE; ++} ++ + int + CountBits(const uint8_t * mask, int len) + { +diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h +index e68fe9c..6133641 100644 +--- a/hw/xfree86/common/xf86Module.h ++++ b/hw/xfree86/common/xf86Module.h +@@ -81,7 +81,7 @@ typedef enum { + */ + #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4) + #define ABI_VIDEODRV_VERSION SET_ABI_VERSION(19, 0) +-#define ABI_XINPUT_VERSION SET_ABI_VERSION(21, 0) ++#define ABI_XINPUT_VERSION SET_ABI_VERSION(21, 1) + #define ABI_EXTENSION_VERSION SET_ABI_VERSION(9, 0) + #define ABI_FONT_VERSION SET_ABI_VERSION(0, 6) + +diff --git a/include/input.h b/include/input.h +index bf22dc7..0a4c4f7 100644 +--- a/include/input.h ++++ b/include/input.h +@@ -674,6 +674,21 @@ extern _X_EXPORT Bool valuator_mask_fetch(const ValuatorMask *mask, + extern _X_EXPORT Bool valuator_mask_fetch_double(const ValuatorMask *mask, + int valnum, double *val); + ++extern _X_EXPORT Bool valuator_mask_has_unaccelerated(const ValuatorMask *mask); ++extern _X_EXPORT void valuator_mask_set_unaccelerated(ValuatorMask *mask, ++ int valuator, ++ double accel, ++ double unaccel); ++extern _X_EXPORT double valuator_mask_get_accelerated(const ValuatorMask *mask, ++ int valuator); ++extern _X_EXPORT double valuator_mask_get_unaccelerated(const ValuatorMask *mask, ++ int valuator); ++extern _X_EXPORT Bool valuator_mask_fetch_unaccelerated(const ValuatorMask *mask, ++ int valuator, ++ double *accel, ++ double *unaccel); ++extern _X_HIDDEN void valuator_mask_drop_unaccelerated(ValuatorMask *mask); ++ + /* InputOption handling interface */ + extern _X_EXPORT InputOption *input_option_new(InputOption *list, + const char *key, +diff --git a/include/inpututils.h b/include/inpututils.h +index 53c96ba..4e90815 100644 +--- a/include/inpututils.h ++++ b/include/inpututils.h +@@ -36,8 +36,10 @@ extern Mask event_filters[MAXDEVICES][MAXEVENTS]; + + struct _ValuatorMask { + int8_t last_bit; /* highest bit set in mask */ ++ int8_t has_unaccelerated; + uint8_t mask[(MAX_VALUATORS + 7) / 8]; + double valuators[MAX_VALUATORS]; /* valuator data */ ++ double unaccelerated[MAX_VALUATORS]; /* valuator data */ + }; + + extern void verify_internal_event(const InternalEvent *ev); +-- +2.4.1 + diff --git a/abs/core/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch b/abs/core/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch deleted file mode 100644 index e3e42d4..0000000 --- a/abs/core/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 29d84d5a7ca4cc12cce47de9313adeb8554fb894 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 18 Oct 2012 15:11:31 +1000 -Subject: [PATCH] dix: fix zaphod screen scrossing (#54654) - -POINTER_SCREEN coordinates are screen-relative. For a Zaphod setup, the -coordinates after a screen crossing are already relative to the new screen's -origin. Add that offset to the coordinates before re-setting. - -regression introduced by -commit bafbd99080be49a17be97d2cc758fbe623369945 -Author: Peter Hutterer -Date: Wed Aug 8 11:34:32 2012 +1000 - - dix: work around scaling issues during WarpPointer (#53037) - -X.Org Bug 54654 - -Signed-off-by: Peter Hutterer ---- - dix/getevents.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/dix/getevents.c b/dix/getevents.c -index 71d83c4..8b4379d 100644 ---- a/dix/getevents.c -+++ b/dix/getevents.c -@@ -1400,8 +1400,9 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, - coordinates were. - */ - if (flags & POINTER_SCREEN) { -- screenx = sx; -- screeny = sy; -+ scr = miPointerGetScreen(pDev); -+ screenx = sx + scr->x; -+ screeny = sy + scr->y; - } - - scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative, --- -1.7.11.7 - diff --git a/abs/core/xorg-server/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch b/abs/core/xorg-server/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch new file mode 100644 index 0000000..6b8b1e5 --- /dev/null +++ b/abs/core/xorg-server/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch @@ -0,0 +1,134 @@ +From 7504fbd2239257f1a00a1a15d02862eea81f167c Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 5 May 2015 14:48:41 +1000 +Subject: [PATCH] dix: hook up the unaccelerated valuator masks + +If present, access the unaccelerated valuator mask values for DGA and XI2 raw +events. + +Signed-off-by: Peter Hutterer +Reviewed-by: Hans de Goede +--- + dix/getevents.c | 31 ++++++++++++++++++++++--------- + hw/xfree86/common/xf86Xinput.c | 4 ++++ + 2 files changed, 26 insertions(+), 9 deletions(-) + +diff --git a/dix/getevents.c b/dix/getevents.c +index 6fb12c5..64bf76e 100644 +--- a/dix/getevents.c ++++ b/dix/getevents.c +@@ -213,14 +213,25 @@ init_raw(DeviceIntPtr dev, RawDeviceEvent *event, Time ms, int type, int detail) + } + + static void +-set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, double *data) ++set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, ++ BOOL use_unaccel, double *data) + { + int i; + ++ use_unaccel = use_unaccel && valuator_mask_has_unaccelerated(mask); ++ + for (i = 0; i < valuator_mask_size(mask); i++) { + if (valuator_mask_isset(mask, i)) { ++ double v; ++ + SetBit(event->valuators.mask, i); +- data[i] = valuator_mask_get_double(mask, i); ++ ++ if (use_unaccel) ++ v = valuator_mask_get_unaccelerated(mask, i); ++ else ++ v = valuator_mask_get_double(mask, i); ++ ++ data[i] = v; + } + } + } +@@ -1138,11 +1149,11 @@ GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type, + valuator_mask_copy(&mask, mask_in); + + init_raw(pDev, raw, ms, type, key_code); +- set_raw_valuators(raw, &mask, raw->valuators.data_raw); ++ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw); + + clipValuators(pDev, &mask); + +- set_raw_valuators(raw, &mask, raw->valuators.data); ++ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data); + + event = &events->device_event; + init_device_event(event, pDev, ms); +@@ -1423,9 +1434,11 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, + num_events++; + + init_raw(pDev, raw, ms, type, buttons); +- set_raw_valuators(raw, &mask, raw->valuators.data_raw); ++ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw); + } + ++ valuator_mask_drop_unaccelerated(&mask); ++ + /* valuators are in driver-native format (rel or abs) */ + + if (flags & POINTER_ABSOLUTE) { +@@ -1438,7 +1451,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, + transformAbsolute(pDev, &mask); + clipAbsolute(pDev, &mask); + if ((flags & POINTER_NORAW) == 0 && raw) +- set_raw_valuators(raw, &mask, raw->valuators.data); ++ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data); + } + else { + transformRelative(pDev, &mask); +@@ -1446,7 +1459,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, + if (flags & POINTER_ACCELERATE) + accelPointer(pDev, &mask, ms); + if ((flags & POINTER_NORAW) == 0 && raw) +- set_raw_valuators(raw, &mask, raw->valuators.data); ++ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data); + + moveRelative(pDev, flags, &mask); + } +@@ -1951,7 +1964,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid, + events++; + num_events++; + init_raw(dev, raw, ms, type, client_id); +- set_raw_valuators(raw, &mask, raw->valuators.data_raw); ++ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw); + } + + event = &events->device_event; +@@ -2013,7 +2026,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid, + screeny = dev->spriteInfo->sprite->hotPhys.y; + } + if (need_rawevent) +- set_raw_valuators(raw, &mask, raw->valuators.data); ++ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data); + + /* Indirect device touch coordinates are not used for cursor positioning. + * They are merely informational, and are provided in device coordinates. +diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c +index 1fb5b16..5ce4c71 100644 +--- a/hw/xfree86/common/xf86Xinput.c ++++ b/hw/xfree86/common/xf86Xinput.c +@@ -1137,12 +1137,16 @@ xf86CheckMotionEvent4DGA(DeviceIntPtr device, int is_absolute, + dx = valuator_mask_get(mask, 0); + if (is_absolute) + dx -= device->last.valuators[0]; ++ else if (valuator_mask_has_unaccelerated(mask)) ++ dx = valuator_mask_get_unaccelerated(mask, 0); + } + + if (valuator_mask_isset(mask, 1)) { + dy = valuator_mask_get(mask, 1); + if (is_absolute) + dy -= device->last.valuators[1]; ++ else if (valuator_mask_has_unaccelerated(mask)) ++ dy = valuator_mask_get_unaccelerated(mask, 1); + } + + if (DGAStealMotionEvent(device, idx, dx, dy)) +-- +2.4.1 + diff --git a/abs/core/xorg-server/10-quirks.conf b/abs/core/xorg-server/10-quirks.conf deleted file mode 100644 index 7afad22..0000000 --- a/abs/core/xorg-server/10-quirks.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Collection of quirks and blacklist/whitelists for specific devices. - - -# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable -# http://bugs.freedesktop.org/show_bug.cgi?id=22442 -Section "InputClass" - Identifier "ThinkPad HDAPS accelerometer blacklist" - MatchProduct "ThinkPad HDAPS accelerometer data" - Option "Ignore" "on" -EndSection diff --git a/abs/core/xorg-server/PKGBUILD b/abs/core/xorg-server/PKGBUILD index 3b6fee0..f84da16 100644 --- a/abs/core/xorg-server/PKGBUILD +++ b/abs/core/xorg-server/PKGBUILD @@ -1,45 +1,49 @@ -# $Id: PKGBUILD 169327 2012-10-19 14:00:03Z andyrtr $ +# $Id$ +# Maintainer: AndyRTR # Maintainer: Jan de Groot pkgbase=xorg-server -pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.13.0 -pkgrel=3 +pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel') +pkgver=1.17.2 +pkgrel=1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' - 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' - 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' - 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt') -options=('!libtool') -source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - autoconfig-nvidia.patch - autoconfig-sis.patch +makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' + 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto' + 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' + 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' + 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy' + 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto' + 'libxshmfence' 'libunwind') +source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} + nvidia-drm-outputclass.conf xvfb-run xvfb-run.1 - 10-quirks.conf - 0001-dix-fix-zaphod-screen-scrossing-54654.patch) -sha256sums=('548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a' - '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' - 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' + 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch + 0002-dix-hook-up-the-unaccelerated-valuator-masks.patch + Xwrapper.config) +validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' + 'C383B778255613DFDB409D91DB221A6900000011' + 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') +sha256sums=('f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993' + 'SKIP' + 'af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' - '23861814b4283ca3fe43aae6e88ee82bcbae5713bf88eabeaef7beb94efe9707') + '3dc795002b8763a7d29db94f0af200131da9ce5ffc233bfd8916060f83a8fad7' + '416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96' + 'SKIP') + +prepare() { + cd "${pkgbase}-${pkgver}" + # fix FS#45229, merged upstream + patch -Np1 -i ../0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch + patch -Np1 -i ../0002-dix-hook-up-the-unaccelerated-valuator-masks.patch +} build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Use nouveau/nv/nvidia drivers for nvidia devices - patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" - - # Use unofficial imedia SiS driver for supported SiS devices - patch -Np0 -i "${srcdir}/autoconfig-sis.patch" - - # https://bugs.archlinux.org/task/31959 / https://bugs.freedesktop.org/show_bug.cgi?id=54654 - patch -Np1 -i ${srcdir}/0001-dix-fix-zaphod-screen-scrossing-54654.patch - + cd "${pkgbase}-${pkgver}" autoreconf -fi ./configure --prefix=/usr \ --enable-ipv6 \ @@ -49,25 +53,35 @@ build() { --enable-xnest \ --enable-composite \ --enable-xcsecurity \ + --enable-libunwind \ --enable-xorg \ --enable-xephyr \ + --enable-glamor \ + --enable-xwayland \ --enable-glx-tls \ --enable-kdrive \ --enable-kdrive-evdev \ --enable-kdrive-kbd \ --enable-kdrive-mouse \ - --enable-install-setuid \ --enable-config-udev \ - --disable-config-dbus \ + --disable-systemd-logind \ + --enable-suid-wrapper \ + --enable-install-setuid \ --enable-record \ --disable-xfbdev \ --disable-xfake \ --disable-static \ - --sysconfdir=/etc/X11 \ + --libexecdir=/usr/lib/xorg-server \ + --sysconfdir=/etc \ --localstatedir=/var \ --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts + --with-fontrootdir=/usr/share/fonts \ + --with-sha1=libgcrypt + +# --without-dtrace \ +# --disable-linux-acpi --disable-linux-apm \ + make # Disable subdirs for make install rule to make splitting easier @@ -75,14 +89,16 @@ build() { -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ + -e 's/^XWAYLAND_SUBDIRS =.*/XWAYLAND_SUBDIRS =/' \ -i hw/Makefile } package_xorg-server-common() { pkgdesc="Xorg server common files" - depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') + depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc' + 'libunwind') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${pkgbase}-${pkgver}" install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" @@ -97,21 +113,24 @@ package_xorg-server-common() { package_xorg-server() { pkgdesc="Xorg X server" - depends=(libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev) - backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') - # see xorg-server-1.13.0/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on - provides=('X-ABI-VIDEODRV_VERSION=13' 'X-ABI-XINPUT_VERSION=18' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server') + depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence libgl) + # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on + # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg + provides=('X-ABI-VIDEODRV_VERSION=19' 'X-ABI-XINPUT_VERSION=21.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server') groups=('xorg') - conflicts=('nvidia-utils<=290.10') + conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting') + replaces=('glamor-egl' 'xf86-video-modesetting') + install=xorg-server.install - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/X11" - mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" - install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" + # distro specific files must be installed in /usr/share/X11/xorg.conf.d + install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" + install -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/" - rmdir "${pkgdir}/usr/share/X11" + # LinHES Xwrapper.config + install -m644 "${srcdir}/Xwrapper.config" "${pkgdir}/etc/X11/Xwrapper.config" # Needed for non-mesa drivers, libgl will restore it mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ @@ -132,9 +151,10 @@ package_xorg-server() { package_xorg-server-xephyr() { pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common) + depends=(libxfont libgl libepoxy libgcrypt libxv pixman xorg-server-common 'xcb-util-image' + 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms') - cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive" + cd "${pkgbase}-${pkgver}/hw/kdrive" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" @@ -143,9 +163,9 @@ package_xorg-server-xephyr() { package_xorg-server-xvfb() { pkgdesc="Virtual framebuffer X server" - depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common) + depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common xorg-xauth libgl) - cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb" + cd "${pkgbase}-${pkgver}/hw/vfb" make DESTDIR="${pkgdir}" install install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" @@ -157,9 +177,9 @@ package_xorg-server-xvfb() { package_xorg-server-xnest() { pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libxext libgcrypt pixman xorg-server-common) + depends=(libxfont libxext libgcrypt pixman xorg-server-common libsystemd) - cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest" + cd "${pkgbase}-${pkgver}/hw/xnest" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" @@ -170,23 +190,35 @@ package_xorg-server-xdmx() { pkgdesc="Distributed Multihead X Server and utilities" depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common) - cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx" + cd "${pkgbase}-${pkgver}/hw/dmx" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING" } +package_xorg-server-xwayland() { + pkgdesc="run X clients under wayland" + depends=(libxfont libepoxy libgl pixman xorg-server-common) + + cd "${pkgbase}-${pkgver}/hw/xwayland" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xwayland" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xwayland/COPYING" +} + package_xorg-server-devel() { pkgdesc="Development files for the X.Org X server" depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc xproto randrproto renderproto xextproto inputproto kbproto fontsproto pixman videoproto xf86driproto glproto - mesa dri2proto xineramaproto libpciaccess + mesa dri2proto dri3proto xineramaproto libpciaccess + resourceproto scrnsaverproto presentproto # not technically required but almost every Xorg pkg needs it to build xorg-util-macros) - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install rm -rf "${pkgdir}/usr/bin" @@ -194,6 +226,7 @@ package_xorg-server-devel() { rm -rf "${pkgdir}/usr/share/doc" rm -rf "${pkgdir}/usr/share/X11" rm -rf "${pkgdir}/usr/lib/xorg" + rm -rf "${pkgdir}/usr/lib/xorg-server" rm -rf "${pkgdir}/var" install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" diff --git a/abs/core/xorg-server/Xwrapper.config b/abs/core/xorg-server/Xwrapper.config new file mode 100644 index 0000000..2b9a582 --- /dev/null +++ b/abs/core/xorg-server/Xwrapper.config @@ -0,0 +1,3 @@ +#see man Xorg.wrap for these options +allowed_users = anybody +#needs_root_rights = yes diff --git a/abs/core/xorg-server/__changelog b/abs/core/xorg-server/__changelog index a0d578e..1d44956 100644 --- a/abs/core/xorg-server/__changelog +++ b/abs/core/xorg-server/__changelog @@ -1,2 +1,5 @@ placeholder to prevent auto update. -pixman cache bug +PKGBUILD - Change configure options: + --disable-systemd-logind \ + --enable-install-setuid \ +PKGBUILD - Add Xwrapper.config file diff --git a/abs/core/xorg-server/autoconfig-nvidia.patch b/abs/core/xorg-server/autoconfig-nvidia.patch deleted file mode 100644 index 6d5220a..0000000 --- a/abs/core/xorg-server/autoconfig-nvidia.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c ---- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000 -+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000 -@@ -1144,7 +1144,23 @@ - int idx = 0; - - #ifdef __linux__ -- driverList[idx++] = "nouveau"; -+ switch (dev->device_id) -+ { -+ /* NV1 */ -+ case 0x0008: -+ case 0x0009: -+ driverList[idx++] = "vesa"; -+ break; -+ /* NV3 */ -+ case 0x0018: -+ case 0x0019: -+ driverList[idx++] = "nouveau"; -+ break; -+ default: -+ driverList[idx++] = "nouveau"; -+ driverList[idx++] = "nvidia"; -+ break; -+ } - #endif - driverList[idx++] = "nv"; - break; diff --git a/abs/core/xorg-server/nvidia-drm-outputclass.conf b/abs/core/xorg-server/nvidia-drm-outputclass.conf new file mode 100644 index 0000000..40c1e08 --- /dev/null +++ b/abs/core/xorg-server/nvidia-drm-outputclass.conf @@ -0,0 +1,6 @@ +Section "OutputClass" + Identifier "nvidia" + MatchDriver "nvidia-drm" + Driver "nvidia" +EndSection + diff --git a/abs/core/xorg-server/xorg-server.install b/abs/core/xorg-server/xorg-server.install new file mode 100644 index 0000000..46bf5a9 --- /dev/null +++ b/abs/core/xorg-server/xorg-server.install @@ -0,0 +1,18 @@ +post_upgrade() { + if (( $(vercmp $2 1.16.0-3) < 0 )); then + post_install + fi +} + +post_install() { + cat <>> xorg-server has now the ability to run without root rights with + the help of systemd-logind. xserver will fail to run if not launched + from the same virtual terminal as was used to log in. + Without root rights, log files will be in ~/.local/share/xorg/ directory. + + Old behavior can be restored through Xorg.wrap config file. + See Xorg.wrap man page (man xorg.wrap). +MSG +} + -- cgit v0.12 From 70f4a98d4a0f7c7f066082872227281a5225d891 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 23 Jun 2015 19:49:00 +0000 Subject: xf86-input-joystick: update to 1.6.2 --- abs/core/xf86-input-joystick/PKGBUILD | 23 +- abs/core/xf86-input-joystick/git-fixes.patch | 399 --------------------------- 2 files changed, 10 insertions(+), 412 deletions(-) delete mode 100644 abs/core/xf86-input-joystick/git-fixes.patch diff --git a/abs/core/xf86-input-joystick/PKGBUILD b/abs/core/xf86-input-joystick/PKGBUILD index ae65594..45de7fa 100644 --- a/abs/core/xf86-input-joystick/PKGBUILD +++ b/abs/core/xf86-input-joystick/PKGBUILD @@ -1,38 +1,35 @@ -# $Id: PKGBUILD 168557 2012-10-13 11:43:35Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot pkgname=xf86-input-joystick -pkgver=1.6.1 -pkgrel=2 +pkgver=1.6.2 +pkgrel=5 pkgdesc="X.Org Joystick input driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=21.1' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.16' 'X-ABI-XINPUT_VERSION<21' 'X-ABI-XINPUT_VERSION>=22') groups=('xorg-drivers' 'xorg') -options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - #git-fixes.patch 50-joystick.conf) -sha1sums=('0712652ec6cdb2fca6ad888548b232a4de9cf580' +sha1sums=('61658b8d829fdaed6064c7c26232c3884d359187' 'e1ff3699a0470c6bb78a53f718df9d8521621e11') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - #patch -Np1 -i "${srcdir}/git-fixes.patch" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" - install -m644 "${srcdir}/50-joystick.conf" "${pkgdir}/etc/X11/xorg.conf.d/" + install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d" + install -m644 "${srcdir}/50-joystick.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/" install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/abs/core/xf86-input-joystick/git-fixes.patch b/abs/core/xf86-input-joystick/git-fixes.patch deleted file mode 100644 index b3afa06..0000000 --- a/abs/core/xf86-input-joystick/git-fixes.patch +++ /dev/null @@ -1,399 +0,0 @@ -From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001 -From: Terry Lambert -Date: Sat, 16 Jul 2011 00:23:22 +0000 -Subject: Return proper default for unknown values in pInfo->device_control. - -Signed-off-by: Terry Lambert -Reviewed-by: Stephane Marchesin -Signed-off-by: Peter Hutterer ---- -diff --git a/src/jstk.c b/src/jstk.c -index ec6b79a..6db0e7c 100644 ---- a/src/jstk.c -+++ b/src/jstk.c -@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - - default: - ErrorF("unsupported mode=%d\n", what); -- return !Success; -- break; -+ return BadValue; - } /* switch (what) */ - return Success; - } -diff --git a/src/jstk_key.c b/src/jstk_key.c -index 3c471ce..d699dcd 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr dev, - DBG(2, ErrorF("jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n")); - dev->public.on = FALSE; - break; -+ default: -+ return BadValue; - } - - return Success; --- -cgit v0.9.0.2-2-gbebe -From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001 -From: Devin J. Pohly -Date: Sat, 03 Sep 2011 23:00:07 +0000 -Subject: unify capitalization of joystick properties - -the axis keys high/low properties were inconsistently capitalized, -leading to potential confusion as to why one works but not the other. - -Signed-off-by: Devin J. Pohly -Signed-off-by: Peter Hutterer ---- -diff --git a/include/joystick-properties.h b/include/joystick-properties.h -index 49ef800..36f4082 100644 ---- a/include/joystick-properties.h -+++ b/include/joystick-properties.h -@@ -99,7 +99,7 @@ typedef enum _JSTK_MAPPING { - - /** Scancodes for axis in high position */ - /* 8 bit, 4 per axis */ --#define JSTK_PROP_AXIS_KEYS_HIGH "Axis keys (high)" -+#define JSTK_PROP_AXIS_KEYS_HIGH "Axis Keys (high)" - - /** Set the mapping of each button to - none, x, y, zx, zy, button, key, speed_multiply, --- -cgit v0.9.0.2-2-gbebe -From b607c4ebeea4122694f02ba87f06e4cdb23114f1 Mon Sep 17 00:00:00 2001 -From: Sascha Hlusiak -Date: Sat, 15 Oct 2011 22:47:52 +0000 -Subject: label buttons and axes - -Buttons are labeled "Button %d", starting with 0 and representing the button in X _after_ mapping. -Mapping can be changed while running so the labels will be constant. - -Axes are labeled "Axis %d", starting with 1, representing the _physical_ axis that reports the valuator -data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled "Rel X" -and "Rel Y", representing the aggregated post-calculation data from all axes. - -Signed-off-by: Sascha Hlusiak ---- -diff --git a/man/joystick.man b/man/joystick.man -index da92ceb..b401de5 100644 ---- a/man/joystick.man -+++ b/man/joystick.man -@@ -140,7 +140,11 @@ Neither - .B mode - nor - .B axis --needs to be set to generate extra valuator events. -+needs to be set to generate extra valuator events. The axis will be labelled according to it's physical axis number, beginning with -+.I 1 -+, i.e. -+.I \*qAxis 1\*q -+for the first axis (being the 3rd valuator). - Default: not set. - .TP 7 - .BI "\*qaxis="[] \*q -@@ -318,6 +322,28 @@ and the second and fourth axis to the arrow keys - The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis. - The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings. - -+.SH "XI2 Events" -+If you only care about raw events instead of using the joystick as a mouse replacement, don't forget to unmap and add valuators to all axes and map the remaining buttons: -+ -+.nf -+.BI " Option \*qMapAxis1\*q \*q" "mode=none valuator" \*q -+.BI " Option \*qMapAxis2\*q \*q" "mode=none valuator" \*q -+.BI " Option \*qMapAxis3\*q \*q" "mode=none valuator" \*q -+.BI " Option \*qMapAxis4\*q \*q" "mode=none valuator" \*q -+\ \ ... -+.BI " Option \*qMapButton1\*q \*q" "button=1" \*q -+.BI " Option \*qMapButton2\*q \*q" "button=2" \*q -+.BI " Option \*qMapButton3\*q \*q" "button=3" \*q -+.BI " Option \*qMapButton4\*q \*q" "button=4" \*q -+.BI " Option \*qMapButton5\*q \*q" "button=5" \*q -+\ \ ... -+.fi -+ -+You might also want to set the device "floating" to stop it from reporting core events: -+.nf -+.BI " Option \*qFloating\*q \*q" "true" \*q -+.fi -+ - .SH "NOTES" - Configuration through - .I InputClass -diff --git a/src/jstk.c b/src/jstk.c -index 6db0e7c..772683f 100644 ---- a/src/jstk.c -+++ b/src/jstk.c -@@ -1,5 +1,5 @@ - /* -- * Copyright 2007-2009 by Sascha Hlusiak. -+ * Copyright 2007-2011 by Sascha Hlusiak. - * Copyright 1995-1999 by Frederic Lepied, France. - * - * Permission to use, copy, modify, distribute, and sell this software and its -@@ -21,7 +21,6 @@ - * PERFORMANCE OF THIS SOFTWARE. - */ - -- - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif -@@ -300,6 +299,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - switch (what) { - case DEVICE_INIT: { - int m; -+ char str[32]; - CARD8 buttonmap[BUTTONMAP_SIZE+1]; - DBG(1, ErrorF("jstkDeviceControlProc what=INIT\n")); - /* Probe device and return if error */ -@@ -312,11 +312,14 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - } - - for (m=0; m<=BUTTONMAP_SIZE; m++) { -+ sprintf(str, "Button %d", m); -+ - buttonmap[m] = m; -- } -+ btn_labels[m] = MakeAtom(str, strlen(str), TRUE); -+ } -+ -+ - -- -- - if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE, - btn_labels, - buttonmap) == FALSE) { -@@ -331,7 +334,9 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, - if (priv->axis[i].valuator != -1) - { - DBG(3, ErrorF("Axis %d will be valuator %d\n", i, m)); -+ sprintf(str, "Axis %d", i + 1); - priv->axis[i].valuator = m++; -+ axes_labels[i] = MakeAtom(str, strlen(str), TRUE); - } - - if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels, -@@ -719,7 +724,6 @@ static XF86ModuleVersionInfo jstkVersionRec = - /* a tool */ - }; - -- - /* - *************************************************************************** - * -@@ -732,3 +736,6 @@ _X_EXPORT XF86ModuleData joystickModuleData = { - jstkDriverPlug, - jstkDriverUnplug - }; -+ -+/* vim: set filetype=c.doxygen ts=4 et: */ -+ --- -cgit v0.9.0.2-2-gbebe -From e0193debf8f5a72b0a06977d5dea3365ad9cafbe Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 31 Oct 2011 04:27:22 +0000 -Subject: Fix option type for option duplication - -xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption -list. - -Signed-off-by: Peter Hutterer -Reviewed-by: Jeremy Huddleston ---- -diff --git a/src/jstk_key.c b/src/jstk_key.c -index d699dcd..e842941 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -253,26 +253,26 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - int rc; - char name[512] = {0}; - InputAttributes *attrs = NULL; -- InputOption *options; - InputOption *iopts = NULL, *tmp; - DeviceIntPtr dev; -+ XF86OptionPtr opts; - - /* duplicate option list, append to name */ -- options = xf86OptionListDuplicate(pInfo->options); -+ opts = xf86OptionListDuplicate(pInfo->options); - strcpy(name, pInfo->name); - strcat(name, " (keys)"); -- options = xf86ReplaceStrOption(options, "Name", name); -- options = xf86ReplaceStrOption(options, "_source", "_driver/joystick"); -+ opts = xf86ReplaceStrOption(opts, "Name", name); -+ opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick"); - -- while(options) -+ while(opts) - { - tmp = calloc(1, sizeof(InputOption)); - -- tmp->key = xf86OptionName(options); -- tmp->value = xf86OptionValue(options); -+ tmp->key = xf86OptionName(opts); -+ tmp->value = xf86OptionValue(opts); - tmp->next = iopts; - iopts = tmp; -- options = xf86NextOption(options); -+ opts = xf86NextOption(opts); - } - - /* duplicate attribute list */ --- -cgit v0.9.0.2-2-gbebe -From 7ccf3a75292d71104c976bf6afb389cccaac1a7d Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 31 Oct 2011 04:33:08 +0000 -Subject: Deal with opaque input option types. - -ABI 14 made the InputOption type opaque, move the existing code to ifdefs -and use the new function calls otherwise. - -Signed-off-by: Peter Hutterer -Reviewed-by: Jeremy Huddleston -Reviewed-by: Chase Douglas ---- -diff --git a/src/jstk_key.c b/src/jstk_key.c -index e842941..a71275a 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -247,13 +247,46 @@ int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - return Success; - } - -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14 -+static InputOption* -+input_option_new(InputOption* list, char *key, char *value) -+{ -+ InputOption *tmp; -+ -+ tmp = calloc(1, sizeof(*tmp)); -+ tmp->key = key; -+ tmp->value = value; -+ tmp->next = list; -+ -+ return tmp; -+} -+ -+static void -+input_option_free_list(InputOption **list) -+{ -+ InputOption *iopts = *list; -+ -+ while(iopts) -+ { -+ InputOption *tmp = iopts->next; -+ free(iopts->key); -+ free(iopts->value); -+ free(iopts); -+ iopts = tmp; -+ } -+ -+ *list = NULL; -+} -+ -+#endif -+ - InputInfoPtr - jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - { - int rc; - char name[512] = {0}; - InputAttributes *attrs = NULL; -- InputOption *iopts = NULL, *tmp; -+ InputOption *iopts = NULL; - DeviceIntPtr dev; - XF86OptionPtr opts; - -@@ -266,12 +299,9 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - - while(opts) - { -- tmp = calloc(1, sizeof(InputOption)); -- -- tmp->key = xf86OptionName(opts); -- tmp->value = xf86OptionValue(opts); -- tmp->next = iopts; -- iopts = tmp; -+ iopts = input_option_new(iopts, -+ xf86OptionName(opts), -+ xf86OptionValue(opts)); - opts = xf86NextOption(opts); - } - -@@ -280,14 +310,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - - rc = NewInputDeviceRequest(iopts, attrs, &dev); - -- while(iopts) -- { -- tmp = iopts->next; -- free(iopts->key); -- free(iopts->value); -- free(iopts); -- iopts = tmp; -- } -+ input_option_free_list(&iopts); - - FreeInputAttributes(attrs); - --- -cgit v0.9.0.2-2-gbebe -From 411c1838456c055d3f911c54ed58bb11a6bf0da3 Mon Sep 17 00:00:00 2001 -From: Sascha Hlusiak -Date: Sun, 13 Nov 2011 17:04:25 +0000 -Subject: man: valuators are not added automatically - ---- -diff --git a/man/joystick.man b/man/joystick.man -index b401de5..9f38ceb 100644 ---- a/man/joystick.man -+++ b/man/joystick.man -@@ -129,9 +129,6 @@ can be one of: - - .B none, relative, accelerated, absolute - --Every axis which's mode is not --.B none --will be reported as an additional valuator. - .TP 7 - .B \*qvaluator\*q - Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). The range of the valuators is always --- -cgit v0.9.0.2-2-gbebe -From b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f Mon Sep 17 00:00:00 2001 -From: Sascha Hlusiak -Date: Sun, 13 Nov 2011 19:36:07 +0000 -Subject: Copy pInfo->driver to option list to fix hotplugging of keyboard device - -udev does copy the Driver line to the list of options, but when manually -specifying the driver in xorg.conf, the option "Driver" is unset. Because we -do hotplug a sub-device from within the core device, we need the "Driver" -option to be present in the list. - -This should fix archlinux bug #23577: - https://bugs.archlinux.org/task/23577 - -Thanks to Malek for coming up with a fix. - -Signed-off-by: Sascha Hlusiak ---- -diff --git a/src/jstk_key.c b/src/jstk_key.c -index a71275a..241b15d 100644 ---- a/src/jstk_key.c -+++ b/src/jstk_key.c -@@ -296,6 +296,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) - strcat(name, " (keys)"); - opts = xf86ReplaceStrOption(opts, "Name", name); - opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick"); -+ opts = xf86AddNewOption(opts, "Driver", pInfo->driver); - - while(opts) - { --- -cgit v0.9.0.2-2-gbebe -- cgit v0.12 From 41ade5f08a4edf82ef1a9b5a3d155f6c37f64b6a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 23 Jun 2015 19:51:06 +0000 Subject: xf86-input-keyboard: update to 1.8.1 --- abs/core/xf86-input-keyboard/PKGBUILD | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/abs/core/xf86-input-keyboard/PKGBUILD b/abs/core/xf86-input-keyboard/PKGBUILD index c8f67c5..612fd5a 100644 --- a/abs/core/xf86-input-keyboard/PKGBUILD +++ b/abs/core/xf86-input-keyboard/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 168558 2012-10-13 11:43:39Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot pkgname=xf86-input-keyboard -pkgver=1.6.2 -pkgrel=2 +pkgver=1.8.1 +pkgrel=1 pkgdesc="X.Org keyboard input driver" arch=(i686 x86_64) license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=('!libtool') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=21.1' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.16' 'X-ABI-XINPUT_VERSION<21' 'X-ABI-XINPUT_VERSION>=22') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('76651a84f5031f7c6ecf075d55989c04a00689642579df6d1a1bee6d5c2e5f8a') - +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}) +sha256sums=('1ac8ff39bf9da7d2fc7fd6c24515726e8138340c0518ab8c606e008cf93ca211' + 'SKIP') +validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -- cgit v0.12 From 179f468f0ae5bb6edf8b750cdc092170c6f6e238 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 24 Jun 2015 13:48:15 +0000 Subject: xf86-input-mouse: update 1.9.1 --- abs/core/xf86-input-mouse/PKGBUILD | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/abs/core/xf86-input-mouse/PKGBUILD b/abs/core/xf86-input-mouse/PKGBUILD index 15b0f2c..ac91903 100644 --- a/abs/core/xf86-input-mouse/PKGBUILD +++ b/abs/core/xf86-input-mouse/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 168559 2012-10-13 11:43:43Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot pkgname=xf86-input-mouse -pkgver=1.8.1 -pkgrel=2 +pkgver=1.9.1 +pkgrel=1 pkgdesc="X.org mouse input driver" arch=(i686 x86_64) license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') -options=('!libtool') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=21.1' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.16' 'X-ABI-XINPUT_VERSION<21' 'X-ABI-XINPUT_VERSION>=22') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('f5b97aac9aab8fa8b933e960631441ae23b18681c8bf3d5007c00da838f9c9c8') +sha256sums=('3485d375779c08406f0789feedde15933dc703158a086ddac638598f479fc5ce') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -- cgit v0.12 From 98a093f6f165f60448df060c86d8f118b41f63cb Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 24 Jun 2015 19:09:30 +0000 Subject: xf86-input-void: update to 1.4.1 --- abs/core/xf86-input-void/PKGBUILD | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/abs/core/xf86-input-void/PKGBUILD b/abs/core/xf86-input-void/PKGBUILD index 5dd81a5..6396c5f 100644 --- a/abs/core/xf86-input-void/PKGBUILD +++ b/abs/core/xf86-input-void/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 168562 2012-10-13 11:43:57Z andyrtr $ +# $Id$ #Maintainer: Jan de Groot pkgname=xf86-input-void -pkgver=1.4.0 -pkgrel=4 +pkgver=1.4.1 +pkgrel=1 pkgdesc="X.org void input driver" arch=(i686 x86_64) license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=21.1' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.16' 'X-ABI-XINPUT_VERSION<21' 'X-ABI-XINPUT_VERSION>=22') groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}) +sha256sums=('f96e4f0a622821bf43a74bd419f2a18423343996c9d243c7e1430ba2d142339c' + 'SKIP') +validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install -- cgit v0.12 From 475a23548f0d6379c8c7f6f692a4f69c51b6dc7b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 24 Jun 2015 19:12:36 +0000 Subject: xf86-video-ati: update to 1.7.5 --- abs/core/xf86-video-ati/PKGBUILD | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/abs/core/xf86-video-ati/PKGBUILD b/abs/core/xf86-video-ati/PKGBUILD index 40f66e5..83835b6 100644 --- a/abs/core/xf86-video-ati/PKGBUILD +++ b/abs/core/xf86-video-ati/PKGBUILD @@ -1,31 +1,33 @@ -# $Id: PKGBUILD 170785 2012-11-11 10:23:19Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=xf86-video-ati -pkgver=7.0.0 +pkgver=7.5.0 epoch=1 -pkgrel=1 +pkgrel=2 pkgdesc="X.org ati video driver" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') -depends=('libdrm>=2.4.40' 'systemd-tools' 'ati-dri') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') +depends=('libdrm>=2.4.58' 'systemd' 'mesa-dri') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19') +conflicts=('xorg-server<1.16.0' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20') groups=('xorg-drivers' 'xorg') -options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('c0acc81386425651aae5dfe02d89f935bb63b2a62104da0d88deac3c773ea10e') +sha256sums=('ec3e6f06b6cf9a40c72aafa3448aae8b034c80b37410ca9442d5cf6806e07936') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr + cd ${pkgname}-${pkgver} + + ./configure --prefix=/usr \ + --enable-glamor make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} + make "DESTDIR=${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -- cgit v0.12 From 771eb0cb5590ee1ddc9291b14c46b86031cbd95b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 24 Jun 2015 19:18:49 +0000 Subject: xf86-video-intel: 2.99.917 --- abs/core/xf86-video-intel/PKGBUILD | 49 ++++++++++++++++------ abs/core/xf86-video-intel/xf86-video-intel.install | 22 +++++++--- 2 files changed, 54 insertions(+), 17 deletions(-) diff --git a/abs/core/xf86-video-intel/PKGBUILD b/abs/core/xf86-video-intel/PKGBUILD index 1eaeb94..8a5e734 100644 --- a/abs/core/xf86-video-intel/PKGBUILD +++ b/abs/core/xf86-video-intel/PKGBUILD @@ -1,36 +1,61 @@ -# $Id: PKGBUILD 172074 2012-11-27 15:58:51Z andyrtr $ +# $Id$ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=xf86-video-intel -pkgver=2.20.14 +pkgver=2.99.917+364+gb24e758 pkgrel=1 +epoch=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') install=$pkgname.install pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" -depends=('intel-dri' 'libxvmc' 'xcb-util>=0.3.9' 'systemd') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender') +depends=('mesa-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19' 'libx11' 'libxrender' + # additional deps for intel-virtual-output + 'libxrandr' 'libxinerama' 'libxcursor' 'libxtst' + # additional for git snapshot + 'git') +optdepends=('libxrandr: for intel-virtual-output' + 'libxinerama: for intel-virtual-output' + 'libxcursor: for intel-virtual-output' + 'libxtst: for intel-virtual-output') replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna') provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14' +conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20' 'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy') -options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('f85019afd5ddead6606bf89855d209d5369823a6e96b779fa956e0cc78d3b09b') +#source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) +source=('git://anongit.freedesktop.org/xorg/driver/xf86-video-intel#commit=b24e758') +sha256sums=('SKIP') + +pkgver() { + cd $pkgname + git describe --long | sed 's/-/+/g' +} + +prepare() { + cd $pkgname + NOCONFIGURE=1 ./autogen.sh +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --enable-dri + cd $pkgname + ./configure --prefix=/usr --libexecdir=/usr/lib make } +check() { + cd $pkgname + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/xf86-video-intel/xf86-video-intel.install b/abs/core/xf86-video-intel/xf86-video-intel.install index d523eb6..213f7d4 100644 --- a/abs/core/xf86-video-intel/xf86-video-intel.install +++ b/abs/core/xf86-video-intel/xf86-video-intel.install @@ -1,8 +1,20 @@ +post_upgrade() { + if (( $(vercmp $2 2.21.15) < 0 )); then + post_install + fi +} + post_install() { - echo ">>> This driver now allows to switch" - echo ">>> between sna/uxa acceleration methods." - echo ">>> Add to the device section in /etc/X11/xorg.conf" - echo ">>> Option \"AccelMethod\" \"sna\"" - echo ">>> use uxa method if you run into trouble with sna." + cat <>> This driver uses SNA as the default acceleration method. You can try + falling back to UXA if you run into trouble. To do so, save a file with + the following content as /etc/X11/xorg.conf.d/20-intel.conf : + Section "Device" + Identifier "Intel Graphics" + Driver "intel" + Option "AccelMethod" "uxa" + #Option "AccelMethod" "sna" + EndSection +MSG } -- cgit v0.12 From a766892a33b5ff0bed2b78a1b55cb38aa8a254d3 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 24 Jun 2015 19:20:46 +0000 Subject: xf86-video-vesa: update to 2.3.4 --- abs/core/xf86-video-vesa/PKGBUILD | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/abs/core/xf86-video-vesa/PKGBUILD b/abs/core/xf86-video-vesa/PKGBUILD index af85057..758c199 100644 --- a/abs/core/xf86-video-vesa/PKGBUILD +++ b/abs/core/xf86-video-vesa/PKGBUILD @@ -1,32 +1,37 @@ -# $Id: PKGBUILD 168594 2012-10-13 11:46:21Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot pkgname=xf86-video-vesa -pkgver=2.3.2 -pkgrel=3 +pkgver=2.3.4 +pkgrel=1 pkgdesc="X.org vesa video driver" arch=(i686 x86_64) license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19') +conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20') groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig} revert-kernelcheck.patch) -sha256sums=('144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3' +sha256sums=('7bddf4d879dd6f67088ecb203a31e12334aab980174bd0909930a21f32e251c1' + 'SKIP' 'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c') +validpgpkeys=('DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') # "Adam Jackson " -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch" +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -- cgit v0.12 From e66ceaf99ae065a7ef83c749b3af105b2d57d958 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 24 Jun 2015 19:24:26 +0000 Subject: xf86-video-vmware: update to 13.1.0 --- abs/core/xf86-video-vmware/PKGBUILD | 26 +- .../xf86-video-vmware/xatracker-v2-fixes.patch | 1583 -------------------- 2 files changed, 10 insertions(+), 1599 deletions(-) delete mode 100644 abs/core/xf86-video-vmware/xatracker-v2-fixes.patch diff --git a/abs/core/xf86-video-vmware/PKGBUILD b/abs/core/xf86-video-vmware/PKGBUILD index 488d62a..df76b97 100644 --- a/abs/core/xf86-video-vmware/PKGBUILD +++ b/abs/core/xf86-video-vmware/PKGBUILD @@ -1,28 +1,22 @@ -# $Id: PKGBUILD 202951 2013-12-29 08:00:15Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot pkgname=xf86-video-vmware -pkgver=13.0.1 -pkgrel=3 +pkgver=13.1.0 +pkgrel=2 pkgdesc="X.org vmware video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') -depends=('libdrm' 'svga-dri' 'mesa>=10.0') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') +depends=('libdrm' 'mesa>=10.0') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19') +conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20') groups=('xorg-drivers' 'xorg') options=('!emptydirs') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - xatracker-v2-fixes.patch) -sha256sums=('802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d' - '7ab392cbc6258dc36df14ef60072c655d850bcfb6885111b41bcfe25dc1faacc') - -prepare() { - cd ${pkgname}-${pkgver} - # grab from upstream git repo, needed for mesa>10.0 - patch -Np1 -i ../xatracker-v2-fixes.patch -} +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}) +sha256sums=('3c1d244e4b1b77e92126957965cdc9fb82de4c215c0706a3a8aaff6939e4a0cc' + 'SKIP') +validpgpkeys=('90D027AEAF33CBABC140735BC1F5D3CDF5176580') # Thomas Hellstrom (VMware) build() { cd ${pkgname}-${pkgver} diff --git a/abs/core/xf86-video-vmware/xatracker-v2-fixes.patch b/abs/core/xf86-video-vmware/xatracker-v2-fixes.patch deleted file mode 100644 index 9b8ed54..0000000 --- a/abs/core/xf86-video-vmware/xatracker-v2-fixes.patch +++ /dev/null @@ -1,1583 +0,0 @@ -From 0945bea5fc32eacb7bf42639efbd45dcd43e7ab5 Mon Sep 17 00:00:00 2001 -From: Rob Clark -Date: Mon, 10 Jun 2013 13:31:31 -0400 -Subject: [PATCH 01/11] vmwgfx: update for XA API changes - -Signed-off-by: Rob Clark -Signed-off-by: Jakob Bornecrantz -Reviewed-by: Jakob Bornecrantz -Tested-by: Jakob Bornecrantz ---- - configure.ac | 2 +- - vmwgfx/vmwgfx_dri2.c | 5 +++-- - vmwgfx/vmwgfx_driver.c | 3 ++- - vmwgfx/vmwgfx_saa.c | 20 ++++++++++++++------ - vmwgfx/vmwgfx_tex_video.c | 5 +++-- - 5 files changed, 23 insertions(+), 12 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0631bcc..dccfb27 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -118,7 +118,7 @@ if test x$BUILD_VMWGFX = xyes; then - PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no]) - fi - if test x$BUILD_VMWGFX = xyes; then -- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],[],[BUILD_VMWGFX=no]) -+ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 2.0.0],[],[BUILD_VMWGFX=no]) - fi - - DRIVER_NAME=vmware -diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c -index 7de0772..2f007f0 100644 ---- a/vmwgfx/vmwgfx_dri2.c -+++ b/vmwgfx/vmwgfx_dri2.c -@@ -201,7 +201,8 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for - } - - private->srf = srf; -- if (xa_surface_handle(srf, &buffer->name, &buffer->pitch) != 0) -+ if (xa_surface_handle(srf, xa_handle_type_shared, -+ &buffer->name, &buffer->pitch) != 0) - return FALSE; - - buffer->cpp = xa_format_depth(xa_surface_format(srf)) / 8; -@@ -222,7 +223,7 @@ dri2_do_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer) - struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(private->pPixmap); - - if (--private->refcount == 0 && srf) { -- xa_surface_destroy(srf); -+ xa_surface_unref(srf); - } - - /* -diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c -index 7863ba2..3002285 100644 ---- a/vmwgfx/vmwgfx_driver.c -+++ b/vmwgfx/vmwgfx_driver.c -@@ -617,7 +617,8 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd, - return FALSE; - } - -- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0) { -+ if (xa_surface_handle(vpix->hw, xa_handle_type_shared, -+ &handle, &dummy) != 0) { - LogMessage(X_ERROR, "Could not get present surface handle.\n"); - return FALSE; - } -diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c -index 63df3a1..ed3c1ee 100644 ---- a/vmwgfx/vmwgfx_saa.c -+++ b/vmwgfx/vmwgfx_saa.c -@@ -140,7 +140,7 @@ vmwgfx_pixmap_free_storage(struct vmwgfx_saa_pixmap *vpix) - vpix->malloc = NULL; - } - if (!(vpix->backing & VMWGFX_PIX_SURFACE) && vpix->hw) { -- xa_surface_destroy(vpix->hw); -+ xa_surface_unref(vpix->hw); - vpix->hw = NULL; - } - if (!(vpix->backing & VMWGFX_PIX_GMR) && vpix->gmr) { -@@ -286,7 +286,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa, - if (vpix->gmr && vsaa->can_optimize_dma) { - uint32_t handle, dummy; - -- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0) -+ if (xa_surface_handle(vpix->hw, xa_handle_type_shared, -+ &handle, &dummy) != 0) - goto out_err; - if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle, - to_hw) != 0) -@@ -305,6 +306,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa, - (int) to_hw, - (struct xa_box *) REGION_RECTS(reg), - REGION_NUM_RECTS(reg)); -+ if (to_hw) -+ xa_context_flush(vsaa->xa_ctx); - if (vpix->gmr) - vmwgfx_dmabuf_unmap(vpix->gmr); - if (ret) -@@ -441,7 +444,7 @@ vmwgfx_hw_kill(struct vmwgfx_saa *vsaa, - &spix->dirty_hw)) - return FALSE; - -- xa_surface_destroy(vpix->hw); -+ xa_surface_unref(vpix->hw); - vpix->hw = NULL; - - /* -@@ -683,7 +686,8 @@ vmwgfx_present_prepare(struct vmwgfx_saa *vsaa, - - (void) pScreen; - if (src_vpix == dst_vpix || !src_vpix->hw || -- xa_surface_handle(src_vpix->hw, &vsaa->src_handle, &dummy) != 0) -+ xa_surface_handle(src_vpix->hw, xa_handle_type_shared, -+ &vsaa->src_handle, &dummy) != 0) - return FALSE; - - REGION_NULL(pScreen, &vsaa->present_region); -@@ -784,7 +788,7 @@ vmwgfx_create_hw(struct vmwgfx_saa *vsaa, - return TRUE; - - out_no_damage: -- xa_surface_destroy(hw); -+ xa_surface_unref(hw); - return FALSE; - } - -@@ -929,6 +933,7 @@ vmwgfx_copy_prepare(struct saa_driver *driver, - - if (!vmwgfx_hw_validate(src_pixmap, src_reg)) { - xa_copy_done(vsaa->xa_ctx); -+ xa_context_flush(vsaa->xa_ctx); - return FALSE; - } - -@@ -1029,6 +1034,7 @@ vmwgfx_copy_done(struct saa_driver *driver) - return; - } - xa_copy_done(vsaa->xa_ctx); -+ xa_context_flush(vsaa->xa_ctx); - } - - static Bool -@@ -1175,6 +1181,7 @@ vmwgfx_composite_done(struct saa_driver *driver) - struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver); - - xa_composite_done(vsaa->xa_ctx); -+ xa_context_flush(vsaa->xa_ctx); - } - - static void -@@ -1436,7 +1443,8 @@ vmwgfx_scanout_ref(struct vmwgfx_screen_entry *entry) - */ - if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT, 0, NULL)) - goto out_err; -- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0) -+ if (xa_surface_handle(vpix->hw, xa_handle_type_shared, -+ &handle, &dummy) != 0) - goto out_err; - depth = xa_format_depth(xa_surface_format(vpix->hw)); - -diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c -index 449266b..2971ed7 100644 ---- a/vmwgfx/vmwgfx_tex_video.c -+++ b/vmwgfx/vmwgfx_tex_video.c -@@ -199,7 +199,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown) - - for (i=0; i<3; ++i) { - if (priv->yuv[i]) { -- xa_surface_destroy(priv->yuv[i]); -+ xa_surface_unref(priv->yuv[i]); - priv->yuv[i] = NULL; - } - for (j=0; j<2; ++j) { -@@ -539,7 +539,8 @@ copy_packed_data(ScrnInfoPtr pScrn, - REGION_RESET(pScrn->pScreen, ®, &box); - } - -- if (xa_surface_handle(srf, &handle, &stride) != 0) { -+ if (xa_surface_handle(srf, xa_handle_type_shared, -+ &handle, &stride) != 0) { - ret = BadAlloc; - break; - } --- -1.8.5.1 - - -From 835ce4698f916ba080f4132988fd4caf898e0b1e Mon Sep 17 00:00:00 2001 -From: Thomas Hellstrom -Date: Thu, 26 Sep 2013 01:25:33 -0700 -Subject: [PATCH 02/11] vmwgfx: Avoid HW operations when not master - -Note that for DRI2, a dri2_copy_region becomes a NOP when not master. -Additionally, all dri2 operations that lead to a potential kernel -access will return FALSE. - -Signed-off-by: Thomas Hellstrom -Reviewed-by: Jakob Bornecrantz ---- - vmwgfx/vmwgfx_dri2.c | 13 +++++++++++++ - vmwgfx/vmwgfx_driver.c | 3 +++ - vmwgfx/vmwgfx_saa.c | 44 +++++++++++++++++++++++++++++++++++++++++++- - vmwgfx/vmwgfx_saa.h | 8 ++++++++ - vmwgfx/vmwgfx_saa_priv.h | 2 ++ - vmwgfx/vmwgfx_xa_surface.c | 6 ++++++ - 6 files changed, 75 insertions(+), 1 deletion(-) - -diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c -index 2f007f0..57f2d9d 100644 ---- a/vmwgfx/vmwgfx_dri2.c -+++ b/vmwgfx/vmwgfx_dri2.c -@@ -138,6 +138,8 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for - return TRUE; - case DRI2BufferStencil: - case DRI2BufferDepthStencil: -+ if (!pScrn->vtSema) -+ return FALSE; - - depth = (format) ? vmwgfx_zs_format_to_depth(format) : 32; - -@@ -155,6 +157,9 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for - - break; - case DRI2BufferDepth: -+ if (!pScrn->vtSema) -+ return FALSE; -+ - depth = (format) ? vmwgfx_z_format_to_depth(format) : - pDraw->bitsPerPixel; - -@@ -291,6 +296,14 @@ dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion, - DrawablePtr dst_draw; - RegionPtr myClip; - GCPtr gc; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); -+ -+ /* -+ * This is a fragile protection against HW operations when not master. -+ * Needs to be blocked higher up in the dri2 code. -+ */ -+ if (!pScrn->vtSema) -+ return; - - /* - * In driCreateBuffers we dewrap windows into the -diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c -index 3002285..eeaea4b 100644 ---- a/vmwgfx/vmwgfx_driver.c -+++ b/vmwgfx/vmwgfx_driver.c -@@ -1116,6 +1116,7 @@ drv_leave_vt(VT_FUNC_ARGS_DECL) - - vmwgfx_cursor_bypass(ms->fd, 0, 0); - vmwgfx_disable_scanout(pScrn); -+ vmwgfx_saa_drop_master(pScrn->pScreen); - - if (drmDropMaster(ms->fd)) - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -@@ -1136,6 +1137,8 @@ drv_enter_vt(VT_FUNC_ARGS_DECL) - if (!drv_set_master(pScrn)) - return FALSE; - -+ vmwgfx_saa_set_master(pScrn->pScreen); -+ - if (!xf86SetDesiredModes(pScrn)) - return FALSE; - -diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c -index ed3c1ee..5534ca3 100644 ---- a/vmwgfx/vmwgfx_saa.c -+++ b/vmwgfx/vmwgfx_saa.c -@@ -423,6 +423,7 @@ vmwgfx_create_pixmap(struct saa_driver *driver, struct saa_pixmap *spix, - - WSBMINITLISTHEAD(&vpix->sync_x_head); - WSBMINITLISTHEAD(&vpix->scanout_list); -+ WSBMINITLISTHEAD(&vpix->pixmap_list); - - return TRUE; - } -@@ -499,6 +500,7 @@ vmwgfx_destroy_pixmap(struct saa_driver *driver, PixmapPtr pixmap) - */ - - vmwgfx_pixmap_remove_present(vpix); -+ WSBMLISTDELINIT(&vpix->pixmap_list); - WSBMLISTDELINIT(&vpix->sync_x_head); - - if (vpix->hw_is_dri2_fronts) -@@ -627,6 +629,8 @@ vmwgfx_modify_pixmap_header (PixmapPtr pixmap, int w, int h, int depth, - int bpp, int devkind, void *pixdata) - { - struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(pixmap); -+ ScreenPtr pScreen = pixmap->drawable.pScreen; -+ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(saa_get_driver(pScreen)); - unsigned int old_height; - unsigned int old_width; - unsigned int old_pitch; -@@ -670,6 +674,8 @@ vmwgfx_modify_pixmap_header (PixmapPtr pixmap, int w, int h, int depth, - - vmwgfx_pix_resize(pixmap, old_pitch, old_height, old_width); - vmwgfx_pixmap_free_storage(vpix); -+ WSBMLISTADDTAIL(&vpix->pixmap_list, &vsaa->pixmaps); -+ - return TRUE; - - out_no_modify: -@@ -860,7 +866,7 @@ vmwgfx_copy_prepare(struct saa_driver *driver, - Bool has_valid_hw; - - if (!vsaa->xat || !SAA_PM_IS_SOLID(&dst_pixmap->drawable, plane_mask) || -- alu != GXcopy) -+ alu != GXcopy || !vsaa->is_master) - return FALSE; - - src_vpix = vmwgfx_saa_pixmap(src_pixmap); -@@ -1057,6 +1063,9 @@ vmwgfx_composite_prepare(struct saa_driver *driver, CARD8 op, - RegionRec empty; - struct xa_composite *xa_comp; - -+ if (!vsaa->is_master) -+ return FALSE; -+ - REGION_NULL(pScreen, &empty); - - /* -@@ -1367,7 +1376,9 @@ vmwgfx_saa_init(ScreenPtr pScreen, int drm_fd, struct xa_tracker *xat, - vsaa->use_present_opt = direct_presents; - vsaa->only_hw_presents = only_hw_presents; - vsaa->rendercheck = rendercheck; -+ vsaa->is_master = TRUE; - WSBMINITLISTHEAD(&vsaa->sync_x_list); -+ WSBMINITLISTHEAD(&vsaa->pixmaps); - - vsaa->driver = vmwgfx_saa_driver; - vsaa->vcomp = vmwgfx_alloc_composite(); -@@ -1518,3 +1529,34 @@ vmwgfx_scanout_unref(struct vmwgfx_screen_entry *entry) - entry->pixmap = NULL; - pixmap->drawable.pScreen->DestroyPixmap(pixmap); - } -+ -+void -+vmwgfx_saa_set_master(ScreenPtr pScreen) -+{ -+ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(saa_get_driver(pScreen)); -+ -+ vsaa->is_master = TRUE; -+} -+ -+void -+vmwgfx_saa_drop_master(ScreenPtr pScreen) -+{ -+ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(saa_get_driver(pScreen)); -+ struct _WsbmListHead *list; -+ struct vmwgfx_saa_pixmap *vpix; -+ struct saa_pixmap *spix; -+ -+ WSBMLISTFOREACH(list, &vsaa->pixmaps) { -+ vpix = WSBMLISTENTRY(list, struct vmwgfx_saa_pixmap, pixmap_list); -+ spix = &vpix->base; -+ -+ if (!vpix->hw) -+ continue; -+ -+ (void) vmwgfx_download_from_hw(&vsaa->driver, spix->pixmap, -+ &spix->dirty_hw); -+ REGION_EMPTY(draw->pScreen, &spix->dirty_hw); -+ } -+ -+ vsaa->is_master = FALSE; -+} -diff --git a/vmwgfx/vmwgfx_saa.h b/vmwgfx/vmwgfx_saa.h -index bb8ec96..d8aa3d3 100644 ---- a/vmwgfx/vmwgfx_saa.h -+++ b/vmwgfx/vmwgfx_saa.h -@@ -54,6 +54,7 @@ struct vmwgfx_saa_pixmap { - int hw_is_dri2_fronts; - struct _WsbmListHead sync_x_head; - struct _WsbmListHead scanout_list; -+ struct _WsbmListHead pixmap_list; - - uint32_t xa_flags; - uint32_t staging_add_flags; -@@ -107,4 +108,11 @@ Bool - vmwgfx_hw_accel_validate(PixmapPtr pixmap, unsigned int depth, - uint32_t add_flags, uint32_t remove_flags, - RegionPtr region); -+ -+void -+vmwgfx_saa_set_master(ScreenPtr pScreen); -+ -+void -+vmwgfx_saa_drop_master(ScreenPtr pScreen); -+ - #endif -diff --git a/vmwgfx/vmwgfx_saa_priv.h b/vmwgfx/vmwgfx_saa_priv.h -index 5f46dee..16583b0 100644 ---- a/vmwgfx/vmwgfx_saa_priv.h -+++ b/vmwgfx/vmwgfx_saa_priv.h -@@ -54,8 +54,10 @@ struct vmwgfx_saa { - Bool use_present_opt; - Bool only_hw_presents; - Bool rendercheck; -+ Bool is_master; - void (*present_flush) (ScreenPtr pScreen); - struct _WsbmListHead sync_x_list; -+ struct _WsbmListHead pixmaps; - struct vmwgfx_composite *vcomp; - }; - -diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c -index 8b30e45..2f23c57 100644 ---- a/vmwgfx/vmwgfx_xa_surface.c -+++ b/vmwgfx/vmwgfx_xa_surface.c -@@ -362,6 +362,12 @@ vmwgfx_hw_accel_validate(PixmapPtr pixmap, unsigned int depth, - Bool - vmwgfx_hw_dri2_validate(PixmapPtr pixmap, unsigned int depth) - { -+ struct vmwgfx_saa *vsaa = -+ to_vmwgfx_saa(saa_get_driver(pixmap->drawable.pScreen)); -+ -+ if (!vsaa->is_master) -+ return FALSE; -+ - return (vmwgfx_hw_dri2_stage(pixmap, depth) && - vmwgfx_hw_commit(pixmap) && - vmwgfx_hw_validate(pixmap, NULL)); --- -1.8.5.1 - - -From 7192acf9f0bf8e7176ab0b803b861a858623f709 Mon Sep 17 00:00:00 2001 -From: Thomas Hellstrom -Date: Wed, 19 Sep 2012 20:36:57 +0200 -Subject: [PATCH 03/11] vmwgfx: Implement textured video completely on top of - XA. - -Remove device-specific hacks. This may increase resource usage a little -on old hardware revisions, but we don't need separate code paths on -different hardware revisions. - -Signed-off-by: Thomas Hellstrom -Reviewed-by: Zack Rusin ---- - vmwgfx/vmwgfx_tex_video.c | 109 ++++++---------------------------------------- - 1 file changed, 14 insertions(+), 95 deletions(-) - -diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c -index 2971ed7..a0a4f4a 100644 ---- a/vmwgfx/vmwgfx_tex_video.c -+++ b/vmwgfx/vmwgfx_tex_video.c -@@ -111,8 +111,7 @@ struct xorg_xv_port_priv { - int hue; - - int current_set; -- struct vmwgfx_dmabuf *bounce[2][3]; -- struct xa_surface *yuv[3]; -+ struct xa_surface *yuv[2][3]; - - int drm_fd; - -@@ -198,14 +197,10 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown) - priv->fence = NULL; - - for (i=0; i<3; ++i) { -- if (priv->yuv[i]) { -- xa_surface_unref(priv->yuv[i]); -- priv->yuv[i] = NULL; -- } - for (j=0; j<2; ++j) { -- if (priv->bounce[j][i]) { -- vmwgfx_dmabuf_destroy(priv->bounce[j][i]); -- priv->bounce[0][i] = NULL; -+ if (priv->yuv[i]) { -+ xa_surface_unref(priv->yuv[j][i]); -+ priv->yuv[j][i] = NULL; - } - } - } -@@ -297,11 +292,9 @@ static int - check_yuv_surfaces(struct xorg_xv_port_priv *priv, int id, - int width, int height) - { -- struct xa_surface **yuv = priv->yuv; -- struct vmwgfx_dmabuf **bounce = priv->bounce[priv->current_set]; -+ struct xa_surface **yuv = priv->yuv[priv->current_set]; - int ret = 0; - int i; -- size_t size; - - for (i=0; i<3; ++i) { - -@@ -334,19 +327,6 @@ check_yuv_surfaces(struct xorg_xv_port_priv *priv, int id, - if (ret || !yuv[i]) - return BadAlloc; - -- size = width * height; -- -- if (bounce[i] && (bounce[i]->size < size || -- bounce[i]->size > 2*size)) { -- vmwgfx_dmabuf_destroy(bounce[i]); -- bounce[i] = NULL; -- } -- -- if (!bounce[i]) { -- bounce[i] = vmwgfx_dmabuf_alloc(priv->drm_fd, size); -- if (!bounce[i]) -- return BadAlloc; -- } - } - return Success; - } -@@ -413,28 +393,20 @@ copy_packed_data(ScrnInfoPtr pScrn, - unsigned short w, unsigned short h) - { - int i; -- struct vmwgfx_dmabuf **bounce = port->bounce[port->current_set]; -+ struct xa_surface **yuv = port->yuv[port->current_set]; - char *ymap, *vmap, *umap; - unsigned char y1, y2, u, v; - int yidx, uidx, vidx; - int y_array_size = w * h; - int ret = BadAlloc; - -- /* -- * Here, we could use xa_surface_[map|unmap], but given the size of -- * the yuv textures, that could stress the xa tracker dma buffer pool, -- * particularaly with multiple videos rendering simultaneously. -- * -- * Instead, cheat and allocate vmwgfx dma buffers directly. -- */ -- -- ymap = (char *)vmwgfx_dmabuf_map(bounce[0]); -+ ymap = xa_surface_map(port->r, yuv[0], XA_MAP_WRITE); - if (!ymap) - return BadAlloc; -- umap = (char *)vmwgfx_dmabuf_map(bounce[1]); -+ umap = xa_surface_map(port->r, yuv[1], XA_MAP_WRITE); - if (!umap) - goto out_no_umap; -- vmap = (char *)vmwgfx_dmabuf_map(bounce[2]); -+ vmap = xa_surface_map(port->r, yuv[2], XA_MAP_WRITE); - if (!vmap) - goto out_no_vmap; - -@@ -493,65 +465,11 @@ copy_packed_data(ScrnInfoPtr pScrn, - } - - ret = Success; -- vmwgfx_dmabuf_unmap(bounce[2]); -+ xa_surface_unmap(yuv[2]); - out_no_vmap: -- vmwgfx_dmabuf_unmap(bounce[1]); -+ xa_surface_unmap(yuv[1]); - out_no_umap: -- vmwgfx_dmabuf_unmap(bounce[0]); -- -- if (ret == Success) { -- struct xa_surface *srf; -- struct vmwgfx_dmabuf *buf; -- uint32_t handle; -- unsigned int stride; -- BoxRec box; -- RegionRec reg; -- -- box.x1 = 0; -- box.x2 = w; -- box.y1 = 0; -- box.y2 = h; -- -- REGION_INIT(pScrn->pScreen, ®, &box, 1); -- -- for (i=0; i<3; ++i) { -- srf = port->yuv[i]; -- buf = bounce[i]; -- -- if (i == 1) { -- switch(id) { -- case FOURCC_YV12: -- h /= 2; -- /* Fall through */ -- case FOURCC_YUY2: -- case FOURCC_UYVY: -- w /= 2; -- break; -- default: -- break; -- } -- -- box.x1 = 0; -- box.x2 = w; -- box.y1 = 0; -- box.y2 = h; -- -- REGION_RESET(pScrn->pScreen, ®, &box); -- } -- -- if (xa_surface_handle(srf, xa_handle_type_shared, -- &handle, &stride) != 0) { -- ret = BadAlloc; -- break; -- } -- -- if (vmwgfx_dma(0, 0, ®, buf, w, handle, 1) != 0) { -- ret = BadAlloc; -- break; -- } -- } -- REGION_UNINIT(pScrn->pScreen, ®); -- } -+ xa_surface_unmap(yuv[0]); - - return ret; - } -@@ -610,7 +528,8 @@ display_video(ScreenPtr pScreen, struct xorg_xv_port_priv *pPriv, int id, - (struct xa_box *)REGION_RECTS(dstRegion), - REGION_NUM_RECTS(dstRegion), - pPriv->cm, -- vpix->hw, pPriv->yuv); -+ vpix->hw, -+ pPriv->yuv[pPriv->current_set ]); - - saa_pixmap_dirty(pPixmap, TRUE, dstRegion); - DamageRegionProcessPending(&pPixmap->drawable); --- -1.8.5.1 - - -From 45b2457516a9db4bd1d60fbb24a1efbe2d9dd932 Mon Sep 17 00:00:00 2001 -From: Thomas Hellstrom -Date: Wed, 19 Sep 2012 21:50:40 +0200 -Subject: [PATCH 04/11] vmwgfx: Get rid of device-specific DMA code - -It's rarely used and things seem to work well enough on top of XA. - -Signed-off-by: Thomas Hellstrom -Reviewed-by: Zack Rusin ---- - vmwgfx/vmwgfx_drmi.c | 103 ----------------------------------------------- - vmwgfx/vmwgfx_drmi.h | 5 --- - vmwgfx/vmwgfx_saa.c | 53 ++++++++++++------------ - vmwgfx/vmwgfx_saa_priv.h | 1 - - 4 files changed, 26 insertions(+), 136 deletions(-) - -diff --git a/vmwgfx/vmwgfx_drmi.c b/vmwgfx/vmwgfx_drmi.c -index 496a16b..1e23f4a 100644 ---- a/vmwgfx/vmwgfx_drmi.c -+++ b/vmwgfx/vmwgfx_drmi.c -@@ -284,109 +284,6 @@ vmwgfx_dmabuf_destroy(struct vmwgfx_dmabuf *buf) - } - - int --vmwgfx_dma(unsigned int host_x, unsigned int host_y, -- RegionPtr region, struct vmwgfx_dmabuf *buf, -- uint32_t buf_pitch, uint32_t surface_handle, int to_surface) --{ -- BoxPtr clips = REGION_RECTS(region); -- unsigned int num_clips = REGION_NUM_RECTS(region); -- struct drm_vmw_execbuf_arg arg; -- struct drm_vmw_fence_rep rep; -- int ret; -- unsigned int size; -- unsigned i; -- SVGA3dCopyBox *cb; -- SVGA3dCmdSurfaceDMASuffix *suffix; -- SVGA3dCmdSurfaceDMA *body; -- struct vmwgfx_int_dmabuf *ibuf = vmwgfx_int_dmabuf(buf); -- -- struct { -- SVGA3dCmdHeader header; -- SVGA3dCmdSurfaceDMA body; -- SVGA3dCopyBox cb; -- } *cmd; -- -- if (num_clips == 0) -- return 0; -- -- size = sizeof(*cmd) + (num_clips - 1) * sizeof(cmd->cb) + -- sizeof(*suffix); -- cmd = malloc(size); -- if (!cmd) -- return -1; -- -- cmd->header.id = SVGA_3D_CMD_SURFACE_DMA; -- cmd->header.size = sizeof(cmd->body) + num_clips * sizeof(cmd->cb) + -- sizeof(*suffix); -- cb = &cmd->cb; -- -- suffix = (SVGA3dCmdSurfaceDMASuffix *) &cb[num_clips]; -- suffix->suffixSize = sizeof(*suffix); -- suffix->maximumOffset = (uint32_t) -1; -- suffix->flags.discard = 0; -- suffix->flags.unsynchronized = 0; -- suffix->flags.reserved = 0; -- -- body = &cmd->body; -- body->guest.ptr.gmrId = buf->gmr_id; -- body->guest.ptr.offset = buf->gmr_offset; -- body->guest.pitch = buf_pitch; -- body->host.sid = surface_handle; -- body->host.face = 0; -- body->host.mipmap = 0; -- -- body->transfer = (to_surface ? SVGA3D_WRITE_HOST_VRAM : -- SVGA3D_READ_HOST_VRAM); -- -- -- for (i=0; i < num_clips; i++, cb++, clips++) { -- cb->x = (uint16_t) clips->x1 + host_x; -- cb->y = (uint16_t) clips->y1 + host_y; -- cb->z = 0; -- cb->srcx = (uint16_t) clips->x1; -- cb->srcy = (uint16_t) clips->y1; -- cb->srcz = 0; -- cb->w = (uint16_t) (clips->x2 - clips->x1); -- cb->h = (uint16_t) (clips->y2 - clips->y1); -- cb->d = 1; --#if 0 -- LogMessage(X_INFO, "DMA! x: %u y: %u srcx: %u srcy: %u w: %u h: %u %s\n", -- cb->x, cb->y, cb->srcx, cb->srcy, cb->w, cb->h, -- to_surface ? "to" : "from"); --#endif -- -- } -- -- memset(&arg, 0, sizeof(arg)); -- memset(&rep, 0, sizeof(rep)); -- -- rep.error = -EFAULT; -- arg.fence_rep = ((to_surface) ? 0UL : (unsigned long)&rep); -- arg.commands = (unsigned long)cmd; -- arg.command_size = size; -- arg.throttle_us = 0; -- arg.version = DRM_VMW_EXECBUF_VERSION; -- -- ret = drmCommandWrite(ibuf->drm_fd, DRM_VMW_EXECBUF, &arg, sizeof(arg)); -- if (ret) { -- LogMessage(X_ERROR, "DMA error %s.\n", strerror(-ret)); -- } -- -- free(cmd); -- -- if (rep.error == 0) { -- ret = vmwgfx_fence_wait(ibuf->drm_fd, rep.handle, TRUE); -- if (ret) { -- LogMessage(X_ERROR, "DMA from host fence wait error %s.\n", -- strerror(-ret)); -- vmwgfx_fence_unref(ibuf->drm_fd, rep.handle); -- } -- } -- -- return 0; --} -- --int - vmwgfx_get_param(int drm_fd, uint32_t param, uint64_t *out) - { - struct drm_vmw_getparam_arg gp_arg; -diff --git a/vmwgfx/vmwgfx_drmi.h b/vmwgfx/vmwgfx_drmi.h -index 2435009..fff728a 100644 ---- a/vmwgfx/vmwgfx_drmi.h -+++ b/vmwgfx/vmwgfx_drmi.h -@@ -60,11 +60,6 @@ extern void - vmwgfx_dmabuf_unmap(struct vmwgfx_dmabuf *buf); - - extern int --vmwgfx_dma(unsigned int host_x, unsigned int host_y, -- RegionPtr region, struct vmwgfx_dmabuf *buf, -- uint32_t buf_pitch, uint32_t surface_handle, int to_surface); -- --extern int - vmwgfx_num_streams(int drm_fd, uint32_t *ntot, uint32_t *nfree); - - extern int -diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c -index 5534ca3..fd80682 100644 ---- a/vmwgfx/vmwgfx_saa.c -+++ b/vmwgfx/vmwgfx_saa.c -@@ -279,40 +279,40 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa, - Bool to_hw) - { - struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(pixmap); -+ void *data = vpix->malloc; -+ int ret; - - if (!vpix->hw || (!vpix->gmr && !vpix->malloc)) - return TRUE; - -- if (vpix->gmr && vsaa->can_optimize_dma) { -- uint32_t handle, dummy; - -- if (xa_surface_handle(vpix->hw, xa_handle_type_shared, -- &handle, &dummy) != 0) -- goto out_err; -- if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle, -- to_hw) != 0) -+ if (vpix->gmr) { -+ data = vmwgfx_dmabuf_map(vpix->gmr); -+ if (!data) - goto out_err; -- } else { -- void *data = vpix->malloc; -- int ret; -+ } - -- if (vpix->gmr) { -- data = vmwgfx_dmabuf_map(vpix->gmr); -- if (!data) -- goto out_err; -- } -+ ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind, -+ (int) to_hw, -+ (struct xa_box *) REGION_RECTS(reg), -+ REGION_NUM_RECTS(reg)); -+ if (vpix->gmr) -+ vmwgfx_dmabuf_unmap(vpix->gmr); -+ -+ if (ret) -+ goto out_err; -+ -+ ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind, -+ (int) to_hw, -+ (struct xa_box *) REGION_RECTS(reg), -+ REGION_NUM_RECTS(reg)); -+ if (to_hw) -+ xa_context_flush(vsaa->xa_ctx); -+ if (vpix->gmr) -+ vmwgfx_dmabuf_unmap(vpix->gmr); -+ if (ret) -+ goto out_err; - -- ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind, -- (int) to_hw, -- (struct xa_box *) REGION_RECTS(reg), -- REGION_NUM_RECTS(reg)); -- if (to_hw) -- xa_context_flush(vsaa->xa_ctx); -- if (vpix->gmr) -- vmwgfx_dmabuf_unmap(vpix->gmr); -- if (ret) -- goto out_err; -- } - return TRUE; - out_err: - LogMessage(X_ERROR, "DMA %s surface failed.\n", -@@ -1372,7 +1372,6 @@ vmwgfx_saa_init(ScreenPtr pScreen, int drm_fd, struct xa_tracker *xat, - vsaa->xa_ctx = xa_context_default(xat); - vsaa->drm_fd = drm_fd; - vsaa->present_flush = present_flush; -- vsaa->can_optimize_dma = FALSE; - vsaa->use_present_opt = direct_presents; - vsaa->only_hw_presents = only_hw_presents; - vsaa->rendercheck = rendercheck; -diff --git a/vmwgfx/vmwgfx_saa_priv.h b/vmwgfx/vmwgfx_saa_priv.h -index 16583b0..f5f45ba 100644 ---- a/vmwgfx/vmwgfx_saa_priv.h -+++ b/vmwgfx/vmwgfx_saa_priv.h -@@ -50,7 +50,6 @@ struct vmwgfx_saa { - int ydiff; - RegionRec present_region; - uint32_t src_handle; -- Bool can_optimize_dma; - Bool use_present_opt; - Bool only_hw_presents; - Bool rendercheck; --- -1.8.5.1 - - -From e26dec8f5278df74a102493bf6d2d8444dab5d6d Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon -Date: Mon, 28 Oct 2013 18:21:29 -0400 -Subject: [PATCH 05/11] vmwgfx: handle changes of DamageUnregister API in - 1.14.99.2 - -Fix is inspired from the intel driver. - -Reviewed-by: Jakob Bornecrantz -Signed-off-by: Gaetan Nadon -Signed-off-by: Jakob Bornecrantz ---- - vmwgfx/vmwgfx_saa.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c -index fd80682..346e7f4 100644 ---- a/vmwgfx/vmwgfx_saa.c -+++ b/vmwgfx/vmwgfx_saa.c -@@ -26,6 +26,7 @@ - */ - - #include -+#include - #include - #include - #include -@@ -76,7 +77,12 @@ vmwgfx_pixmap_remove_damage(PixmapPtr pixmap) - if (!spix->damage || vpix->hw || vpix->gmr || vpix->malloc) - return; - -+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0) -+ DamageUnregister(spix->damage); -+#else - DamageUnregister(&pixmap->drawable, spix->damage); -+#endif -+ - DamageDestroy(spix->damage); - spix->damage = NULL; - } --- -1.8.5.1 - - -From 7ac45326eccbf3bea9a4a8f95b9662a36ab58eb0 Mon Sep 17 00:00:00 2001 -From: Thomas Hellstrom -Date: Thu, 28 Nov 2013 02:02:20 -0800 -Subject: [PATCH 06/11] vmwgfx: Fix some compilation warnings and indentations - -Most of the compilation warnings we're seeing are due to bad xorg headers, -but fix the ones we can fix in the driver. Some indentation fixes as well. - -Signed-off-by: Thomas Hellstrom -Reviewed-by: Jakob Bornecrantz ---- - src/vmware_bootstrap.c | 2 -- - src/vmwarevideo.c | 4 ++-- - vmwgfx/vmwgfx_driver.c | 1 - - vmwgfx/vmwgfx_output.c | 2 +- - vmwgfx/vmwgfx_overlay.c | 4 ++-- - vmwgfx/vmwgfx_tex_video.c | 26 +++++++++++++------------- - 6 files changed, 18 insertions(+), 21 deletions(-) - -diff --git a/src/vmware_bootstrap.c b/src/vmware_bootstrap.c -index ea5be19..bb58325 100644 ---- a/src/vmware_bootstrap.c -+++ b/src/vmware_bootstrap.c -@@ -256,7 +256,6 @@ VMwarePciProbe (DriverPtr drv, - intptr_t match_data) - { - ScrnInfoPtr scrn = NULL; -- EntityInfoPtr entity; - - scrn = xf86ConfigPciEntity(scrn, 0, entity_num, VMWAREPciChipsets, - NULL, NULL, NULL, NULL, NULL); -@@ -267,7 +266,6 @@ VMwarePciProbe (DriverPtr drv, - scrn->Probe = NULL; - } - -- entity = xf86GetEntityInfo(entity_num); - switch (DEVICE_ID(device)) { - case PCI_DEVICE_ID_VMWARE_SVGA2: - case PCI_DEVICE_ID_VMWARE_SVGA: -diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c -index 745c71f..8d7d171 100644 ---- a/src/vmwarevideo.c -+++ b/src/vmwarevideo.c -@@ -82,7 +82,7 @@ - #define VMWARE_VID_MAX_HEIGHT 2048 - - #define VMWARE_VID_NUM_ENCODINGS 1 --static XF86VideoEncodingRec vmwareVideoEncodings[] = -+static const XF86VideoEncodingRec vmwareVideoEncodings[] = - { - { - 0, -@@ -108,7 +108,7 @@ static XF86ImageRec vmwareVideoImages[] = - }; - - #define VMWARE_VID_NUM_ATTRIBUTES 2 --static XF86AttributeRec vmwareVideoAttributes[] = -+static const XF86AttributeRec vmwareVideoAttributes[] = - { - { - XvGettable | XvSettable, -diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c -index eeaea4b..bfc07f8 100644 ---- a/vmwgfx/vmwgfx_driver.c -+++ b/vmwgfx/vmwgfx_driver.c -@@ -658,7 +658,6 @@ void xorg_flush(ScreenPtr pScreen) - if (crtc->enabled) { - pixmap = crtc_get_scanout(crtc); - if (pixmap) { -- unsigned int j; - - /* - * Remove duplicates. -diff --git a/vmwgfx/vmwgfx_output.c b/vmwgfx/vmwgfx_output.c -index 4f52f1d..f9e4263 100644 ---- a/vmwgfx/vmwgfx_output.c -+++ b/vmwgfx/vmwgfx_output.c -@@ -60,7 +60,7 @@ struct output_private - Bool is_implicit; - }; - --static char *output_enum_list[] = { -+static const char *output_enum_list[] = { - "Unknown", - "VGA", - "DVI", -diff --git a/vmwgfx/vmwgfx_overlay.c b/vmwgfx/vmwgfx_overlay.c -index 6624a10..986dd06 100644 ---- a/vmwgfx/vmwgfx_overlay.c -+++ b/vmwgfx/vmwgfx_overlay.c -@@ -84,7 +84,7 @@ typedef uint8_t uint8; - #define VMWARE_VID_MAX_HEIGHT 2048 - - #define VMWARE_VID_NUM_ENCODINGS 1 --static XF86VideoEncodingRec vmwareVideoEncodings[] = -+static const XF86VideoEncodingRec vmwareVideoEncodings[] = - { - { - 0, -@@ -110,7 +110,7 @@ static XF86ImageRec vmwareVideoImages[] = - }; - - #define VMWARE_VID_NUM_ATTRIBUTES 2 --static XF86AttributeRec vmwareVideoAttributes[] = -+static const XF86AttributeRec vmwareVideoAttributes[] = - { - { - XvGettable | XvSettable, -diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c -index a0a4f4a..3ba40ef 100644 ---- a/vmwgfx/vmwgfx_tex_video.c -+++ b/vmwgfx/vmwgfx_tex_video.c -@@ -70,11 +70,11 @@ static const float bt_709[] = { - static Atom xvBrightness, xvContrast, xvSaturation, xvHue; - - #define NUM_TEXTURED_ATTRIBUTES 4 --static XF86AttributeRec TexturedAttributes[NUM_TEXTURED_ATTRIBUTES] = { -- {XvSettable | XvGettable, -1000, 1000, "XV_BRIGHTNESS"}, -- {XvSettable | XvGettable, -1000, 1000, "XV_CONTRAST"}, -- {XvSettable | XvGettable, -1000, 1000, "XV_SATURATION"}, -- {XvSettable | XvGettable, -1000, 1000, "XV_HUE"} -+static const XF86AttributeRec TexturedAttributes[NUM_TEXTURED_ATTRIBUTES] = { -+ {XvSettable | XvGettable, -1000, 1000, "XV_BRIGHTNESS"}, -+ {XvSettable | XvGettable, -1000, 1000, "XV_CONTRAST"}, -+ {XvSettable | XvGettable, -1000, 1000, "XV_SATURATION"}, -+ {XvSettable | XvGettable, -1000, 1000, "XV_HUE"} - }; - - #define NUM_FORMATS 3 -@@ -82,7 +82,7 @@ static XF86VideoFormatRec Formats[NUM_FORMATS] = { - {15, TrueColor}, {16, TrueColor}, {24, TrueColor} - }; - --static XF86VideoEncodingRec DummyEncoding[1] = { -+static const XF86VideoEncodingRec DummyEncoding[1] = { - { - 0, - "XV_IMAGE", -@@ -416,16 +416,16 @@ copy_packed_data(ScrnInfoPtr pScrn, - switch (id) { - case FOURCC_YV12: { - int pitches[3], offsets[3]; -- unsigned char *y, *u, *v; -+ unsigned char *yp, *up, *vp; - query_image_attributes(pScrn, FOURCC_YV12, - &w, &h, pitches, offsets); - -- y = buf + offsets[0]; -- v = buf + offsets[1]; -- u = buf + offsets[2]; -- memcpy(ymap, y, w*h); -- memcpy(vmap, v, w*h/4); -- memcpy(umap, u, w*h/4); -+ yp = buf + offsets[0]; -+ vp = buf + offsets[1]; -+ up = buf + offsets[2]; -+ memcpy(ymap, yp, w*h); -+ memcpy(vmap, vp, w*h/4); -+ memcpy(umap, up, w*h/4); - break; - } - case FOURCC_UYVY: --- -1.8.5.1 - - -From a40cbd7b4fa19219849b4b0a48f07538772c3e22 Mon Sep 17 00:00:00 2001 -From: Thomas Hellstrom -Date: Thu, 5 Dec 2013 02:58:47 -0800 -Subject: [PATCH 07/11] vmwgfx: Support also XA version 1 v2 - -We need to support also XA version 1, since we want to be backwards -compatible with older mesa releases. -Unfortunately, the intended way of detecting XA major version at -compile-time was broken on mesa 10 so we need a workaround that tests -for XA version 2 at config time. - -v2: Update the test for XA version 2. - -Signed-off-by: Thomas Hellstrom -Reviewed-by: Jakob Bornecrantz ---- - configure.ac | 10 +++++++++- - vmwgfx/vmwgfx_dri2.c | 5 ++--- - vmwgfx/vmwgfx_driver.c | 3 +-- - vmwgfx/vmwgfx_saa.c | 12 +++++------- - vmwgfx/vmwgfx_saa.h | 12 ++++++++++++ - vmwgfx/vmwgfx_tex_video.c | 2 +- - 6 files changed, 30 insertions(+), 14 deletions(-) - -diff --git a/configure.ac b/configure.ac -index dccfb27..123356c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -118,7 +118,15 @@ if test x$BUILD_VMWGFX = xyes; then - PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no]) - fi - if test x$BUILD_VMWGFX = xyes; then -- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 2.0.0],[],[BUILD_VMWGFX=no]) -+# -+# Early versions of mesa 10 forgot to bump the XA major version number in -+# the xa_tracker.h header -+# -+ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0], -+ [PKG_CHECK_EXISTS([xatracker = 2.0.0], -+ [AC_DEFINE([HAVE_XA_2], 1, -+ [Has version 2 of XA])])], -+ [],[BUILD_VMWGFX=no]) - fi - - DRIVER_NAME=vmware -diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c -index 57f2d9d..4c74a6b 100644 ---- a/vmwgfx/vmwgfx_dri2.c -+++ b/vmwgfx/vmwgfx_dri2.c -@@ -206,8 +206,7 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for - } - - private->srf = srf; -- if (xa_surface_handle(srf, xa_handle_type_shared, -- &buffer->name, &buffer->pitch) != 0) -+ if (_xa_surface_handle(srf, &buffer->name, &buffer->pitch) != 0) - return FALSE; - - buffer->cpp = xa_format_depth(xa_surface_format(srf)) / 8; -@@ -228,7 +227,7 @@ dri2_do_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer) - struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(private->pPixmap); - - if (--private->refcount == 0 && srf) { -- xa_surface_unref(srf); -+ xa_surface_destroy(srf); - } - - /* -diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c -index bfc07f8..6301c29 100644 ---- a/vmwgfx/vmwgfx_driver.c -+++ b/vmwgfx/vmwgfx_driver.c -@@ -617,8 +617,7 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd, - return FALSE; - } - -- if (xa_surface_handle(vpix->hw, xa_handle_type_shared, -- &handle, &dummy) != 0) { -+ if (_xa_surface_handle(vpix->hw, &handle, &dummy) != 0) { - LogMessage(X_ERROR, "Could not get present surface handle.\n"); - return FALSE; - } -diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c -index 346e7f4..1459933 100644 ---- a/vmwgfx/vmwgfx_saa.c -+++ b/vmwgfx/vmwgfx_saa.c -@@ -146,7 +146,7 @@ vmwgfx_pixmap_free_storage(struct vmwgfx_saa_pixmap *vpix) - vpix->malloc = NULL; - } - if (!(vpix->backing & VMWGFX_PIX_SURFACE) && vpix->hw) { -- xa_surface_unref(vpix->hw); -+ xa_surface_destroy(vpix->hw); - vpix->hw = NULL; - } - if (!(vpix->backing & VMWGFX_PIX_GMR) && vpix->gmr) { -@@ -451,7 +451,7 @@ vmwgfx_hw_kill(struct vmwgfx_saa *vsaa, - &spix->dirty_hw)) - return FALSE; - -- xa_surface_unref(vpix->hw); -+ xa_surface_destroy(vpix->hw); - vpix->hw = NULL; - - /* -@@ -698,8 +698,7 @@ vmwgfx_present_prepare(struct vmwgfx_saa *vsaa, - - (void) pScreen; - if (src_vpix == dst_vpix || !src_vpix->hw || -- xa_surface_handle(src_vpix->hw, xa_handle_type_shared, -- &vsaa->src_handle, &dummy) != 0) -+ _xa_surface_handle(src_vpix->hw, &vsaa->src_handle, &dummy) != 0) - return FALSE; - - REGION_NULL(pScreen, &vsaa->present_region); -@@ -800,7 +799,7 @@ vmwgfx_create_hw(struct vmwgfx_saa *vsaa, - return TRUE; - - out_no_damage: -- xa_surface_unref(hw); -+ xa_surface_destroy(hw); - return FALSE; - } - -@@ -1459,8 +1458,7 @@ vmwgfx_scanout_ref(struct vmwgfx_screen_entry *entry) - */ - if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT, 0, NULL)) - goto out_err; -- if (xa_surface_handle(vpix->hw, xa_handle_type_shared, -- &handle, &dummy) != 0) -+ if (_xa_surface_handle(vpix->hw, &handle, &dummy) != 0) - goto out_err; - depth = xa_format_depth(xa_surface_format(vpix->hw)); - -diff --git a/vmwgfx/vmwgfx_saa.h b/vmwgfx/vmwgfx_saa.h -index d8aa3d3..5e1f40c 100644 ---- a/vmwgfx/vmwgfx_saa.h -+++ b/vmwgfx/vmwgfx_saa.h -@@ -115,4 +115,16 @@ vmwgfx_saa_set_master(ScreenPtr pScreen); - void - vmwgfx_saa_drop_master(ScreenPtr pScreen); - -+#if (XA_TRACKER_VERSION_MAJOR <= 1) && !defined(HAVE_XA_2) -+ -+#define _xa_surface_handle(_a, _b, _c) xa_surface_handle(_a, _b, _c) -+#define xa_context_flush(_a) -+ -+#else -+ -+#define xa_surface_destroy(_a) xa_surface_unref(_a) -+#define _xa_surface_handle(_a, _b, _c) \ -+ xa_surface_handle(_a, xa_handle_type_shared, _b, _c) -+ -+#endif /* (XA_TRACKER_VERSION_MAJOR <= 1) */ - #endif -diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c -index 3ba40ef..9fd8f22 100644 ---- a/vmwgfx/vmwgfx_tex_video.c -+++ b/vmwgfx/vmwgfx_tex_video.c -@@ -199,7 +199,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown) - for (i=0; i<3; ++i) { - for (j=0; j<2; ++j) { - if (priv->yuv[i]) { -- xa_surface_unref(priv->yuv[j][i]); -+ xa_surface_destroy(priv->yuv[j][i]); - priv->yuv[j][i] = NULL; - } - } --- -1.8.5.1 - - -From c36cbcefb8526944141eb431e1e736dc4485a36e Mon Sep 17 00:00:00 2001 -From: Thomas Hellstrom -Date: Mon, 9 Dec 2013 00:19:55 -0800 -Subject: [PATCH 08/11] vmwgfx: Remove stray 1 - -Signed-off-by: Thomas Hellstrom -Reviewed-by: Jakob Bornecrantz ---- - vmwgfx/vmwgfx_saa.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c -index 1459933..28819c1 100644 ---- a/vmwgfx/vmwgfx_saa.c -+++ b/vmwgfx/vmwgfx_saa.c -@@ -1230,7 +1230,7 @@ vmwgfx_operation_complete(struct saa_driver *driver, - */ - - if (vpix->hw && vpix->hw_is_dri2_fronts) { -- if (1 && pScrn->vtSema && -+ if (pScrn->vtSema && - vmwgfx_upload_to_hw(driver, pixmap, &spix->dirty_shadow)) { - - REGION_EMPTY(vsaa->pScreen, &spix->dirty_shadow); --- -1.8.5.1 - - -From 4af6062ce281a7f4aaa50985fe757e9569208ee1 Mon Sep 17 00:00:00 2001 -From: Thomas Hellstrom -Date: Wed, 11 Dec 2013 04:59:49 -0800 -Subject: [PATCH 09/11] Revert "vmwgfx: Get rid of device-specific DMA code" - -This reverts commit 45b2457516a9db4bd1d60fbb24a1efbe2d9dd932. - -Reverting this because using direct DMA for shared pixmaps should -boost performance. It should be usable both in a composited environment -and when running hosted. Need to retest the DMA flaws I saw before disabling -this code. - -Signed-off-by: Thomas Hellstrom -Reviewed-by: Jakob Bornecrantz ---- - vmwgfx/vmwgfx_drmi.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++ - vmwgfx/vmwgfx_drmi.h | 5 +++ - vmwgfx/vmwgfx_saa.c | 53 ++++++++++++------------ - vmwgfx/vmwgfx_saa_priv.h | 1 + - 4 files changed, 136 insertions(+), 26 deletions(-) - -diff --git a/vmwgfx/vmwgfx_drmi.c b/vmwgfx/vmwgfx_drmi.c -index 1e23f4a..496a16b 100644 ---- a/vmwgfx/vmwgfx_drmi.c -+++ b/vmwgfx/vmwgfx_drmi.c -@@ -284,6 +284,109 @@ vmwgfx_dmabuf_destroy(struct vmwgfx_dmabuf *buf) - } - - int -+vmwgfx_dma(unsigned int host_x, unsigned int host_y, -+ RegionPtr region, struct vmwgfx_dmabuf *buf, -+ uint32_t buf_pitch, uint32_t surface_handle, int to_surface) -+{ -+ BoxPtr clips = REGION_RECTS(region); -+ unsigned int num_clips = REGION_NUM_RECTS(region); -+ struct drm_vmw_execbuf_arg arg; -+ struct drm_vmw_fence_rep rep; -+ int ret; -+ unsigned int size; -+ unsigned i; -+ SVGA3dCopyBox *cb; -+ SVGA3dCmdSurfaceDMASuffix *suffix; -+ SVGA3dCmdSurfaceDMA *body; -+ struct vmwgfx_int_dmabuf *ibuf = vmwgfx_int_dmabuf(buf); -+ -+ struct { -+ SVGA3dCmdHeader header; -+ SVGA3dCmdSurfaceDMA body; -+ SVGA3dCopyBox cb; -+ } *cmd; -+ -+ if (num_clips == 0) -+ return 0; -+ -+ size = sizeof(*cmd) + (num_clips - 1) * sizeof(cmd->cb) + -+ sizeof(*suffix); -+ cmd = malloc(size); -+ if (!cmd) -+ return -1; -+ -+ cmd->header.id = SVGA_3D_CMD_SURFACE_DMA; -+ cmd->header.size = sizeof(cmd->body) + num_clips * sizeof(cmd->cb) + -+ sizeof(*suffix); -+ cb = &cmd->cb; -+ -+ suffix = (SVGA3dCmdSurfaceDMASuffix *) &cb[num_clips]; -+ suffix->suffixSize = sizeof(*suffix); -+ suffix->maximumOffset = (uint32_t) -1; -+ suffix->flags.discard = 0; -+ suffix->flags.unsynchronized = 0; -+ suffix->flags.reserved = 0; -+ -+ body = &cmd->body; -+ body->guest.ptr.gmrId = buf->gmr_id; -+ body->guest.ptr.offset = buf->gmr_offset; -+ body->guest.pitch = buf_pitch; -+ body->host.sid = surface_handle; -+ body->host.face = 0; -+ body->host.mipmap = 0; -+ -+ body->transfer = (to_surface ? SVGA3D_WRITE_HOST_VRAM : -+ SVGA3D_READ_HOST_VRAM); -+ -+ -+ for (i=0; i < num_clips; i++, cb++, clips++) { -+ cb->x = (uint16_t) clips->x1 + host_x; -+ cb->y = (uint16_t) clips->y1 + host_y; -+ cb->z = 0; -+ cb->srcx = (uint16_t) clips->x1; -+ cb->srcy = (uint16_t) clips->y1; -+ cb->srcz = 0; -+ cb->w = (uint16_t) (clips->x2 - clips->x1); -+ cb->h = (uint16_t) (clips->y2 - clips->y1); -+ cb->d = 1; -+#if 0 -+ LogMessage(X_INFO, "DMA! x: %u y: %u srcx: %u srcy: %u w: %u h: %u %s\n", -+ cb->x, cb->y, cb->srcx, cb->srcy, cb->w, cb->h, -+ to_surface ? "to" : "from"); -+#endif -+ -+ } -+ -+ memset(&arg, 0, sizeof(arg)); -+ memset(&rep, 0, sizeof(rep)); -+ -+ rep.error = -EFAULT; -+ arg.fence_rep = ((to_surface) ? 0UL : (unsigned long)&rep); -+ arg.commands = (unsigned long)cmd; -+ arg.command_size = size; -+ arg.throttle_us = 0; -+ arg.version = DRM_VMW_EXECBUF_VERSION; -+ -+ ret = drmCommandWrite(ibuf->drm_fd, DRM_VMW_EXECBUF, &arg, sizeof(arg)); -+ if (ret) { -+ LogMessage(X_ERROR, "DMA error %s.\n", strerror(-ret)); -+ } -+ -+ free(cmd); -+ -+ if (rep.error == 0) { -+ ret = vmwgfx_fence_wait(ibuf->drm_fd, rep.handle, TRUE); -+ if (ret) { -+ LogMessage(X_ERROR, "DMA from host fence wait error %s.\n", -+ strerror(-ret)); -+ vmwgfx_fence_unref(ibuf->drm_fd, rep.handle); -+ } -+ } -+ -+ return 0; -+} -+ -+int - vmwgfx_get_param(int drm_fd, uint32_t param, uint64_t *out) - { - struct drm_vmw_getparam_arg gp_arg; -diff --git a/vmwgfx/vmwgfx_drmi.h b/vmwgfx/vmwgfx_drmi.h -index fff728a..2435009 100644 ---- a/vmwgfx/vmwgfx_drmi.h -+++ b/vmwgfx/vmwgfx_drmi.h -@@ -60,6 +60,11 @@ extern void - vmwgfx_dmabuf_unmap(struct vmwgfx_dmabuf *buf); - - extern int -+vmwgfx_dma(unsigned int host_x, unsigned int host_y, -+ RegionPtr region, struct vmwgfx_dmabuf *buf, -+ uint32_t buf_pitch, uint32_t surface_handle, int to_surface); -+ -+extern int - vmwgfx_num_streams(int drm_fd, uint32_t *ntot, uint32_t *nfree); - - extern int -diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c -index 28819c1..96275a5 100644 ---- a/vmwgfx/vmwgfx_saa.c -+++ b/vmwgfx/vmwgfx_saa.c -@@ -285,40 +285,40 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa, - Bool to_hw) - { - struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(pixmap); -- void *data = vpix->malloc; -- int ret; - - if (!vpix->hw || (!vpix->gmr && !vpix->malloc)) - return TRUE; - -+ if (vpix->gmr && vsaa->can_optimize_dma) { -+ uint32_t handle, dummy; - -- if (vpix->gmr) { -- data = vmwgfx_dmabuf_map(vpix->gmr); -- if (!data) -+ if (xa_surface_handle(vpix->hw, xa_handle_type_shared, -+ &handle, &dummy) != 0) - goto out_err; -- } -- -- ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind, -- (int) to_hw, -- (struct xa_box *) REGION_RECTS(reg), -- REGION_NUM_RECTS(reg)); -- if (vpix->gmr) -- vmwgfx_dmabuf_unmap(vpix->gmr); -- -- if (ret) -- goto out_err; -+ if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle, -+ to_hw) != 0) -+ goto out_err; -+ } else { -+ void *data = vpix->malloc; -+ int ret; - -- ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind, -- (int) to_hw, -- (struct xa_box *) REGION_RECTS(reg), -- REGION_NUM_RECTS(reg)); -- if (to_hw) -- xa_context_flush(vsaa->xa_ctx); -- if (vpix->gmr) -- vmwgfx_dmabuf_unmap(vpix->gmr); -- if (ret) -- goto out_err; -+ if (vpix->gmr) { -+ data = vmwgfx_dmabuf_map(vpix->gmr); -+ if (!data) -+ goto out_err; -+ } - -+ ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind, -+ (int) to_hw, -+ (struct xa_box *) REGION_RECTS(reg), -+ REGION_NUM_RECTS(reg)); -+ if (to_hw) -+ xa_context_flush(vsaa->xa_ctx); -+ if (vpix->gmr) -+ vmwgfx_dmabuf_unmap(vpix->gmr); -+ if (ret) -+ goto out_err; -+ } - return TRUE; - out_err: - LogMessage(X_ERROR, "DMA %s surface failed.\n", -@@ -1377,6 +1377,7 @@ vmwgfx_saa_init(ScreenPtr pScreen, int drm_fd, struct xa_tracker *xat, - vsaa->xa_ctx = xa_context_default(xat); - vsaa->drm_fd = drm_fd; - vsaa->present_flush = present_flush; -+ vsaa->can_optimize_dma = FALSE; - vsaa->use_present_opt = direct_presents; - vsaa->only_hw_presents = only_hw_presents; - vsaa->rendercheck = rendercheck; -diff --git a/vmwgfx/vmwgfx_saa_priv.h b/vmwgfx/vmwgfx_saa_priv.h -index f5f45ba..16583b0 100644 ---- a/vmwgfx/vmwgfx_saa_priv.h -+++ b/vmwgfx/vmwgfx_saa_priv.h -@@ -50,6 +50,7 @@ struct vmwgfx_saa { - int ydiff; - RegionRec present_region; - uint32_t src_handle; -+ Bool can_optimize_dma; - Bool use_present_opt; - Bool only_hw_presents; - Bool rendercheck; --- -1.8.5.1 - - -From 93228f3dd3355a25583d22dbb96791678b93be3e Mon Sep 17 00:00:00 2001 -From: Thomas Hellstrom -Date: Wed, 11 Dec 2013 06:54:02 -0800 -Subject: [PATCH 10/11] vmwgfx: Really allow XA version 2. - -When XA starts to correctly advertise version 2, we didn't allow it. -Fix this. - -Signed-off-by: Thomas Hellstrom -Reviewed-by: Jakob Bornecrantz ---- - vmwgfx/vmwgfx_driver.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c -index 6301c29..4e28097 100644 ---- a/vmwgfx/vmwgfx_driver.c -+++ b/vmwgfx/vmwgfx_driver.c -@@ -79,7 +79,7 @@ typedef uint8_t uint8; - - #define XA_VERSION_MINOR_REQUIRED 0 - #define XA_VERSION_MAJOR_REQUIRED 1 --#define XA_VERSION_MAJOR_COMPAT 1 -+#define XA_VERSION_MAJOR_COMPAT 2 - - #define DRM_VERSION_MAJOR_REQUIRED 2 - #define DRM_VERSION_MINOR_REQUIRED 3 --- -1.8.5.1 - - -From f45a551e9b70ccec8f92df02747d4e2af299cf8c Mon Sep 17 00:00:00 2001 -From: Thomas Hellstrom -Date: Mon, 16 Dec 2013 10:38:21 +0100 -Subject: [PATCH 11/11] vmwgfx: Fix compile breakage on XA version 1. - -A recent revert brought back code that assumed XA version 2. - -Signed-off-by: Thomas Hellstrom -Reviewed-by: trivial ---- - vmwgfx/vmwgfx_saa.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c -index 96275a5..e76bd09 100644 ---- a/vmwgfx/vmwgfx_saa.c -+++ b/vmwgfx/vmwgfx_saa.c -@@ -292,8 +292,7 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa, - if (vpix->gmr && vsaa->can_optimize_dma) { - uint32_t handle, dummy; - -- if (xa_surface_handle(vpix->hw, xa_handle_type_shared, -- &handle, &dummy) != 0) -+ if (_xa_surface_handle(vpix->hw, &handle, &dummy) != 0) - goto out_err; - if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle, - to_hw) != 0) --- -1.8.5.1 - -- cgit v0.12 From b4dab9b8f8abbaa031c74a77f42847714f0b4a6c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 24 Jun 2015 19:33:01 +0000 Subject: LinHES-system: LinHES-start: update some paths --- abs/core/LinHES-system/LinHES-start | 19 +++++-------------- abs/core/LinHES-system/PKGBUILD | 4 ++-- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/abs/core/LinHES-system/LinHES-start b/abs/core/LinHES-system/LinHES-start index 88ecffb..de6e9db 100755 --- a/abs/core/LinHES-system/LinHES-start +++ b/abs/core/LinHES-system/LinHES-start @@ -11,18 +11,18 @@ # Site administrators are STRONGLY urged to write nicer versions. # # $XFree86: xc/programs/xinit/startx.cpp,v 3.16tsi Exp $ -. /etc/profile MYTH_RUN_STATUS="1" +. /etc/profile unset DBUS_SESSION_BUS_ADDRESS unset SESSION_MANAGER userclientrc=/etc/X11/Sessions/LinHES userserverrc=$HOME/.xserverrc -sysclientrc=/usr/X11R6/lib/X11/xinit/xinitrc -sysserverrc=/usr/X11R6/lib/X11/xinit/xserverrc -defaultclient=/usr/X11R6/bin/xterm -defaultserver=/usr/X11R6/bin/X +sysclientrc=/etc/X11/xinit/xinitrc +sysserverrc=/etc/X11/xinit/xserverrc +defaultclient=/usr/bin/xterm +defaultserver=/usr/bin/X defaultclientargs="" defaultserverargs="" clientargs="" @@ -31,8 +31,6 @@ serverargs="" - - if [ -f $userclientrc ]; then defaultclientargs=$userclientrc elif [ -f $sysclientrc ]; then @@ -154,10 +152,3 @@ fi if command -v deallocvt > /dev/null 2>&1; then deallocvt fi - - - - - - - diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 5bb8454..bcf7a73 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.3 -pkgrel=11 +pkgrel=12 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -79,7 +79,7 @@ package() { md5sums=('8415c4b2587a8a1e6a312484c1edafcb' 'de32a1c50101265dd7f6ca5037f7a26a' - '301884fb60521627fffd1160b2cf5181' + '2d7b8414ddce5f401331342ac1529c22' '76b2637cac0452b3acdbeeb4e8a5474b' 'd02ddadeb2181f90954e435842cd7f0a' 'dc3eef2a624754e16805d72bbe488b67' -- cgit v0.12 From 475634af885c5abe5541f6ac0fdbf748606aa14a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 24 Jun 2015 20:20:37 +0000 Subject: mysql: update to 5.6.25 --- abs/core/mysql/PKGBUILD | 8 ++++---- abs/core/mysql/my.cnf | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/abs/core/mysql/PKGBUILD b/abs/core/mysql/PKGBUILD index 0c6747e..9a4e092 100644 --- a/abs/core/mysql/PKGBUILD +++ b/abs/core/mysql/PKGBUILD @@ -5,8 +5,8 @@ pkgname=('mysql' 'libmysqlclient' 'mysql-clients') pkgbase=mysql -pkgver=5.6.23 -pkgrel=3 +pkgver=5.6.25 +pkgrel=1 pkgdesc="Fast SQL database server, community edition" arch=('i686' 'x86_64') makedepends=('openssl' 'zlib' 'cmake' 'systemd-tools' 'libaio' 'jemalloc') @@ -169,10 +169,10 @@ package_mysql(){ rm "${pkgdir}/usr/share/man/man1/mysql-test-run.pl.1" } -md5sums=('60344f26eae136a267a0277407926e79' +md5sums=('37664399c91021abe070faa700ecd0ed' 'b79e65a5aa536e6b5bc60988eb0b78a2' '2fa6e456964d4ff5e6d4f9ff0126aed6' '81b62df0f569935109c1b107dfe9f9fa' - '75121ffbbd47367c27ae0448f6282b57' + 'd30c8b6206e23972d1bae1a842721cea' 'e7eb2faeab755cbb2fe03542bf328da9' 'f2b34ac2954bb56c4abf08c66a7f840e') diff --git a/abs/core/mysql/my.cnf b/abs/core/mysql/my.cnf index da26759..42e1c51 100755 --- a/abs/core/mysql/my.cnf +++ b/abs/core/mysql/my.cnf @@ -43,6 +43,7 @@ query_cache_type = 1 query_cache_size = 64M query_cache_limit = 2M join_buffer_size = 2M +ignore-db-dir = lost+found # Don't listen on a TCP/IP port at all. This can be a security enhancement, -- cgit v0.12 From 171b291601eb4f90673ba61c7215c99ad87d4815 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 24 Jun 2015 20:47:16 +0000 Subject: LinHES-config: soundconfig.sh: install pkgs needed for oss --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/soundconfig.sh | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 1f5ebd3..cb0e1c2 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.3 -pkgrel=15 +pkgrel=16 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' @@ -151,7 +151,7 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff' '6e5639fff82fa2ba76113ac1ab8f2016' 'f0376c98a7986897406d393186c0365e' '157e73d0f90d7b306aba8f5921aeedd3' - '932cf4a7a3891d1849cf8d3962adf78c' + '74047c5c5cae2f8576fddbed7d197be4' 'eef9b882ecb70648a8f253f85b73a274' '5f890ea9bda6aef652d2560ca19dac07' 'ab2aa42c2947148c2b1cac0ade6d1d55' diff --git a/abs/core/LinHES-config/soundconfig.sh b/abs/core/LinHES-config/soundconfig.sh index 6e7bf70..810d9b2 100755 --- a/abs/core/LinHES-config/soundconfig.sh +++ b/abs/core/LinHES-config/soundconfig.sh @@ -1,11 +1,10 @@ #!/bin/bash +MYTH_RUN_STATUS="1" . /etc/systemconfig . /etc/profile echo $@ >/tmp/audio.call BASE="" -MYTH_RUN_STATUS="1" -. /etc/profile TESTFILE="/usr/share/sounds/pinkNoise_3s.wav" OSSinstalled="false" @@ -68,6 +67,11 @@ function installOSS { pacman --noconfirm -S --force oss fi soundon + if [ ! $? = 0 ] + then + pacman --noconfirm -S --force gcc make binutils + soundon + fi add_service.sh oss echo "blacklist soundcore" > $BLACKLIST echo "install soundcore /bin/false" >> $BLACKLIST -- cgit v0.12 From df1a0a701f38eb163d5fd87b377acfa143a3f634 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 25 Jun 2015 15:35:13 +0000 Subject: mythtv, mythplugins, mythinstall: update to latest -fixes 0.27.5 --- abs/core/mythinstall/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD index e74402e..0a52a24 100644 --- a/abs/core/mythinstall/PKGBUILD +++ b/abs/core/mythinstall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jams pkgname=mythinstall pkgver=8.3 -pkgrel=7 +pkgrel=8 pkgdesc="LinHES installer/systemconfig GUI." arch=('i686' 'x86_64') depends=('mythtv>=0.27') diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index b3293ca..44e80b7 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -b7afc9b8e7d25e643e60daa07d7b8fae94d99a7f +9498257571e8158926b60a0eefc74568c4436823 diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 288bc74..6f39ebb 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.4 -pkgrel=16 +pkgrel=17 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index b8c0c19..1f3d5f7 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.4 -pkgrel=16 +pkgrel=17 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12 From 054467157226d2c22d26510b9c89cd90f2e4d941 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 25 Jun 2015 21:50:04 +0000 Subject: google-chrome: update to 43.0.2357.130 --- abs/extra/google-chrome/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD index 687c0d4..66874ec 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=43.0.2357.81 +pkgver=43.0.2357.130 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -57,5 +57,5 @@ package() { msg2 "Rename google-chrome-stable to google-chrome..." mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome } -md5sums=('ec20af5dd812b770362d1a69507e1db1' +md5sums=('b02492c9eb6131bb0a43cb8a906bd6e5' 'b7e752f549b215ac77f284b6486794b6') -- cgit v0.12 From a6b00262906bde4358d460d12a6037c24c8d4c41 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 25 Jun 2015 21:51:40 +0000 Subject: runit-scripts: frontend: finish: updates for xorg-server update --- abs/core/runit-scripts/PKGBUILD | 2 +- .../runitscripts/services/frontend/finish | 50 ++++++++++++++-------- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index de02476..844281b 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=8.3 -pkgrel=6 +pkgrel=7 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runitscripts/services/frontend/finish b/abs/core/runit-scripts/runitscripts/services/frontend/finish index d96bcf0..a1db046 100755 --- a/abs/core/runit-scripts/runitscripts/services/frontend/finish +++ b/abs/core/runit-scripts/runitscripts/services/frontend/finish @@ -11,7 +11,8 @@ function cleanup(){ #continue plymouthd that was stopped in /etc/X11/Sessions/Linhes pidfile=/run/plymouth.pid -if [ -e "$pidfile" ]; then +if [ -e "$pidfile" ]; +then plypid=`cat "$pidfile"` if [ -n "$plypid" ]; then kill -s CONT "$plypid" @@ -20,34 +21,45 @@ fi grep -q nox /proc/cmdline STATUS=$? - if [ $STATUS = 0 ] - then - printhl " status = 0" - chvt 2 +if [ $STATUS = 0 ] +then + printhl " status = 0: no X" + chvt 2 else - pkill -f "X :0" - printhl " status = 1" + x1pid=`pidof Xorg` + pkill -f "Xorg" + printhl " status = 1: X" if [ ! -d /etc/sv/frontend/.runtime ] then - mkdir -p /etc/sv/frontend/.runtime + mkdir -p /etc/sv/frontend/.runtime fi touch /etc/sv/frontend/.runtime/`date +%s` - sleep 0.2 - ps -U mythtv -ef |grep "/bin/sh /usr/bin/startx"|grep -v grep|awk ' { print $2 } '|xargs kill -9 2> /dev/null - cdate=`date` + sleep 1 + #ps -U mythtv -ef |grep "xinit /etc/X11/Sessions/LinHES"|grep -v grep|awk ' { print $2 } '|xargs kill -9 2> /dev/null + #cdate=`date` numfilestotal=`/usr/bin/file_time_offset.py -s0 -d/etc/sv/frontend/.runtime` numfilesover10secondsold=`/usr/bin/file_time_offset.py -s10 -d/etc/sv/frontend/.runtime` numfileslessthan10secondsold=$(($numfilestotal-$numfilesover10secondsold)) if [ $numfileslessthan10secondsold -gt 2 ] then - sv stop frontend - printhl " Frontend disabled, due to many restarts." - printhl " Run \"sv start frontend\" to try again" - cleanup + sv stop frontend + printhl " Frontend disabled, due to many restarts." + printhl " Run \"sv start frontend\" to try again" + cleanup else - if [ $numfilestotal -gt 10 ] - then - cleanup - fi + if [ $numfilestotal -gt 10 ] + then + cleanup + fi + fi + if [[ `pidof "Xorg"` -eq $x1pid ]] + then + printhl " X $x1pid is shutting down, waiting 10 seconds" + sleep 10 + if [[ `pidof "Xorg"` -eq $x1pid ]] + then + printhl " killing X $x1pid" + kill -9 $x1pid + fi fi fi -- cgit v0.12 From a2da1c03d803187fa6e6b95c73cb5f93c2c74dc6 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 26 Jun 2015 13:27:48 +0000 Subject: ncdu: update to 1.11 --- abs/extra/ncdu/PKGBUILD | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/abs/extra/ncdu/PKGBUILD b/abs/extra/ncdu/PKGBUILD index 011f7e0..7973c60 100644 --- a/abs/extra/ncdu/PKGBUILD +++ b/abs/extra/ncdu/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 76727 2012-09-27 22:43:52Z bisson $ - +# $Id$ # Contributor: lp76 # Contributor: Daenyth # Maintainer: Gaetan Bisson pkgname=ncdu -pkgver=1.9 +pkgver=1.11 pkgrel=1 pkgdesc='Disk usage analyzer with an ncurses interface' url='http://dev.yorhel.nl/ncdu/' @@ -13,7 +12,7 @@ license=('custom:MIT') depends=('ncurses') arch=('i686' 'x86_64') source=("http://dev.yorhel.nl/download/${pkgname}-${pkgver}.tar.gz") -sha1sums=('27cb5464b192db8ffdf0a894fe51d29985348eb0') +sha1sums=('8f22d713e6d2b28e1f501eee2bd1e03b55550c8d') build() { cd "${srcdir}/${pkgname}-${pkgver}" -- cgit v0.12 From 3973645fd2caaf0bc2b7e7d40059efcaf723aa17 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 26 Jun 2015 18:16:39 +0000 Subject: file: update to 5.23 --- abs/core/file/001-fix-bug-with-long-options.patch | 109 ++++++++++++++++++++++ abs/core/file/PKGBUILD | 50 +++++----- 2 files changed, 138 insertions(+), 21 deletions(-) create mode 100644 abs/core/file/001-fix-bug-with-long-options.patch diff --git a/abs/core/file/001-fix-bug-with-long-options.patch b/abs/core/file/001-fix-bug-with-long-options.patch new file mode 100644 index 0000000..2637f17 --- /dev/null +++ b/abs/core/file/001-fix-bug-with-long-options.patch @@ -0,0 +1,109 @@ +From 21f9d5f0e0340ada998f7f9d316368c7167a4afa Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Thu, 11 Jun 2015 12:52:32 +0000 +Subject: [PATCH] Fix bug with long options and explicitly number them to avoid + this in the future. + +--- + src/file.c | 45 +++++++++++++++++++++++---------------------- + src/file_opts.h | 10 +++++----- + 2 files changed, 28 insertions(+), 27 deletions(-) + +diff --git a/src/file.c b/src/file.c +index f60dde0..c700f66 100644 +--- a/src/file.c ++++ b/src/file.c +@@ -89,10 +89,15 @@ private int /* Global command-line options */ + + private const char *separator = ":"; /* Default field separator */ + private const struct option long_options[] = { ++#define OPT_HELP 1 ++#define OPT_APPLE 2 ++#define OPT_EXTENSIONS 3 ++#define OPT_MIME_TYPE 4 ++#define OPT_MIME_ENCODING 5 + #define OPT(shortname, longname, opt, doc) \ + {longname, opt, NULL, shortname}, +-#define OPT_LONGONLY(longname, opt, doc) \ +- {longname, opt, NULL, 0}, ++#define OPT_LONGONLY(longname, opt, doc, id) \ ++ {longname, opt, NULL, id}, + #include "file_opts.h" + #undef OPT + #undef OPT_LONGONLY +@@ -182,24 +187,20 @@ main(int argc, char *argv[]) + while ((c = getopt_long(argc, argv, OPTSTRING, long_options, + &longindex)) != -1) + switch (c) { +- case 0 : +- switch (longindex) { +- case 0: +- help(); +- break; +- case 10: +- flags |= MAGIC_APPLE; +- break; +- case 11: +- flags |= MAGIC_EXTENSION; +- break; +- case 12: +- flags |= MAGIC_MIME_TYPE; +- break; +- case 13: +- flags |= MAGIC_MIME_ENCODING; +- break; +- } ++ case OPT_HELP: ++ help(); ++ break; ++ case OPT_APPLE: ++ flags |= MAGIC_APPLE; ++ break; ++ case OPT_EXTENSIONS: ++ flags |= MAGIC_EXTENSION; ++ break; ++ case OPT_MIME_TYPE: ++ flags |= MAGIC_MIME_TYPE; ++ break; ++ case OPT_MIME_ENCODING: ++ flags |= MAGIC_MIME_ENCODING; + break; + case '0': + nulsep = 1; +@@ -595,7 +596,7 @@ help(void) + #define OPT(shortname, longname, opt, doc) \ + fprintf(stdout, " -%c, --" longname, shortname), \ + docprint(doc); +-#define OPT_LONGONLY(longname, opt, doc) \ ++#define OPT_LONGONLY(longname, opt, doc, id) \ + fprintf(stdout, " --" longname), \ + docprint(doc); + #include "file_opts.h" +diff --git a/src/file_opts.h b/src/file_opts.h +index 036505f..2e30d06 100644 +--- a/src/file_opts.h ++++ b/src/file_opts.h +@@ -12,7 +12,7 @@ + * switch statement! + */ + +-OPT_LONGONLY("help", 0, " display this help and exit\n") ++OPT_LONGONLY("help", 0, " display this help and exit\n", OPT_HELP) + OPT('v', "version", 0, " output version information and exit\n") + OPT('m', "magic-file", 1, " LIST use LIST as a colon-separated list of magic\n" + " number files\n") +@@ -29,10 +29,10 @@ OPT('f', "files-from", 1, " FILE read the filenames to be examined from FIL + OPT('F', "separator", 1, " STRING use string as separator instead of `:'\n") + OPT('i', "mime", 0, " output MIME type strings (--mime-type and\n" + " --mime-encoding)\n") +-OPT_LONGONLY("apple", 0, " output the Apple CREATOR/TYPE\n") +-OPT_LONGONLY("extension", 0, " output a slash-separated list of extnsions\n") +-OPT_LONGONLY("mime-type", 0, " output the MIME type\n") +-OPT_LONGONLY("mime-encoding", 0, " output the MIME encoding\n") ++OPT_LONGONLY("apple", 0, " output the Apple CREATOR/TYPE\n", OPT_APPLE) ++OPT_LONGONLY("extension", 0, " output a slash-separated list of extensions\n", OPT_EXTENSIONS) ++OPT_LONGONLY("mime-type", 0, " output the MIME type\n", OPT_MIME_TYPE) ++OPT_LONGONLY("mime-encoding", 0, " output the MIME encoding\n", OPT_MIME_ENCODING) + OPT('k', "keep-going", 0, " don't stop at the first match\n") + OPT('l', "list", 0, " list magic strength\n") + #ifdef S_IFLNK diff --git a/abs/core/file/PKGBUILD b/abs/core/file/PKGBUILD index f182038..805200e 100644 --- a/abs/core/file/PKGBUILD +++ b/abs/core/file/PKGBUILD @@ -1,34 +1,42 @@ -# $Id: PKGBUILD 150976 2012-02-24 12:10:49Z allan $ -# Maintainer: Allan McRae +# $Id$ +# Maintainer: Sébastien Luttringer +# Contributor: Allan McRae # Contributor: Andreas Radke pkgname=file -pkgver=5.11 -pkgrel=1 -pkgdesc="File type identification utility" +pkgver=5.23 +pkgrel=2 +pkgdesc='File type identification utility' arch=('i686' 'x86_64') license=('custom') -groups=('base') -url="http://www.darwinsys.com/file/" +groups=('base' 'base-devel') +url='http://www.darwinsys.com/file/' depends=('glibc' 'zlib') -options=('!libtool') -source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('16a407bd66d6c7a832f3a5c0d609c27b') +source=("ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz" + '001-fix-bug-with-long-options.patch') +md5sums=('61db35209ce71a6d576392ce6e1d2f80' + '4138dd409ad6d67ee35a61cf3c71b0fe') + +prepare() { + patch -p1 -d $pkgname-$pkgver < '001-fix-bug-with-long-options.patch' +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's#\$(datadir)/misc#\$(datadir)#' configure - + cd $pkgname-$pkgver ./configure --prefix=/usr --datadir=/usr/share/file - make + make } -package() { - cd "${srcdir}/${pkgname}-${pkgver}" +check() { + cd $pkgname-$pkgver + make check +} - make DESTDIR=${pkgdir} install - install -dm755 ${pkgdir}/usr/share/misc - ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc - - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + rmdir "$pkgdir/usr/share/man/man5" } + +# vim:set ts=2 sw=2 et: -- cgit v0.12 From 2b4ed57e07d7ab7f39ac5d198836e7fa5cb802c1 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 26 Jun 2015 18:21:31 +0000 Subject: nano: update to 2.4.1 --- abs/core/nano/PKGBUILD | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/abs/core/nano/PKGBUILD b/abs/core/nano/PKGBUILD index 29daecb..baf3285 100644 --- a/abs/core/nano/PKGBUILD +++ b/abs/core/nano/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 142207 2011-11-06 08:47:48Z andyrtr $ +# $Id$ # Maintainer: Andreas Radke # Contributor: Judd pkgname=nano -pkgver=2.2.6 -pkgrel=2 +pkgver=2.4.1 +pkgrel=1 pkgdesc="Pico editor clone with enhancements" arch=('i686' 'x86_64') license=('GPL') url="http://www.nano-editor.org" groups=('base') -depends=('ncurses' 'sh') +depends=('ncurses' 'file' 'sh') backup=('etc/nanorc') install=nano.install -source=(http://www.nano-editor.org/dist/v2.2/${pkgname}-${pkgver}.tar.gz) -md5sums=('03233ae480689a008eb98feb1b599807') +source=(http://www.nano-editor.org/dist/v2.4/${pkgname}-${pkgver}.tar.gz{,.asc}) +md5sums=('1c612b478f976abf8ef926480c7a3684' + 'SKIP') +validpgpkeys=('8DA6FE7BFA7A418AB3CB2354BCB356DF91009FA7') # "Chris Allegretta " build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --enable-color \ @@ -28,7 +30,7 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR=${pkgdir} install install -DTm644 ${srcdir}/${pkgname}-${pkgver}/doc/nanorc.sample ${pkgdir}/etc/nanorc } -- cgit v0.12 From ae74f97cf28e1cd48bf942433b7a944a93643fc7 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 3 Jul 2015 14:04:40 +0000 Subject: runit-scripts: msg_daemon: new xorg doesn't work with IP in DISPLAY --- abs/core/runit-scripts/PKGBUILD | 2 +- abs/core/runit-scripts/runitscripts/services/msg_daemon/run | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 844281b..798e3fd 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=8.3 -pkgrel=7 +pkgrel=8 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runitscripts/services/msg_daemon/run b/abs/core/runit-scripts/runitscripts/services/msg_daemon/run index 6f1b4b7..e998a08 100755 --- a/abs/core/runit-scripts/runitscripts/services/msg_daemon/run +++ b/abs/core/runit-scripts/runitscripts/services/msg_daemon/run @@ -5,5 +5,5 @@ export TERM=linux . /etc/rc.d/functions . /etc/profile stat_runit "Starting osd message daemon" -exec env DISPLAY=127.0.0.1:0 /usr/LH/bin/msg_daemon.py +exec env DISPLAY=:0.0 /usr/LH/bin/msg_daemon.py -- cgit v0.12 From 2ae97f9d9ade34c7149db121f622454d73a09631 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 4 Jul 2015 15:47:32 +0000 Subject: systemd: rebuild --- abs/core/systemd/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/systemd/PKGBUILD b/abs/core/systemd/PKGBUILD index ff7a51d..59b0955 100755 --- a/abs/core/systemd/PKGBUILD +++ b/abs/core/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=208 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' -- cgit v0.12 From d8b7fc9c01b31a60ea46804735ea8cef3e97eb03 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 4 Jul 2015 15:48:27 +0000 Subject: LinHES-system: LinHES-session: check machine-id and create if needed --- abs/core/LinHES-system/LinHES-session | 10 ++++++++++ abs/core/LinHES-system/PKGBUILD | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session index 4563078..ad8fb3c 100755 --- a/abs/core/LinHES-system/LinHES-session +++ b/abs/core/LinHES-system/LinHES-session @@ -391,6 +391,15 @@ function stop_plymouth() fi } +function machine-id_check() +{ + if [ ! -s /etc/machine-id ] + then + echo "Setting machine ID in /etc/machine-id" + sudo systemd-machine-id-setup + fi +} + if [ x"$WM" = "fluxbox" ] then @@ -412,6 +421,7 @@ notify_scan & auto_start & update_apple_trailers stop_plymouth & +machine-id_check & first_configure show_help_tip start_myth diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index bcf7a73..6b8670c 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.3 -pkgrel=12 +pkgrel=13 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -77,7 +77,7 @@ package() { } -md5sums=('8415c4b2587a8a1e6a312484c1edafcb' +md5sums=('76842f8cff548d2c1289e0992a8b84dd' 'de32a1c50101265dd7f6ca5037f7a26a' '2d7b8414ddce5f401331342ac1529c22' '76b2637cac0452b3acdbeeb4e8a5474b' -- cgit v0.12 From 7fa978207df77ce628db916c5308b7c450a6e9f6 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 5 Jul 2015 00:24:41 +0000 Subject: elfutils: update to 0.163 --- abs/core/elfutils/CVE-2014-0172.patch | 37 ------------------- abs/core/elfutils/PKGBUILD | 28 +++----------- .../fix-run-backtrace-native-core-test.patch | 43 ---------------------- 3 files changed, 6 insertions(+), 102 deletions(-) delete mode 100644 abs/core/elfutils/CVE-2014-0172.patch delete mode 100644 abs/core/elfutils/fix-run-backtrace-native-core-test.patch diff --git a/abs/core/elfutils/CVE-2014-0172.patch b/abs/core/elfutils/CVE-2014-0172.patch deleted file mode 100644 index 5f9541d..0000000 --- a/abs/core/elfutils/CVE-2014-0172.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7f1eec317db79627b473c5b149a22a1b20d1f68f Mon Sep 17 00:00:00 2001 -From: Mark Wielaard -Date: Wed, 9 Apr 2014 11:33:23 +0200 -Subject: [PATCH] CVE-2014-0172 Check for overflow before calling malloc to - uncompress data. - -https://bugzilla.redhat.com/show_bug.cgi?id=1085663 - -Reported-by: Florian Weimer -Signed-off-by: Mark Wielaard -diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c -index 79daeac..34ea373 100644 ---- a/libdw/dwarf_begin_elf.c -+++ b/libdw/dwarf_begin_elf.c -@@ -1,5 +1,5 @@ - /* Create descriptor from ELF descriptor for processing file. -- Copyright (C) 2002-2011 Red Hat, Inc. -+ Copyright (C) 2002-2011, 2014 Red Hat, Inc. - This file is part of elfutils. - Written by Ulrich Drepper , 2002. - -@@ -282,6 +282,12 @@ check_section (Dwarf *result, GElf_Ehdr *ehdr, Elf_Scn *scn, bool inscngrp) - memcpy (&size, data->d_buf + 4, sizeof size); - size = be64toh (size); - -+ /* Check for unsigned overflow so malloc always allocated -+ enough memory for both the Elf_Data header and the -+ uncompressed section data. */ -+ if (unlikely (sizeof (Elf_Data) + size < size)) -+ break; -+ - Elf_Data *zdata = malloc (sizeof (Elf_Data) + size); - if (unlikely (zdata == NULL)) - break; --- -1.9.2 - diff --git a/abs/core/elfutils/PKGBUILD b/abs/core/elfutils/PKGBUILD index 6a7485d..b971e94 100644 --- a/abs/core/elfutils/PKGBUILD +++ b/abs/core/elfutils/PKGBUILD @@ -3,32 +3,18 @@ # Contributor: Andrej Gelenberg pkgname=elfutils -pkgver=0.158 -pkgrel=2 +pkgver=0.163 +pkgrel=1 pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information" arch=('i686' 'x86_64') url="https://fedorahosted.org/elfutils/" license=('LGPL3' 'GPL' 'GPL3') depends=('gcc-libs' 'zlib' 'bzip2' 'xz') -provides=('libelf') -replaces=('libelf') -conflicts=('libelf') -source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig} - fix-run-backtrace-native-core-test.patch - CVE-2014-0172.patch) +source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}) options=('staticlibs') -sha1sums=('09adbbf0f3a35bb1bcb77c2eaa40de8d3443af4d' - 'SKIP' - '8ecef640f3d1229cdf45ffda016a69848c18e61b' - '3e776c07d6ca2c7604a384d266f79c3ece1fb179') - -prepare() { - cd ${pkgname}-${pkgver} - - patch -Np1 -i ../fix-run-backtrace-native-core-test.patch - # merged upstream - patch -Np1 -i ../CVE-2014-0172.patch -} +sha1sums=('7931b4961364a8a17c708138c70c552ae2881227' + 'SKIP') +validpgpkeys=('47CC0331081B8BC6D0FD4DA08370665B57816A6A') # Mark J. Wielaard build() { cd ${pkgname}-${pkgver} @@ -49,6 +35,4 @@ package() { cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - - rm "${pkgdir}"/usr/lib/lib{asm,dw,elf}.a } diff --git a/abs/core/elfutils/fix-run-backtrace-native-core-test.patch b/abs/core/elfutils/fix-run-backtrace-native-core-test.patch deleted file mode 100644 index 5088ea5..0000000 --- a/abs/core/elfutils/fix-run-backtrace-native-core-test.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e922ec4e3bcd7c164a9ce424accac4394e7d5afd Mon Sep 17 00:00:00 2001 -From: Matthias Klose -Date: Tue, 07 Jan 2014 09:25:29 +0000 -Subject: tests: backtrace-subr.sh (check_native_core) should check core file name. - -Needed when /proc/sys/kernel/core_uses_pid is set to 0. Try to rename -the core file, and if it does still fail, skip the test. - -Signed-off-by: Mark Wielaard ---- -diff --git a/tests/ChangeLog b/tests/ChangeLog -index 63b7bed..7e9dcf4 100644 ---- a/tests/ChangeLog -+++ b/tests/ChangeLog -@@ -1,3 +1,9 @@ -+2014-01-07 Matthias Klose -+ -+ * backtrace-subr.sh (check_native_core): Check to see if core file -+ was created without ".PID" extension, if so mv core to core.PID. -+ Skip test if no core file was created or could be found. -+ - 2014-01-04 Mark Wielaard - - * backtrace-data.c (main): Don't assert if raise returns. -diff --git a/tests/backtrace-subr.sh b/tests/backtrace-subr.sh -index e7ece91..62b873c 100644 ---- a/tests/backtrace-subr.sh -+++ b/tests/backtrace-subr.sh -@@ -111,6 +111,11 @@ check_native_core() - - # Skip the test if we cannot adjust core ulimit. - core="core.`ulimit -c unlimited || exit 77; set +ex; testrun ${abs_builddir}/$child --gencore; true`" -+ # see if /proc/sys/kernel/core_uses_pid is set to 0 -+ if [ -f core ]; then -+ mv core "$core" -+ fi -+ if [ ! -f "$core" ]; then exit 77; fi - - if [ "x$SAVED_VALGRIND_CMD" != "x" ]; then - VALGRIND_CMD="$SAVED_VALGRIND_CMD" --- -cgit v0.9.2 - -- cgit v0.12 From d3910d114d7c89f95c39765fc0e716f8ecae7b84 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 5 Jul 2015 00:28:42 +0000 Subject: prelink: initial inclusion. dep of plex-media-server --- abs/extra/prelink/PKGBUILD | 39 ++++++++++++++++++++++++++++++++++++++ abs/extra/prelink/prelink.conf | 43 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 abs/extra/prelink/PKGBUILD create mode 100644 abs/extra/prelink/prelink.conf diff --git a/abs/extra/prelink/PKGBUILD b/abs/extra/prelink/PKGBUILD new file mode 100644 index 0000000..7dace86 --- /dev/null +++ b/abs/extra/prelink/PKGBUILD @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Alexander Rødseth +# Contributor: Lukas Fleischer +# Contributor: Juergen Hoetzel +# Contributor: Rouslan Solomakhin + +pkgname=prelink +pkgver=20130503 +pkgrel=4 +pkgdesc='ELF prelinking utility to speed up dynamic linking' +arch=('x86_64' 'i686') +url='http://people.redhat.com/jakub/prelink/' +license=('GPL') +depends=('elfutils') +makedepends=('elfutils' 'libtool') +backup=('etc/prelink.conf') +source=("http://people.redhat.com/jakub/$pkgname/$pkgname-$pkgver.tar.bz2" + 'prelink.conf') +sha256sums=('6339c7605e9b6f414d1be32530c9c8011f38820d36431c8a62e8674ca37140f0' + 'a149b15b3b4f4ebf931b606e560289fa0a00a08f32855dc1c743485fec704381') + +build() { + cd "$pkgname" + + ./configure --prefix=/usr --mandir=/usr/share/man --sbin=/usr/bin \ + --disable-static --with-gnu-ld + make +} + +check() { + make -C "$pkgname" check +} + +package() { + make -C "$pkgname" DESTDIR="$pkgdir" install + install -Dm644 prelink.conf "$pkgdir/etc/prelink.conf" +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/extra/prelink/prelink.conf b/abs/extra/prelink/prelink.conf new file mode 100644 index 0000000..038c239 --- /dev/null +++ b/abs/extra/prelink/prelink.conf @@ -0,0 +1,43 @@ +# From: https://wiki.archlinux.org/index.php/Talk:Prelink +# See also: FS#40579 and FS#44727 + +# System +/usr/lib +/usr/lib32 +/usr/bin + +# Not using prelink for the following: + +# Skype +-b /usr/lib32/skype/skype +-b /usr/lib/skype/skype + +# Ruby +-b /usr/bin/ruby + +# Flash Player Plugin +-b /usr/lib/mozilla/plugins/libflashplayer.so + +# NVIDIA +-b /usr/lib/libGL.so* +-b /usr/lib32/libGL.so* +-b //usr/lib/libOpenCL.so* +-b //usr/lib32/libOpenCL.so* +-b /usr/lib32/vdpau/ +-b /usr/lib/vdpau/ +-b /usr/lib/xorg/modules/drivers/nvidia_drv.so +-b /usr/lib/xorg/modules/extensions/libglx.so* +-b /usr/lib/libnvidia-* +-b /usr/lib32/libnvidia-* + +# Catalyst +-b /usr/lib/libati* +-b /usr/lib/fglrx* +-b /usr/lib/libAMDXvBA* +-b /usr/lib/libGL.so* +-b /usr/lib/libfglrx* +-b /usr/lib/xorg/modules/dri/fglrx_dri.so +-b /usr/lib/xorg/modules/drivers/fglrx_drv.so +-b /usr/lib/xorg/modules/extensions/fglrx/ +-b /usr/lib/xorg/modules/linux/libfglrxdrm.so +-b /usr/lib/xorg/modules/extensions/libglx.so -- cgit v0.12 From d39f95aa83e0f76ab255322fbfcd35b23236f0a7 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 5 Jul 2015 16:26:59 +0000 Subject: pacman: update to 4.2.1 --- ...1-pacman-key-compatibility-with-gnupg-2.1.patch | 27 ------ abs/core/pacman/PKGBUILD | 21 ++--- abs/core/pacman/__changelog | 1 + abs/core/pacman/makepkg.conf | 12 ++- abs/core/pacman/pacman.conf | 95 ---------------------- abs/core/pacman/pacman.install | 65 +-------------- 6 files changed, 20 insertions(+), 201 deletions(-) delete mode 100644 abs/core/pacman/0001-pacman-key-compatibility-with-gnupg-2.1.patch delete mode 100644 abs/core/pacman/pacman.conf diff --git a/abs/core/pacman/0001-pacman-key-compatibility-with-gnupg-2.1.patch b/abs/core/pacman/0001-pacman-key-compatibility-with-gnupg-2.1.patch deleted file mode 100644 index 65b72ef..0000000 --- a/abs/core/pacman/0001-pacman-key-compatibility-with-gnupg-2.1.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 41c8263ba289dac191d7f74faaa62476baf41c28 Mon Sep 17 00:00:00 2001 -From: Tobias Powalowski -Date: Fri, 21 Nov 2014 20:54:58 +1000 -Subject: [PATCH] pacman-key: compatibility with gnupg-2.1 - -GnuPG 2.1 no longer allow empty passphrases by default. - -Signed-off-by: Allan McRae ---- - scripts/pacman-key.sh.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in -index ba8d02e..5ba0ad8 100644 ---- a/scripts/pacman-key.sh.in -+++ b/scripts/pacman-key.sh.in -@@ -151,6 +151,7 @@ Key-Usage: sign - Name-Real: Pacman Keyring Master Key - Name-Email: pacman@localhost - Expire-Date: 0 -+%no-protection - %commit - %echo Done - EOF --- -2.1.3 - diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD index 4e0fbf9..f2d4507 100644 --- a/abs/core/pacman/PKGBUILD +++ b/abs/core/pacman/PKGBUILD @@ -4,39 +4,34 @@ # Maintainer: Dave Reisner pkgname=pacman -pkgver=4.1.2 -pkgrel=7 +pkgver=4.2.1 +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.17-2' 'libarchive>=3.1.2' 'curl>=7.19.4' +depends=('bash' 'glibc' 'libarchive>=3.1.2' 'curl>=7.39.0' 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring') +makedepends=('asciidoc') # roundup patch alters docs 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=('strip' 'debug') -source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} - 0001-pacman-key-compatibility-with-gnupg-2.1.patch +source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} pacman.conf.i686 pacman.conf.x86_64 makepkg.conf) -md5sums=('063c8b0ff6bdf903dc235445525627cd' +md5sums=('2a596fc8f723e99660c0869a74afcf47' 'SKIP' - 'd0e015b1bf78cbf9762d9c44ea5f77a9' '2db6c94709bb30cc614a176ecf8badb1' 'de74a13618347f08ae4a9637f74471c4' - '2da6544e387f940588a90cb4b9b914e2') + '03d578816b56852d803cbafac85b9f09') validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD') # Allan McRae -prepare() { - cd "$pkgname-$pkgver" - patch -p1 -i $srcdir/0001-pacman-key-compatibility-with-gnupg-2.1.patch -} build() { cd "$pkgname-$pkgver" diff --git a/abs/core/pacman/__changelog b/abs/core/pacman/__changelog index e69de29..56adaed 100644 --- a/abs/core/pacman/__changelog +++ b/abs/core/pacman/__changelog @@ -0,0 +1 @@ +PKGBUILD: add pacman.install diff --git a/abs/core/pacman/makepkg.conf b/abs/core/pacman/makepkg.conf index 8cf5faa..e147806 100644 --- a/abs/core/pacman/makepkg.conf +++ b/abs/core/pacman/makepkg.conf @@ -19,6 +19,13 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o % # /usr/bin/lftpget -c # /usr/bin/wget +#-- The package required by makepkg to download VCS sources +# Format: 'protocol::package' +VCSCLIENTS=('bzr::bzr' + 'git::git' + 'hg::mercurial' + 'svn::subversion') + ######################################################################### # ARCHITECTURE, COMPILE FLAGS ######################################################################### @@ -43,17 +50,16 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign) +# Defaults: BUILDENV=(!distcc color !ccache check !sign) # A negated environment option will do the opposite of the comments below. # -#-- fakeroot: Allow building packages as a non-root user #-- distcc: Use the Distributed C/C++/ObjC compiler #-- color: Colorize output messages #-- ccache: Use ccache to cache compilation #-- check: Run the check() function if present in the PKGBUILD #-- sign: Generate PGP signature file # -BUILDENV=(fakeroot !distcc color !ccache check !sign) +BUILDENV=(!distcc color !ccache check !sign) # #-- If using DistCC, your MAKEFLAGS will also need modification. In addition, #-- specify a space-delimited list of hosts running in the DistCC cluster. diff --git a/abs/core/pacman/pacman.conf b/abs/core/pacman/pacman.conf deleted file mode 100644 index 0596b7a..0000000 --- a/abs/core/pacman/pacman.conf +++ /dev/null @@ -1,95 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives - -# -# GENERAL OPTIONS -# -[options] -# The following paths are commented out with their default values listed. -# If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#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 -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -#UseDelta -#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 - -# 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 -# packagers with `pacman-key --populate archlinux`. - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here -# - local/custom mirrors can be added here or in separate files -# - repositories listed first will take precedence when packages -# have identical names, regardless of version number -# - URLs will have $repo replaced by the name of the current repo -# - URLs will have $arch replaced by the name of the architecture -# -# Repository entries are of the format: -# [repo-name] -# Server = ServerName -# Include = IncludePath -# -# The header [repo-name] is crucial - it must be present and -# uncommented to enable the repo. -# - -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# 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 - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#SigLevel = Optional TrustAll -#Server = file:///home/custompkgs - diff --git a/abs/core/pacman/pacman.install b/abs/core/pacman/pacman.install index 42b2808..2c599c3 100644 --- a/abs/core/pacman/pacman.install +++ b/abs/core/pacman/pacman.install @@ -2,76 +2,15 @@ # arg 1: the new package version # arg 2: the old package version post_upgrade() { - # one time stuff for md5sum issue with older pacman versions - if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then - _resetbackups - fi - if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then + if [ "$(vercmp $2 4.2.0)" -lt 0 ]; then _warnupgrade fi - 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() { - _check_pubring -} - -_check_pubring() { - echo " >>> Run \`pacman-key --init; pacman-key --populate archlinux\`" - echo " >>> to import the data required by pacman for package verification." - echo " >>> See: https://www.archlinux.org/news/having-pacman-verify-packages" -} - _warnupgrade() { - echo ">>> The pacman database format has changed as of pacman 3.5.0." + echo ">>> The pacman database format has changed as of pacman 4.2.0." echo ">>> You will need to run \`pacman-db-upgrade\` as root." echo ">>>" } - -_resetbackups() { - echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset" - echo ">>> you are able to remove all NoUpgrade lines of already protected" - echo ">>> files from pacman.conf." - echo ">>>" - - # path variables - pacconf="/etc/pacman.conf" - dbpath="/var/lib/pacman/local" - - # get a list of NoUpgrade files from the user's pacman.conf - echo ">>> Retrieving pacman.conf NoUpgrade list..." - config=$(grep "^NoUpgrade" $pacconf | cut -d'=' -f2) - # add the standard list of files, even if they are already above - config="$config \ - etc/passwd etc/group etc/shadow etc/sudoers \ - etc/fstab etc/raidtab etc/ld.so.conf \ - etc/rc.conf etc/rc.local \ - etc/modprobe.conf etc/modules.conf \ - etc/lilo.conf boot/grub/menu.lst" - - # blank md5sum for use in sed expression - zeroes='00000000000000000000000000000000' - - for file in $config; do - echo ">>> -> finding owner of /$file..." - line=$(LC_ALL=C LANG=C pacman -Qo /$file 2>/dev/null) - # if file is owned by a package, go find its incorrectly stored sum - if [ ! -z "$line" ]; then - # get the name and version of the package owning file - name=$(echo $line | awk '{print $5}') - version=$(echo $line | awk '{print $6}') - # set the path to the backup array holding the md5sum - path="$dbpath/$name-$version/files" - # run a sed on the path to reset the line containing $file - # NOTE: literal tab characters in sed expression after $file - echo ">>> -> resetting sum of /$file..." - sed -i "s#$file [0-9a-fA-F]*#$file $zeroes#" $path - else - echo ">>> -> $file is unowned." - fi - done -} -- cgit v0.12 From cb62d17450b7cc365a7bdbe0dac232af4d22faab Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 5 Jul 2015 18:42:40 +0000 Subject: pacman: add makepkg asroot patch --- abs/core/pacman/PKGBUILD | 16 ++++++++++------ abs/core/pacman/__changelog | 2 ++ abs/core/pacman/makepkg-asroot.patch | 22 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 abs/core/pacman/makepkg-asroot.patch diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD index f2d4507..a0cbdc2 100644 --- a/abs/core/pacman/PKGBUILD +++ b/abs/core/pacman/PKGBUILD @@ -5,7 +5,7 @@ pkgname=pacman pkgver=4.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" @@ -21,18 +21,18 @@ replaces=('pacman-contrib') backup=(etc/pacman.conf etc/makepkg.conf) install=pacman.install options=('strip' 'debug') -source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} +source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf.i686 pacman.conf.x86_64 - makepkg.conf) + makepkg.conf + makepkg-asroot.patch) md5sums=('2a596fc8f723e99660c0869a74afcf47' - 'SKIP' '2db6c94709bb30cc614a176ecf8badb1' 'de74a13618347f08ae4a9637f74471c4' - '03d578816b56852d803cbafac85b9f09') + '03d578816b56852d803cbafac85b9f09' + 'bd3319d98bfc9560b0a765241f9ad80c') validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD') # Allan McRae - build() { cd "$pkgname-$pkgver" @@ -88,4 +88,8 @@ package() { done install -Dm644 contrib/PKGBUILD.vim "$pkgdir/usr/share/vim/vimfiles/syntax/PKGBUILD.vim" + + #restore --asroot makepkg option + cd $pkgdir/usr/bin/ + patch -p0 -i $srcdir/makepkg-asroot.patch } diff --git a/abs/core/pacman/__changelog b/abs/core/pacman/__changelog index 56adaed..35b3de6 100644 --- a/abs/core/pacman/__changelog +++ b/abs/core/pacman/__changelog @@ -1 +1,3 @@ PKGBUILD: add pacman.install +PKGBUILD: add makepkg-asroot.patch +PKGBUILD: remove source sig diff --git a/abs/core/pacman/makepkg-asroot.patch b/abs/core/pacman/makepkg-asroot.patch new file mode 100644 index 0000000..f45f0ee --- /dev/null +++ b/abs/core/pacman/makepkg-asroot.patch @@ -0,0 +1,22 @@ +--- makepkg.orig 2015-02-16 13:15:31.079071494 +0000 ++++ makepkg 2015-02-16 13:18:14.735730577 +0000 +@@ -3372,7 +3372,7 @@ + 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild' + 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' 'repackage' + 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' +- 'verifysource' 'version') ++ 'verifysource' 'version' 'asroot') + + # Pacman Options + OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar') +@@ -3581,9 +3581,7 @@ + + if (( ! INFAKEROOT )); then + if (( EUID == 0 )); then +- error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\ +-catastrophic damage to your system.")" "makepkg" +- exit 1 # $E_USER_ABORT ++ : + fi + else + if [[ -z $FAKEROOTKEY ]]; then -- cgit v0.12 From 5cacb421450d963a30f69ecf40ff437c35e3da49 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 15 Jul 2015 17:53:00 +0000 Subject: runit-scripts: add plexmediaserver --- abs/core/runit-scripts/PKGBUILD | 2 +- .../runitscripts/services/plexmediaserver/run | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100755 abs/core/runit-scripts/runitscripts/services/plexmediaserver/run diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 798e3fd..d257ffe 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=8.3 -pkgrel=8 +pkgrel=9 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runitscripts/services/plexmediaserver/run b/abs/core/runit-scripts/runitscripts/services/plexmediaserver/run new file mode 100755 index 0000000..6d0b04e --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/plexmediaserver/run @@ -0,0 +1,20 @@ +#!/bin/sh +exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/plexmediaserver +. /etc/locale.conf + +stat_runit "Starting Plex Media Server" +export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" +export PLEX_MEDIA_SERVER_HOME="${PLEX_MEDIA_SERVER_HOME}" +export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" +export PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="${PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS}" +export PLEX_MEDIA_SERVER_TMPDIR="${PLEX_MEDIA_SERVER_TMPDIR}" +export TMPDIR="${TMPDIR}" +export LC_ALL="${LANG}" +export LANG="${LANG}" +ulimit -s 3000 + +exec chpst -uplex:plex /opt/plexmediaserver/Plex\ Media\ Server -- cgit v0.12 From 8818abda9545c04ebf135fef63a2baa7ebec9e49 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 15 Jul 2015 18:17:51 +0000 Subject: plex-media-server: inital inclusion. --- abs/extra/plex-media-server/MKPKG | 3 + abs/extra/plex-media-server/PKGBUILD | 61 ++++++++++++ abs/extra/plex-media-server/__changelog | 4 + .../plex-media-server/plex-media-server.install | 41 ++++++++ abs/extra/plex-media-server/plexmediaserver.conf.d | 6 ++ .../plex-media-server/plexmediaserver.service | 18 ++++ abs/extra/plex-media-server/terms.txt | 109 +++++++++++++++++++++ 7 files changed, 242 insertions(+) create mode 100644 abs/extra/plex-media-server/MKPKG create mode 100644 abs/extra/plex-media-server/PKGBUILD create mode 100644 abs/extra/plex-media-server/__changelog create mode 100644 abs/extra/plex-media-server/plex-media-server.install create mode 100644 abs/extra/plex-media-server/plexmediaserver.conf.d create mode 100644 abs/extra/plex-media-server/plexmediaserver.service create mode 100644 abs/extra/plex-media-server/terms.txt diff --git a/abs/extra/plex-media-server/MKPKG b/abs/extra/plex-media-server/MKPKG new file mode 100644 index 0000000..01a47b4 --- /dev/null +++ b/abs/extra/plex-media-server/MKPKG @@ -0,0 +1,3 @@ +pkgname=('plex-media-server') + +# vim: ts=2 sw=2 et: diff --git a/abs/extra/plex-media-server/PKGBUILD b/abs/extra/plex-media-server/PKGBUILD new file mode 100644 index 0000000..f5e11a1 --- /dev/null +++ b/abs/extra/plex-media-server/PKGBUILD @@ -0,0 +1,61 @@ +# Maintainer: Maxime Gauduin +# Contributor: Rob Sletten +# Contributor: Tom Moore +# Contributor: monty +# Contributor: Jon Wiersma +# Contributor: Arthur +# Contributor: Praekon + +pkgname=plex-media-server +pkgver=0.9.12.4.1192 +_pkgsum=9a47d21 +pkgrel=2 +pkgdesc='Plex Media Server' +arch=('arm' 'armv7h' 'i686' 'x86_64') +url='https://plex.tv/' +license=('custom') +depends=('systemd' 'runit-scripts>=8.3-9') +makedepends=('prelink') +replaces=('plexmediaserver') +conflicts=('plexmediaserver' 'plexmediaserver-plexpass') +backup=('etc/conf.d/plexmediaserver') +install='plex-media-server.install' +source=('plexmediaserver.conf.d' + 'plexmediaserver.service' + 'terms.txt') +source_arm=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/PlexMediaServer-${pkgver}-${_pkgsum}-arm.spk") +source_armv7h=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/PlexMediaServer-${pkgver}-${_pkgsum}-arm7.spk") +source_i686=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/plexmediaserver-${pkgver}-${_pkgsum}.i386.rpm") +source_x86_64=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/plexmediaserver-${pkgver}-${_pkgsum}.x86_64.rpm") + +prepare() { + if [[ $CARCH =~ arm* ]]; then + mkdir -p usr/lib/plexmediaserver + tar -xf package.tgz -C usr/lib/plexmediaserver/ + fi + + #Fix for SELinux and Grsecurity + execstack -c usr/lib/plexmediaserver/libgnsdk_dsp.so* +} + +package() { + install -dm 755 "${pkgdir}"/{opt,etc/conf.d,usr/lib/systemd/system} + cp -dr --no-preserve='ownership' usr/lib/plexmediaserver "${pkgdir}"/opt/ + install -m 644 plexmediaserver.service "${pkgdir}"/usr/lib/systemd/system/ + install -m 644 plexmediaserver.conf.d "${pkgdir}"/etc/conf.d/plexmediaserver + +# install -dm 755 "${pkgdir}"/data/storage/disk0/media/plex +# chown 421:421 -R "${pkgdir}"/data/storage/disk0/media/plex + + install -dm 755 "${pkgdir}"/usr/share/licenses/plex-media-server + install -m 644 terms.txt "${pkgdir}"/usr/share/licenses/plex-media-server/ +} + +# vim: ts=2 sw=2 et: +md5sums=('b67fd10314ab756169ec963f710cb9e3' + '34268b981e3b8c833a0e2270429232a6' + 'bd703bc750b989a27edd590eb8c8e9d7') +md5sums_arm=('53b2d858284dfe75610b9ec08162198e') +md5sums_armv7h=('630780e6b18a5fb67ab4a26ebac2a4ec') +md5sums_i686=('b10dc378e66cd8cff5cbfdf6ad0ae540') +md5sums_x86_64=('0426a8a700dd38887c978beca6e45580') diff --git a/abs/extra/plex-media-server/__changelog b/abs/extra/plex-media-server/__changelog new file mode 100644 index 0000000..2f71af6 --- /dev/null +++ b/abs/extra/plex-media-server/__changelog @@ -0,0 +1,4 @@ +.install & conf.d - change /var/lib/plex to /data/storage/disk0/media/plex +conf.d - change /tmp to data/storage/disk0/media/tmp +plex-media-server.install - add_service.sh in post_install; remove_service.sh in post_remove +PKGBUILD - move creation of /data/storage/disk0/media/plex to .install diff --git a/abs/extra/plex-media-server/plex-media-server.install b/abs/extra/plex-media-server/plex-media-server.install new file mode 100644 index 0000000..ac4a349 --- /dev/null +++ b/abs/extra/plex-media-server/plex-media-server.install @@ -0,0 +1,41 @@ +post_install() { + if [[ ! -d /data/storage/disk0/media/plex ]]; then + install -dm 755 /data/storage/disk0/media/plex + chown 421:421 -R /data/storage/disk0/media/plex + fi + if [[ -n $(getent group 421) && $(getent group 421) != $(getent group plex) ]]; then + echo "GID 421 is already assigned to the $(getent group 421 | cut -d':' -f1) group, cannot create the plex group." + elif [[ -n $(getent passwd 421) && $(getent passwd 421) != $(getent passwd plex) ]]; then + echo "UID 421 is already assigned to the $(getent passwd 421 | cut -d':' -f1) user, cannot create the plex user." + else + if [[ -n $(getent passwd plex) && $(getent passwd plex) != 'plex:x:421:421:Plex User:/data/storage/disk0/media/plex:/usr/bin/nologin' ]]; then + echo "The plex user is outdated. It will be removed and recreated." + if [[ -z $(pidof "Plex Media Server") ]]; then + userdel plex + chown 421:421 -R /data/storage/disk0/media/plex + else + echo "Unable to update the plex user. Please stop plexmediaserver.service and reinstall the package." + fi + fi + if [[ -z $(getent group plex) ]]; then + groupadd -g 421 plex + fi + if [[ -z $(getent passwd plex) ]]; then + useradd -c 'Plex User' -u 421 -g plex -d /data/storage/disk0/media/plex -s /usr/bin/nologin plex + fi + passwd -l plex > /dev/null + fi + add_service.sh plexmediaserver +} + +post_upgrade() { + post_install + if [[ $(vercmp 0.9.11.1.678-1 $2) == '1' ]]; then + echo "Plex' home is now located in '/var/lib/plex'. You will have to move the 'Plex Media Server' directory located in '/opt/plexmediserver/Library/Application Support' into the new home. Please refer to 'https://support.plex.tv/hc/en-us/articles/201370363-Move-an-Install-to-Another-System' for detailed instructions." + fi +} + +post_remove() { + remove_service.sh plexmediaserver +} +# vim: ts=2 sw=2 et: diff --git a/abs/extra/plex-media-server/plexmediaserver.conf.d b/abs/extra/plex-media-server/plexmediaserver.conf.d new file mode 100644 index 0000000..d2a0190 --- /dev/null +++ b/abs/extra/plex-media-server/plexmediaserver.conf.d @@ -0,0 +1,6 @@ +LD_LIBRARY_PATH=/opt/plexmediaserver +PLEX_MEDIA_SERVER_HOME=/opt/plexmediaserver +PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=/data/storage/disk0/media/plex +PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=6 +PLEX_MEDIA_SERVER_TMPDIR=/data/storage/disk0/media/tmp +TMPDIR=/data/storage/disk0/media/tmp diff --git a/abs/extra/plex-media-server/plexmediaserver.service b/abs/extra/plex-media-server/plexmediaserver.service new file mode 100644 index 0000000..9206301 --- /dev/null +++ b/abs/extra/plex-media-server/plexmediaserver.service @@ -0,0 +1,18 @@ +[Unit] +Description=Plex Media Server +After=network.target + +[Service] +EnvironmentFile=/etc/conf.d/plexmediaserver +ExecStart=/opt/plexmediaserver/Plex\x20Media\x20Server +Type=simple +User=plex +Group=plex +Restart=on-failure +RestartSec=5 +StartLimitInterval=60s +StartLimitBurst=3 +StandardOutput=null + +[Install] +WantedBy=multi-user.target diff --git a/abs/extra/plex-media-server/terms.txt b/abs/extra/plex-media-server/terms.txt new file mode 100644 index 0000000..afe675f --- /dev/null +++ b/abs/extra/plex-media-server/terms.txt @@ -0,0 +1,109 @@ +Plex Terms of Service +Last modified December 21st, 2013 + +Thank you for using Plex! By accessing, using, downloading, or visiting any Plex “Service(s)”, which includes the Plex website, Plex software and products described here, and any other products or materials provided by Plex, you agree to the terms (“Terms”) listed in this agreement (“Agreement”). Plex reserves the right to amend these Terms at any time and without notice. Any revisions to the Terms will be posted on the Plex website. By continuing to access or use the Services, you accept any changes or revisions to the Terms. + +Plex Software + + Plex gives you a personal, non-commercial, worldwide, royalty-free, revocable, non-transferable, non-sublicensable, and non-exclusive license to use the software provided to you by Plex as part of the Services (“Software”). This license is for the sole purpose of enabling you to use and enjoy the benefit of the Services in the manner permitted by these Terms. + The Software includes certain executable modules that Plex has licensed from third party providers (“Third Party Components”) that may be subject to different end user license terms as specified in the license agreement(s) provided with such Third Party Components. + You may not, or allow anyone else to, directly or indirectly to: (1) copy, modify, distribute, sell, or lease any part of the Software; (2) reverse engineer, disassemble, decompile, or otherwise attempt to discover the source code or structure, sequence, and/or organization of all or any part of the Software, unless laws prohibit those restrictions or you have our written permission; (3) rent, lease, or use the Software for timesharing or service bureau purposes; (4) develop any improvement, modification, or derivative works of the Software, or include any portion thereof in any other product, software, work, equipment, or item (except that you may customize and/or modify the Software only as set forth in the documentation or as authorized in any license agreement of Plex’s third party licensors and applicable to Third Party Components); or (5) allow the transfer, transmission, export, or re-export of the Software or any portion thereof or any technical data associated with any Software. + You shall not incorporate any of Plex’s Software or any part thereof into any other product(s) or use the proprietary software in any manner that would cause the proprietary software to become subject to any “open source license” that would impose obligations on Plex’s use of the proprietary software or impair any rights of Plex or third parties thereto. + You shall maintain and shall not remove nor obscure any proprietary notices on the Software, and shall reproduce such notices exactly on all permitted copies of the Software. + You may reverse engineer the Software solely (1) as permitted by applicable law, or (2) for the purpose of debugging modifications made by you to certain third party files in source code format that are licensed under the GNU Lesser General Public License (LGPL) or under the GNU General Public License diversion 2 (GPL2) and only provided that you have made, prior to any such reverse engineering permitted under this sentence, unsuccessful prior reasonable good faith efforts to debug such modifications using techniques other than the reverse engineering of the Software. + As between the parties and except as otherwise provided in any license agreement for Third Party Components, Plex shall own all title, ownership rights, and intellectual property rights in and to the Software, and any copies or derivative works thereof, except that by downloading the Software, you retain any title that you may own in and to the recording media on which the Software is recorded. + You understand that Plex or its licensors may modify or discontinue offering the Services at any time. + You shall not make, or assist others in making, any use of data adapters or similar technologies used by or with the Services that are designed to receive and use data from Plex, its third party data providers, and their affiliates and third parties, other than to receive and use such data in accordance with these Terms and your agreement with the third party data providers, and their affiliates and third parties, including without limitation any data passing through the Services or otherwise effectively made available by any Service through an API, a download, a database, or the like. + This Agreement does not entitle you to any support, upgrades, patches, enhancements, or fixes (collectively, "Support") for the Services. Any such Support for the Services that may be made available by Plex, in its sole discretion, shall become part of the Services and will be subject to these Terms. + +Data + +Data provided by Plex or other third party data providers may be delayed or unavailable as specified by Plex or such third party data providers. Plex does not verify any data provided by Plex or other third party data providers and disclaims any obligation to do so. Plex, its third party data providers, and each of their affiliates and business partners: (1) expressly disclaim the availability, accuracy, adequacy, or completeness of any data or third party data provider, and (2) shall not be liable for any errors, omissions, or other defects in, unavailability of, delays or interruptions in such data or third party data provider. + +Acceptable Use + + You may not, or allow anyone else to, use any of the Services to do the following: + Infringe the intellectual property rights, proprietary rights, or rights of publicity or privacy of any third party; + Violate any law, statute, ordinance, or regulation, or perform any other action that would incur civil liability or constitute a crime; + Disseminate, transfer or store information or materials in any form or format that is harmful, threatening, abusive, harassing, tortuous, defamatory, vulgar, obscene, libelous, or otherwise objectionable, or that otherwise violate any law or right of any third party; or + Disseminate any software viruses or any other computer code, files, programs, or the like that may without limitation interrupt, destroy, or limit the functionality of any computer software or hardware or telecommunications equipment, violate the security of any computer network, or the like. + If the occurrence of any prohibited use comes to our attention, we reserve the right to disable any accounts associated with prohibited use or otherwise terminate your access to the Services. + +Your Content + + You continue to retain any ownership rights you have in content you make available via the Services, or otherwise use in conjunction with the Services. However, by using the Services with particular content, for example by using the Services to share particular content or access particular content, you grant to Plex (and to each of the third parties with whom we work to provide you with the Services) a worldwide license to reproduce, modify, create derivative works, transmit, publish, publicly perform, publicly display, distribute, and otherwise use the particular content and metadata associated with the content, such as poster images. The rights you grant us in this license are only for the limited purpose of providing you with our Services. You may not use the Services in connection with any content for which you do not have the right to grant us this license. + The Services may include features that allow you to share your content with others. Please be careful when choosing to share content with other users; Plex is not responsible for how others use your content. Additionally, you hereby grant to any user with whom you share content a non-exclusive license to access the content through the Service, and to use, reproduce in copies, distribute, display and perform the shared content as permitted through the functionality of the Service and under this Agreement. You may not share any content with others via the Services if you do not have the right to grant this license to any user with whom you share the content. + You understand that all content imported, published, shared, transmitted, or otherwise made available via the Services is the sole responsibility of the person from whom such content originated, and that you, and not Plex, are solely responsible for any civil or criminal legal liability that may arise or result from any content that you import, publish, share, transmit, or otherwise make available through your use of the Services. + +Content of Others + + You acknowledge that all content that you access through use of the Software or other Services is accessed at your own risk, and you will be solely responsible for any damage or liability to any party resulting from such access. + You understand that by using the Services you may encounter content that you may find offensive, indecent, or objectionable. Plex does not inspect, screen, or otherwise control the content that is posted, shared or made available via the Services, and Plex does not guarantee the accuracy, integrity or quality of such content. + You acknowledge that unauthorized use of copyrighted content of others may subject you to civil and criminal penalties, including possible monetary damages, for copyright infringement. + +Developers and Interfacing Software + + "Interfacing Software" means any software that you obtain or provide and that accesses or calls any Software provided by Plex as part of the Services including, but not limited to, plug-ins for the Services, channel plug-ins, metadata agents, and client applications that communicate directly or indirectly with the Services. + By making, or assisting others in making, Interfacing Software, you agree to the following terms: + You grant Plex and its affiliates worldwide a worldwide, non-exclusive, and royalty-free right and license to use (including testing, hosting and linking to), copy, publicly perform, publicly display, reproduce in copies for distribution, and distribute the copies of any Interfacing Software made by you or with your assistance. + You may notify us at legal@plex.tv if you do not wish for Plex to use, distribute, copy, publicly perform, publicly display, reproduce in copies for distribution, or distribute copies of any Interfacing Software that was created by you. Plex will comply with such a request but Plex must be granted a transition period of thirty (30) days after receipt of the request to comply. A request to take down Interfacing Software must include (1) an identification of the Interfacing Software you wish to be removed; (2) your signature in either electronic or physical form; and (3) the following statements: + "I swear under penalty of perjury that I am the owner of the Interfacing Software or I am authorized to act on behalf of the owner of the Interfacing Software.” + "I swear under penalty of perjury that the information in this notification is accurate.” + You shall protect the privacy and legal rights of Plex users. If the users provide, or the Interfacing Software accesses or uses, user names, passwords, or other login information or personal information, you must make the users aware that such information will be available to the Interfacing Software, and you must provide privacy notices and protection for those users in compliance with applicable law. Further, the Interfacing Software may use that information only for the limited purposes for which the user has given you permission to do so. If the Interfacing Software stores personally identifying information of users or information that a reasonable user would consider to be sensitive, then the Interfacing Software must do so securely and only for as long as it is needed. However, if the user has opted or entered into a separate agreement with you that allows you or the Interfacing Software to store or use personally identifying information of users or information that a reasonable user would consider to be sensitive, then the terms of that separate agreement will govern your use of such information. If the user provides the Interfacing Software with Plex account information, the Interfacing Software may only use that information to access the user’s Plex account when, and for the limited purposes for which, the user has given you permission to do so. + Prohibited Uses. Plex prohibits performing certain actions using the Interfacing Software. You shall not make, or assist others in making, any Interfacing Software that: + Knowingly violates a third party’s terms of service; + Violates any applicable laws or regulations; + Interferes with, disrupts, damages, harms, or accesses in an unauthorized manner the machines, hardware. devices, servers, networks, data, or other properties or services of any other party including, but not limited to, Plex users, Plex or any network operator; + Posts misleading information about an application’s purpose; + Infringes on the intellectual property rights of others; or + Performs any other prohibited action listed under “Acceptable Use” above. + You will require your end users to comply with any applicable law and these Terms. You will not knowingly enable your end users to violate applicable law or these Terms. + You shall indemnify and hold harmless Plex and its officers, directors, employees, contractors, licensors, suppliers, distributors, contractors, agents, and third party contributors from any claims, damages, liabilities, costs and fees (including reasonable attorney fees) arising from any use of the Interfacing Software or from Plex’s distribution of the Interfacing Software. + Brand Features and Attribution + "Brand Features" is defined as the trade names, trademarks, service marks, logos, domain names, and other distinctive brand features of a party. Except where expressly stated, these terms do not grant either party any right, title, or interest in or to the other party's Brand Features. Any use by you of Plex’s Brand Features (including any goodwill associated therewith) will inure to the benefit of Plex. Plex Brand Features include the Plex Play Logo (“>” in stylized format) and the trademarks, trade names and designs as may be identified from time to time in the Plex Trademark Notice that is posted at plex.tv/legal. + You must seek prior written approval from Plex to display Plex's Brand Features, including for the purpose of promoting or advertising that your Interfacing Software is for use in conjunction with Plex Services. Plex, in its sole discretion and in a separate writing such as an e-mail from an authorized representative of Plex, may grant you a revocable, non-transferable, nonexclusive license, without right of sub-license, to display Plex's Brand Features for the purpose of promoting or advertising that your Interfacing Software is for use in conjunction with Plex Services. You understand and agree that Plex has the sole discretion to determine whether your attribution(s) and use of Plex's Brand Features are in accordance with the above requirements and guidelines and that Plex may revoke the license granted herein at any time, or may require you to modify your use of Plex’s Brand Features, for any reason in its sole discretion. + You will not make any statement that suggests a partnership with, sponsorship by, or endorsement by Plex, without Plex's express prior written approval. + In the course of promoting, marketing, or demonstrating the Services, Plex may produce and distribute incidental depictions, including screenshots, video, or other content from your Interfacing Software, and may use your company or product name. You grant us all necessary rights for the above purposes. + +Children + +While Plex does distribute products that may be used by children, the Services are not intended to be used by children, without involvement, supervision, and approval of a parent or legal guardian. Therefore, if an account owner sets parental controls or establishes sub-accounts that the account owner intends to permit a child to use, the account owner should not reveal the account password to the child. Plex and its contributors may not provide controls that restrict the maturity level of content available via Plex and an adult account owner has sole responsibility for determining what maturity level is appropriate for or accessible to any children whom the account owner permits to use the Plex service or a sub-account. + +NO WARRANTY + + PLEX SERVICES ARE PROVIDED "AS IS". PLEX MAKES NO WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, AND PLEX EXPRESSLY DISCLAIMS ALL WARRANTIES WITH RESPECT TO THE PLEX SERVICES, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. FURTHER, PLEX DOES NOT WARRANT AGAINST ERRORS, OMISSIONS, RESULTS OF USE, OR THAT PLEX SERVICES ARE BUG FREE OR ERROR FREE OR THAT USE WILL BE UNINTERRUPTED. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THE AGREEMENT. ALL THE FOREGOING DISCLAIMERS ALSO APPLY IN FULL WITH RESPECT TO PLEX'S LICENSORS, SUPPLIERS, DISTRIBUTORS, CONTRACTORS, AGENTS, AND THIRD PARTY CONTRIBUTORS. SOME STATES DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE LIMITATIONS MAY NOT APPLY TO YOU. + You agree that Plex and its officers, directors, employees, and contractors are not responsible for any fault, inaccuracy, error, omission, delay or any other failure of your equipment and/or services caused by Plex’s hardware, software, cabling, network services, or the like, or arising from Plex’s use of such equipment and/or services. + The above disclaimer of warranty applies to software developed by Plex and any software developed by a third party and provided by Plex including, but not limited to, Interfacing Software developed by any Plex user. + +Limitation of Liability and Damages + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, INCLUDING, BUT NOT LIMITED TO, TORT, CONTRACT, NEGLIGENCE, STRICT LIABILITY, OR OTHERWISE, SHALL PLEX BE LIABLE TO YOU OR ANY OTHER PERSON OR ENTITY: (I) FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, ACCURACY OF RESULTS, COMPUTER FAILURE OR MALFUNCTION, LOSS OF DATA, OR OTHER DAMAGES RESULTING FROM YOUR USE OF THE SOFTWARE; OR (II) FOR ANY MATTER BEYOND ITS REASONABLE CONTROL. PLEX'S AGGREGATE LIABILITY FOR DAMAGES OF ANY KIND WHATSOEVER ARISING OUT OF THIS AGREEMENT SHALL BE LIMITED TO THE LESSER OF THE TOTAL FEES PAID BY YOU TO PLEX (IF ANY) FOR THE PORTION OF THE SOFTWARE THAT GAVE RISE TO SUCH DAMAGES OR $100 (U.S.), EXCEPT WHERE NOT PERMITTED BY APPLICABLE LAW, IN WHICH CASE PLEX'S LIABILITY SHALL BE LIMITED TO THE MINIMUM AMOUNT PERMITTED BY SUCH APPLICABLE LAW. ALL THE FOREGOING LIMITATIONS SHALL APPLY EVEN IF EITHER PARTY HAS BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. ALL THE FOREGOING LIMITATIONS ALSO APPLY WITH RESPECT TO PLEX'S SUPPLIERS, LICENSORS, DISTRIBUTORS, CONTRACTORS, AGENTS, AND THIRD PARTY CONTRIBUTORS. SOME STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE ABOVE LIMITATION AND EXCLUSION MAY NOT APPLY TO YOU. + The above limitations and exclusions apply to software developed by Plex and any software developed by a third party and provided by Plex including, but not limited to, Interfacing Software developed by Plex user. + +Third-Party Materials + +This website and other Services may provide links to websites, software, or other materials provided by third parties. Plex does not endorse and is not responsible or liable for the availability, accuracy, safety, or intellectual property rights of or relating to such content. Plex is not liable for any harm caused by any such materials. + +Malware + +"Malware" means any known, discovered, envisioned, or invented, or any yet to be known, discovered, envisioned, or invented: (i) virus, Trojan horse, or any other harmful, harassing, or malicious software; or (ii) method, use, or means by which any software, firmware, equipment, device, communications medium, person, entity, or the like directly or indirectly engages in or is used for: (a) any unauthorized access; (b) any unauthorized communication; or (c) any cracks, hacks, exploits, or other activity, method, use, or means, that may cause harassment, harm, data loss, data theft, loss of communication, loss of privacy, or the like. You acknowledge that the Internet, Internet service providers, shared or dedicated telecommunication lines, wireless access points and wireless networks, other forms of communication, online resources including websites and cloud computing environments, or other means that you use to connect to the Software may not be secure and may be vulnerable to attack by third parties, and that it is possible to receive Malware by using the Internet, dedicated lines, other forms of communication, or other means. In order to protect the Software, you shall regularly obtain, use, and update appropriate third party software or other means to protect yourself from Malware and to detect and remove Malware that may be downloaded using the Internet, dedicated lines, other forms of communication, or other means. Plex does not warrant that the Software will be free of Malware including, but not limited to, Malware that is introduced by third parties, the Internet, dedicated lines, other forms of communication, or other means. + +Waiver and Indemnity + +You agree that Plex and its licensors, distributors, contractors, agents, and third party contributors shall have no liability whatsoever for any use you make of the Services. You shall indemnify and hold harmless Plex and its licensors, suppliers, distributors, contractors, agents, and third party contributors from any claims, damages, liabilities, costs and fees (including reasonable attorney fees) arising from your use of the Plex Services as well as from your failure to comply with any of the Terms, or any losses, damages, claims, costs, and/or attorneys’ fees arising from any use of or reliance upon any information received in connection with the Services that comprises or is based upon data provided by Plex or any third party. + +Termination of Services + +Plex may at any time, with or without cause and with or without prior notice, immediately terminate or suspend your Plex account or otherwise terminate or suspend your access to all or a portion of the Services. Cause for such termination may include: (a) violations of the Terms or any other policies or guidelines that are referenced herein; (b) a request by you to cancel or terminate your account; (c) a request and/or order from law enforcement, a judicial body, or other government agency; (d) where providing the Services to you is or may become unlawful; or (e) unexpected technical or security issues or problems; (f) your participation in fraudulent or illegal activities. Any such termination or suspension shall be made by Plex in its sole discretion and Plex will not be responsible to you or any third party for any damages that may result or arise out of such termination or suspension of your access to the Services. + +Miscellaneous + + This Agreement does not give you any rights not expressly and unambiguously granted herein. + No agency, partnership, joint venture, or employment is created as a result of this Agreement and you do not have any authority of any kind to bind Plex in any respect whatsoever. + If any provision of this Agreement is found to be unenforceable or invalid, that provision shall be limited or eliminated to the minimum extent necessary so that this Agreement shall otherwise remain in full force and effect and enforceable. + This Agreement is not assignable, transferable, or sublicensable by you except with Plex's prior written consent. Plex may transfer, assign, or delegate this Agreement and its rights and obligations without consent. + Plex's failure to enforce any right or provisions in this Agreement will not constitute a waiver of such or any other provision. + This Agreement shall be governed by and construed in accordance with the laws of the state of California, as if made within California between two residents thereof, and the parties submit to the exclusive jurisdiction of the Superior Court of Santa Clara County and the United States District Court for the Northern District of California. Notwithstanding the foregoing sentence, but without limiting Plex's right to seek injunctive or other equitable relief in any court of competent jurisdiction, any disputes arising with respect to this Agreement shall be referred to an arbitrator affiliated with the Judicial Arbitration and Mediation Services, Inc. ("JAMS"). The arbitrator shall be selected by joint agreement of the parties. In the event the parties cannot agree on an arbitrator within thirty (30) days of the initiating party providing the other party with written notice that it plans to seek arbitration, the parties shall each select an arbitrator affiliated with JAMS, which arbitrators shall jointly select a third such arbitrator to resolve the dispute. The written decision of the arbitrator shall be final and binding on the parties. The arbitration proceeding shall be carried on and heard in Santa Clara County, California using the English language and pursuant to the rules of (and administered by) JAMS. In any action or proceeding to enforce rights under this Agreement, the prevailing party will be entitled to recover costs and reasonable attorneys' fees from the other party. A separate written license agreement or order and signed by Plex and you or your company, employer, or principal may state other terms and conditions that apply to you, including terms relating to price, payment, delivery, confidential information, support services, and the like. You are solely responsible to review such terms or conditions with your company, employer or principal. In the event of any conflict in terms, the terms of the separate license agreement shall supersede the terms of this Agreement. + Both parties agree that this Agreement is the complete and exclusive statement of the mutual understanding of the parties and supersedes and cancels all previous written and oral agreements, communications, and other understandings relating to the subject matter of this Agreement. + + -- cgit v0.12 From 9768a70e6845b39e4b61f494aedc8f0c5757834c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 15 Jul 2015 18:48:24 +0000 Subject: pacman: automate updating pacman db --- abs/core/pacman/PKGBUILD | 22 ++++++++++++++-------- abs/core/pacman/__changelog | 1 + abs/core/pacman/pacman.cron | 20 ++++++++++++++++++++ abs/core/pacman/pacman.install | 2 ++ 4 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 abs/core/pacman/pacman.cron diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD index a0cbdc2..e592ff5 100644 --- a/abs/core/pacman/PKGBUILD +++ b/abs/core/pacman/PKGBUILD @@ -5,7 +5,7 @@ pkgname=pacman pkgver=4.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" @@ -25,12 +25,8 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf.i686 pacman.conf.x86_64 makepkg.conf - makepkg-asroot.patch) -md5sums=('2a596fc8f723e99660c0869a74afcf47' - '2db6c94709bb30cc614a176ecf8badb1' - 'de74a13618347f08ae4a9637f74471c4' - '03d578816b56852d803cbafac85b9f09' - 'bd3319d98bfc9560b0a765241f9ad80c') + makepkg-asroot.patch + pacman.cron) validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD') # Allan McRae build() { @@ -91,5 +87,15 @@ package() { #restore --asroot makepkg option cd $pkgdir/usr/bin/ - patch -p0 -i $srcdir/makepkg-asroot.patch + patch -p0 -i "$srcdir/makepkg-asroot.patch" + + #run pacman-db-upgrade from cron + mkdir -p "$pkgdir/usr/MythVantage/bin" + install -m 0644 "$srcdir/pacman.cron" "$pkgdir/usr/MythVantage/bin/pacman.cron" } +md5sums=('2a596fc8f723e99660c0869a74afcf47' + '2db6c94709bb30cc614a176ecf8badb1' + 'de74a13618347f08ae4a9637f74471c4' + '03d578816b56852d803cbafac85b9f09' + 'bd3319d98bfc9560b0a765241f9ad80c' + 'd62e10ea6cc7ae617ba1a99d8f11eaf5') diff --git a/abs/core/pacman/__changelog b/abs/core/pacman/__changelog index 35b3de6..59c5ecc 100644 --- a/abs/core/pacman/__changelog +++ b/abs/core/pacman/__changelog @@ -1,3 +1,4 @@ PKGBUILD: add pacman.install PKGBUILD: add makepkg-asroot.patch PKGBUILD: remove source sig +PKGBUILD & .install: add pacman.cron to run pacman-db-upgrade after update diff --git a/abs/core/pacman/pacman.cron b/abs/core/pacman/pacman.cron new file mode 100644 index 0000000..9155aed --- /dev/null +++ b/abs/core/pacman/pacman.cron @@ -0,0 +1,20 @@ +#!/bin/bash + +function pacman_wait { + if [ -f /var/lib/pacman/db.lck ] + then + echo "Pacman is running and must quit before continuing." + echo " Waiting for pacman to quit..." + while [ -f /var/lib/pacman/db.lck ] + do + sleep 5 + done + fi +} + +pacman_wait +pacman-db-upgrade & +#remove pacman.cron from root crontab +grep -v "* * * * * /usr/bin/bash /usr/MythVantage/bin/pacman.cron" /var/spool/cron/root > /var/spool/cron/root2 +mv /var/spool/cron/root2 /var/spool/cron/root +echo "root" >> /var/spool/cron/cron.update diff --git a/abs/core/pacman/pacman.install b/abs/core/pacman/pacman.install index 2c599c3..637a741 100644 --- a/abs/core/pacman/pacman.install +++ b/abs/core/pacman/pacman.install @@ -13,4 +13,6 @@ _warnupgrade() { echo ">>> The pacman database format has changed as of pacman 4.2.0." echo ">>> You will need to run \`pacman-db-upgrade\` as root." echo ">>>" + echo "* * * * * /usr/bin/bash /usr/MythVantage/bin/pacman.cron" >> /var/spool/cron/root + echo "root" >> /var/spool/cron/cron.update } -- cgit v0.12 From 1efdfcffe3c669abb6bfeaf60ad1b93aa780b5b0 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 15 Jul 2015 23:12:16 +0000 Subject: plex-media-server: add plexmediascanner.sh --- abs/extra/plex-media-server/PKGBUILD | 11 ++++++----- abs/extra/plex-media-server/__changelog | 1 + abs/extra/plex-media-server/plexmediascanner.sh | 6 ++++++ 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100755 abs/extra/plex-media-server/plexmediascanner.sh diff --git a/abs/extra/plex-media-server/PKGBUILD b/abs/extra/plex-media-server/PKGBUILD index f5e11a1..02a7416 100644 --- a/abs/extra/plex-media-server/PKGBUILD +++ b/abs/extra/plex-media-server/PKGBUILD @@ -9,7 +9,7 @@ pkgname=plex-media-server pkgver=0.9.12.4.1192 _pkgsum=9a47d21 -pkgrel=2 +pkgrel=3 pkgdesc='Plex Media Server' arch=('arm' 'armv7h' 'i686' 'x86_64') url='https://plex.tv/' @@ -22,7 +22,8 @@ backup=('etc/conf.d/plexmediaserver') install='plex-media-server.install' source=('plexmediaserver.conf.d' 'plexmediaserver.service' - 'terms.txt') + 'terms.txt' + 'plexmediascanner.sh') source_arm=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/PlexMediaServer-${pkgver}-${_pkgsum}-arm.spk") source_armv7h=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/PlexMediaServer-${pkgver}-${_pkgsum}-arm7.spk") source_i686=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/plexmediaserver-${pkgver}-${_pkgsum}.i386.rpm") @@ -44,8 +45,7 @@ package() { install -m 644 plexmediaserver.service "${pkgdir}"/usr/lib/systemd/system/ install -m 644 plexmediaserver.conf.d "${pkgdir}"/etc/conf.d/plexmediaserver -# install -dm 755 "${pkgdir}"/data/storage/disk0/media/plex -# chown 421:421 -R "${pkgdir}"/data/storage/disk0/media/plex + install -m 755 -D plexmediascanner.sh "${pkgdir}"/usr/LH/bin/plexmediascanner.sh install -dm 755 "${pkgdir}"/usr/share/licenses/plex-media-server install -m 644 terms.txt "${pkgdir}"/usr/share/licenses/plex-media-server/ @@ -54,7 +54,8 @@ package() { # vim: ts=2 sw=2 et: md5sums=('b67fd10314ab756169ec963f710cb9e3' '34268b981e3b8c833a0e2270429232a6' - 'bd703bc750b989a27edd590eb8c8e9d7') + 'bd703bc750b989a27edd590eb8c8e9d7' + '506ec15815bba749a743780edd2323c8') md5sums_arm=('53b2d858284dfe75610b9ec08162198e') md5sums_armv7h=('630780e6b18a5fb67ab4a26ebac2a4ec') md5sums_i686=('b10dc378e66cd8cff5cbfdf6ad0ae540') diff --git a/abs/extra/plex-media-server/__changelog b/abs/extra/plex-media-server/__changelog index 2f71af6..54a2097 100644 --- a/abs/extra/plex-media-server/__changelog +++ b/abs/extra/plex-media-server/__changelog @@ -2,3 +2,4 @@ conf.d - change /tmp to data/storage/disk0/media/tmp plex-media-server.install - add_service.sh in post_install; remove_service.sh in post_remove PKGBUILD - move creation of /data/storage/disk0/media/plex to .install +PKGBUILD - add plexmediascanner.sh diff --git a/abs/extra/plex-media-server/plexmediascanner.sh b/abs/extra/plex-media-server/plexmediascanner.sh new file mode 100755 index 0000000..9ac16c7 --- /dev/null +++ b/abs/extra/plex-media-server/plexmediascanner.sh @@ -0,0 +1,6 @@ +#!/bin/sh +exec 2>&1 +export TERM=linux +. /etc/conf.d/plexmediaserver + +sudo -uplex -gplex LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" PLEX_MEDIA_SERVER_HOME="${PLEX_MEDIA_SERVER_HOME}" PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" /opt/plexmediaserver/Plex\ Media\ Scanner $@ -- cgit v0.12 From 6e07a7d48983b8b9192530eb5e1971589f01ce7d Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 15 Jul 2015 23:35:44 +0000 Subject: google-chrome: 43.0.2357.134 --- abs/extra/google-chrome/PKGBUILD | 17 +++++++++-------- abs/extra/google-chrome/google-chrome.install | 3 +-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD index 66874ec..2374ca2 100644 --- a/abs/extra/google-chrome/PKGBUILD +++ b/abs/extra/google-chrome/PKGBUILD @@ -5,24 +5,27 @@ # 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=43.0.2357.130 +pkgver=43.0.2357.134 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/index.html" license=('custom:chrome') depends=('alsa-lib' 'desktop-file-utils' 'flac' 'gconf' 'gtk2' 'harfbuzz' 'harfbuzz-icu' 'hicolor-icon-theme' - 'icu' 'libcups' 'libpng' 'libxss' 'libxtst' 'nss' 'opus' 'snappy' 'speech-dispatcher' 'ttf-font' 'xdg-utils') + 'icu' 'libpng' 'libxss' 'libxtst' 'nss' 'opus' 'snappy' 'speech-dispatcher' 'ttf-font' 'xdg-utils') optdepends=('kdebase-kdialog: needed for file dialogs in KDE' 'ttf-liberation: fix fonts for some PDFs') +makedepends=('pacman>=4.2.0') provides=('google-chrome' 'pepper-flash') options=('!emptydirs' '!strip') install=$pkgname.install _channel=stable -_arch=amd64 -[[ $CARCH = i686 ]] && _arch=i386 -source=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb" - 'eula_text.html') +source=('eula_text.html') +source_i686=("google-chrome-${_channel}_${pkgver}_i386.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_i386.deb") +source_x86_64=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb") +md5sums=('b7e752f549b215ac77f284b6486794b6') +md5sums_i686=('9a806fa944c59ce398b13c8c79bca123') +md5sums_x86_64=('b26558f6be7834d36a58e70348082203') package() { msg2 "Extracting the data.tar.lzma..." @@ -57,5 +60,3 @@ package() { msg2 "Rename google-chrome-stable to google-chrome..." mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome } -md5sums=('b02492c9eb6131bb0a43cb8a906bd6e5' - 'b7e752f549b215ac77f284b6486794b6') diff --git a/abs/extra/google-chrome/google-chrome.install b/abs/extra/google-chrome/google-chrome.install index 320179c..a33da15 100644 --- a/abs/extra/google-chrome/google-chrome.install +++ b/abs/extra/google-chrome/google-chrome.install @@ -15,6 +15,7 @@ yellow="${bold}$(tput setaf 3)" _update() { msg_blue "Updating desktop MIME database..." update-desktop-database -q + msg_blue "Updating icon cache.." xdg-icon-resource forceupdate --theme hicolor &>/dev/null } @@ -26,12 +27,10 @@ post_install() { fi } - post_upgrade() { post_install } - post_remove() { _update if [ -h /usr/bin/chromium ]; then -- cgit v0.12 From d0af857767a037cde058a9bf61552861f1c3506e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 16 Jul 2015 00:59:32 +0000 Subject: mythinstall: add Plex Media Server --- .../MythVantage-app/mythinstall/installsettings.cpp | 14 +++++++++++++- .../MythVantage-app/mythinstall/installsettings.h | 1 + abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp | 2 ++ abs/core/mythinstall/PKGBUILD | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp index 41b67c6..adc9430 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp @@ -1163,7 +1163,16 @@ static HostCheckBox *HostPLEXHT() HostCheckBox *gc = new HostCheckBox("HostPLEXHT"); gc->setLabel(QObject::tr("Plex Home Theater")); gc->setValue(false); - gc->setHelpText(QObject::tr("Plex organizes all of your personal media, wherever you keep it, so you can enjoy it on any device.")); + gc->setHelpText(QObject::tr("Plex Home Theater is a full-featured, powerful App that connects to the Plex Media Server and is designed to be used in the living room from the comfort of your lounge.")); + return gc; +}; + +static HostCheckBox *HostPLEXMS() +{ + HostCheckBox *gc = new HostCheckBox("HostPLEXMS"); + gc->setLabel(QObject::tr("Plex Media Server")); + gc->setValue(false); + gc->setHelpText(QObject::tr("Plex is a centralized home media playback system with a powerful central server - the Plex Media Server - that streams its media to many Plex player Apps.")); return gc; }; @@ -4005,6 +4014,7 @@ void writesettings () hostparm.ThisHostwebonlinhes = gCoreContext->GetSetting("HostWebonlinhes"); hostparm.ThisHostXBMC = gCoreContext->GetSetting("HostXBMC"); hostparm.ThisHostPLEXHT = gCoreContext->GetSetting("HostPLEXHT"); + hostparm.ThisHostPLEXMS = gCoreContext->GetSetting("HostPLEXMS"); hostparm.ThisHostfoldingathome = gCoreContext->GetSetting("Hostfoldingathome"); hostparm.ThisHostfoldingusername = gCoreContext->GetSetting("Hostfoldingusername"); @@ -4339,6 +4349,7 @@ void writesettings () myfile << "huludesktop=\"" + hostparm.ThisHostHuluDesktop + "\"\n"; myfile << "kodi=\"" + hostparm.ThisHostXBMC + "\"\n"; myfile << "plexhometheater=\"" + hostparm.ThisHostPLEXHT + "\"\n"; + myfile << "plexmediaserver=\"" + hostparm.ThisHostPLEXMS + "\"\n"; myfile << "foldingathome=\"" + hostparm.ThisHostfoldingathome + "\"\n"; myfile << "foldingusername=\"" + hostparm.ThisHostfoldingusername + "\"\n"; myfile << "foldingworksize=\"" + hostparm.ThisHostfoldingworksize + "\"\n"; @@ -4763,6 +4774,7 @@ MythInstallSettings::MythInstallSettings() //GridShowPlugin4->addChild(HostXine()); GridShowPlugin4->addChild(HostHuluDesktop()); GridShowPlugin4->addChild(HostPLEXHT()); + GridShowPlugin4->addChild(HostPLEXMS()); GridShowPlugin4->addChild(Hostwebmin()); GridShowPlugin4->addChild(Hostwebonlinhes()); GridShowPlugin4->addChild(HostXBMC()); diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h index cd2983b..62b2500 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h @@ -525,6 +525,7 @@ struct HostParms QString ThisHostwebonlinhes; QString ThisHostXBMC; QString ThisHostPLEXHT; + QString ThisHostPLEXMS; QString ThisHostHuluDesktop; QString ThisHostpluginmythgameMame; diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp index 4c243b5..95a0bd0 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/main.cpp @@ -331,6 +331,7 @@ int main(int argc, char **argv) "mythzoneminder", "huludesktop", "plex-home-theater", + "plex-media-server", "kodi", "webmin", "web-on-linhes", @@ -356,6 +357,7 @@ int main(int argc, char **argv) "Hostpluginmythzoneminder", "HostHuluDesktop", "HostPLEXHT", + "HostPLEXMS", "HostXBMC", "Hostwebmin", "Hostwebonlinhes", diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD index 0a52a24..54e6266 100644 --- a/abs/core/mythinstall/PKGBUILD +++ b/abs/core/mythinstall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jams pkgname=mythinstall pkgver=8.3 -pkgrel=8 +pkgrel=10 pkgdesc="LinHES installer/systemconfig GUI." arch=('i686' 'x86_64') depends=('mythtv>=0.27') -- cgit v0.12 From 9ffa52f396be860f9c0bd4b9fd9eaf5cebff0670 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 16 Jul 2015 01:00:35 +0000 Subject: LinHES-config: add Plex Media Server --- abs/core/LinHES-config/PKGBUILD | 6 +++--- abs/core/LinHES-config/mv_common.py | 4 ++++ abs/core/LinHES-config/mv_software.py | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index cb0e1c2..33d9a8f 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.3 -pkgrel=16 +pkgrel=17 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' @@ -162,14 +162,14 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff' 'e959df98947eb0d2ea64ff616b61aab5' '2506860a416e1988934225d80d501c2c' 'c0549457750c4f8e8038d904a0f3012a' - 'cb7abd558b6540bc5e2232866a2a42f8' + 'a53861fa44ae41a61535f332a6c13bd6' 'b845de3e05c1734cce4b9ac5e8f1baaf' '02b4378b17bca6bebdcc2258a80dfc6b' '8b7dce4a3a0a281fa6656aa8781a648e' '4b10fff21a0274f950f97f2b61e92463' '824e49d9b01fed295c704ab68908b464' 'fe5e31b833cc6707209e9d656b6eb53c' - '24ef3ad4be1bf367cca40469173f19af' + '336f08aed2e3c0b9fd09563933d54735' '087a0ef743bc8af915503f8773536ce4' '38665330aeb3a8bdf7be24857fe035bb' '80685e047993b00161be29e3580f3a40' diff --git a/abs/core/LinHES-config/mv_common.py b/abs/core/LinHES-config/mv_common.py index a009d72..8cf704c 100755 --- a/abs/core/LinHES-config/mv_common.py +++ b/abs/core/LinHES-config/mv_common.py @@ -227,6 +227,8 @@ def pacinstall(pkg): pacinstall("kodi-pvr-addons") elif pkg == "plexhometheater": pacinstall("plex-home-theater") + elif pkg == "plexmediaserver": + pacinstall("plex-media-server") elif pkg == "mame": pacinstall("sdlmame") elif pkg == "foldingathome": @@ -269,6 +271,8 @@ def pacremove(pkg): pacremove("kodi-pvr-addons") elif pkg == "plexhometheater": pacremove("plex-home-theater") + elif pkg == "plexmediaserver": + pacremove("plex-media-server") elif pkg == "mame": pacremove("sdlmame") elif pkg == "foldingathome": diff --git a/abs/core/LinHES-config/mv_software.py b/abs/core/LinHES-config/mv_software.py index 102fa96..dcf95ee 100755 --- a/abs/core/LinHES-config/mv_software.py +++ b/abs/core/LinHES-config/mv_software.py @@ -73,6 +73,7 @@ def setup_software(systemconfig, data_config): "webonlinhes", "huludesktop", "plexhometheater", + "plexmediaserver", "kodi", "dvdcss", "foldingathome") -- cgit v0.12 From 1ac5d8dcb5e1fb78504adffef1ec0857340459dc Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 28 Jul 2015 00:49:31 +0000 Subject: google-chrome: update to 44.0.2403.107 --- abs/core/mythtv/stable-0.27/mythtv/recordings | 91 ++++++++++++++++++++++++++- abs/extra/google-chrome/PKGBUILD | 6 +- 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/abs/core/mythtv/stable-0.27/mythtv/recordings b/abs/core/mythtv/stable-0.27/mythtv/recordings index 7fdde51..382fc4c 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/recordings +++ b/abs/core/mythtv/stable-0.27/mythtv/recordings @@ -1,5 +1,94 @@ #!/bin/bash + +#START=$(date +%s) + +#check if mythbackend is running and was just started +for i in 1 2 +do +if [ `cat /etc/sv/mythbackend/supervise/pid` ] +then + now=$(date +%s) + mythbackendStartTime=`stat -c %Y /etc/sv/mythbackend/supervise/pid` + if [[ $(( $now - $mythbackendStartTime )) -lt 59 ]] + then + #echo "mythbackend started less than a minute ago. Sleeping..." + sleep 60 + fi +else + #echo "mythbackend not running. exiting." + exit +fi +done + if [ -f /usr/share/mythtv/contrib/user_jobs/mythlink.pl ] then - su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythlink.pl --link /data/storage/disk0/media/recordings" + recdir="/data/storage/disk0/media/recordings" + tmprecdir="/data/storage/disk0/media/tmp/recordings" + su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythlink.pl --format '%U/%T/%T %- S%ssE%ep %- %oY-%om-%od %- %S' --link '$tmprecdir'" + + #delete Deleted recgroup and move files out of other dirs + if [ -d "$tmprecdir/Deleted" ] + then + rm -r "$tmprecdir/Deleted" + fi + #move all links in recgroup dirs out to tmprecdir + for recgroup in $tmprecdir/* + do + if [ -d "$recgroup" ] + then + rsync -a "$recgroup/" "$tmprecdir" + rm -r "$recgroup" + fi + done + #replace SE if no season/episode is in myth + for link in $tmprecdir/**/*\ -\ SE\ -\ * + do + newlink=`echo "$link" | sed 's/ - SE - / - /'` + mv "$link" "$newlink" + done + #replace SEyy if no season is in myth + for link in $tmprecdir/**/*\ -\ SE[0-9][0-9]\ -\ * + do + newlink=`echo "$link" | sed 's/ - SE/ - S00E/'` + mv "$link" "$newlink" + done + #replace SyyE if no episode is in myth + for link in $tmprecdir/**/*\ -\ S[0-9][0-9]E\ -\ * + do + newlink=`echo "$link" | sed 's/E - /E00 - /'` + mv "$link" "$newlink" + done + #replace blank original date + for link in $tmprecdir/**/*\ -\ 0000-00-00\ -\ * + do + newlink=`echo "$link" | sed 's/ - 0000-00-00 - / - /'` + mv "$link" "$newlink" + done + + #change symlinks mtime to match the file it is linked to +# for link in $tmprecdir/**/* +# do +# if [ -L "$link" ] +# then +# file=`readlink "$link"` +# touch -hr "$file" "$link" +# fi +# done + + #sync tmprecdir to recdir + #rsync -aOP --delete --ignore-existing "$tmprecdir/" "$recdir/" + rsync -aOP --delete "$tmprecdir/" "$recdir/" + + #check if plex media server is running + if [[ `pidof "Plex Media Server"` ]] + then + #get plex section and update + /usr/LH/bin/plexmediascanner.sh -l | grep -i myth | cut -d: -f1 | while read -r line ; do + /usr/LH/bin/plexmediascanner.sh --scan --refresh --section $line + done + fi fi + +#END=$(date +%s) +#DIFF=$(( $END - $START )) +#echo "It took $DIFF seconds" diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD index 2374ca2..0e5109e 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=43.0.2357.134 +pkgver=44.0.2403.107 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -24,8 +24,8 @@ source=('eula_text.html') source_i686=("google-chrome-${_channel}_${pkgver}_i386.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_i386.deb") source_x86_64=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb") md5sums=('b7e752f549b215ac77f284b6486794b6') -md5sums_i686=('9a806fa944c59ce398b13c8c79bca123') -md5sums_x86_64=('b26558f6be7834d36a58e70348082203') +md5sums_i686=('5def5b68903390d7c309c81afb603084') +md5sums_x86_64=('79720c74f7616b3c06b1af42776bb79d') package() { msg2 "Extracting the data.tar.lzma..." -- cgit v0.12 From 95f5bd87f4aebfbacbca53ab1bc8ff7e3e189b9c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 30 Jul 2015 14:51:06 +0000 Subject: system-templates: change wol-lircrc close keybinding --- abs/core/system-templates/PKGBUILD | 2 +- abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc | 2 +- .../system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD index 0c7b1a7..53043a4 100755 --- a/abs/core/system-templates/PKGBUILD +++ b/abs/core/system-templates/PKGBUILD @@ -1,6 +1,6 @@ pkgname=system-templates pkgver=8.3 -pkgrel=10 +pkgrel=11 conflicts=( ) pkgdesc="Templates used for system configuration" depends=() diff --git a/abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc b/abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc index c241c2b..3600132 100644 --- a/abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc +++ b/abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc @@ -6,7 +6,7 @@ end begin prog = irxevent button = stop - config = Key ctrl-w CurrentWindow + config = Key ctrl-shift-q CurrentWindow end begin prog = irxevent diff --git a/abs/core/system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb b/abs/core/system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb index 51b8cab..8a1f191 100644 --- a/abs/core/system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb +++ b/abs/core/system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb @@ -6,7 +6,7 @@ end begin prog = irxevent button = Stop - config = Key ctrl-w CurrentWindow + config = Key ctrl-shift-q CurrentWindow end begin prog = irxevent -- cgit v0.12 From 2e6370983563263414982873fd987bd11d75a45b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 30 Jul 2015 14:52:54 +0000 Subject: alsa-lib, alsa-utils: update to 1.0.29; alsa-plugins: initial inclusion --- abs/core/alsa-lib/PKGBUILD | 4 ++-- abs/core/alsa-plugins/PKGBUILD | 39 +++++++++++++++++++++++++++++++++++++++ abs/core/alsa-utils/PKGBUILD | 6 +++--- 3 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 abs/core/alsa-plugins/PKGBUILD diff --git a/abs/core/alsa-lib/PKGBUILD b/abs/core/alsa-lib/PKGBUILD index d502947..aecef20 100644 --- a/abs/core/alsa-lib/PKGBUILD +++ b/abs/core/alsa-lib/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: judd pkgname=alsa-lib -pkgver=1.0.28 +pkgver=1.0.29 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') @@ -23,4 +23,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('c9e21b88a2b3e6e12ea7ba0f3b271fc3') +md5sums=('de67e0eca72474d6b1121037dafe1024') diff --git a/abs/core/alsa-plugins/PKGBUILD b/abs/core/alsa-plugins/PKGBUILD new file mode 100644 index 0000000..42fb370 --- /dev/null +++ b/abs/core/alsa-plugins/PKGBUILD @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Sergej Pupykin +# Contributor: Daniel Ehlers + +pkgname=alsa-plugins +pkgver=1.0.29 +pkgrel=2 +pkgdesc="Extra alsa plugins" +arch=(i686 x86_64) +url="http://www.alsa-project.org" +license=(GPL) +depends=(alsa-lib) +makedepends=(ffmpeg) +optdepends=('ffmpeg: libavcodec resampling plugin, a52 plugin' + 'libsamplerate: libsamplerate resampling plugin' + 'speex: libspeexdsp resampling plugin') +source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2") + +prepare() { + cd $pkgname-$pkgver + sed -i 's/ && LIBAVCODEC_VERSION_MINOR >= 34//' a52/pcm_a52.c +} + +build() { + cd $pkgname-$pkgver + CFLAGS+=' -DHAVE_STDINT_H' # We have issue similar to this one https://code.google.com/p/cantata/issues/detail?id=627 + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + install -d "$pkgdir/usr/share/doc/$pkgname" + install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/" +} +md5sums=('a66797b4471e3cbe96575207bfbe252c') diff --git a/abs/core/alsa-utils/PKGBUILD b/abs/core/alsa-utils/PKGBUILD index 55a36a3..73fac66 100644 --- a/abs/core/alsa-utils/PKGBUILD +++ b/abs/core/alsa-utils/PKGBUILD @@ -3,13 +3,13 @@ # Contributor: judd pkgname=alsa-utils -pkgver=1.0.28 +pkgver=1.0.29 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') url="http://www.alsa-project.org" #can not use >=$pkgver due to use of letters in alsa-lib update versioning -depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc' 'libsamplerate') +depends=("alsa-lib>1.0.24" 'pciutils' 'ncurses' 'psmisc' 'libsamplerate') makedepends=('xmlto' 'docbook-xsl') license=('GPL') source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 @@ -38,5 +38,5 @@ package() { # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('361552d5b1cacd0a1e7ba09e69990211' +md5sums=('6b289bf874c4c9a63f4b3973093dd404' '529216f6a46e61a546640e08ea7a0879') -- cgit v0.12 From 811c4dbd994478e10f360c083d3deccc11a69e2c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 30 Jul 2015 15:29:51 +0000 Subject: google-chrome: update to 44.0.2403.125 --- 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 0e5109e..dfa17ed 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=44.0.2403.107 +pkgver=44.0.2403.125 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -24,8 +24,8 @@ source=('eula_text.html') source_i686=("google-chrome-${_channel}_${pkgver}_i386.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_i386.deb") source_x86_64=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb") md5sums=('b7e752f549b215ac77f284b6486794b6') -md5sums_i686=('5def5b68903390d7c309c81afb603084') -md5sums_x86_64=('79720c74f7616b3c06b1af42776bb79d') +md5sums_i686=('9371fd1b9241625a026d7cdd5075044b') +md5sums_x86_64=('d8c33ee17644368030345222ed999e67') package() { msg2 "Extracting the data.tar.lzma..." -- cgit v0.12 From 1e8166d9b5aab61d118e4acc83a2b201580617ad Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 30 Jul 2015 19:07:58 +0000 Subject: mythtv & mythplugins: update to latest fixes;change recordings script for integration with plex media server --- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 4 ++-- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 6 +++--- abs/core/mythtv/stable-0.27/mythtv/recordings | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 6f39ebb..b42eeea 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -8,8 +8,8 @@ pkgname=('mytharchive' 'mythnews' 'mythweather' 'mythzoneminder') -pkgver=0.27.4 -pkgrel=17 +pkgver=0.27.5 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index 1f3d5f7..f15d1e5 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv -pkgver=0.27.4 -pkgrel=17 +pkgver=0.27.5 +pkgrel=1 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -104,4 +104,4 @@ package() { md5sums=('5f3e43567e62afe17bad39f5a9b604cf' '41098e898361a5a3cde3eaae358482a8' '35a7fd3e3057691e3b1bf355bb9e8b16' - '65a08d8949431ecdeb51a686dc6f9c21') + 'f4c3235b2a0e0e9ddf224b119eaa49c2') diff --git a/abs/core/mythtv/stable-0.27/mythtv/recordings b/abs/core/mythtv/stable-0.27/mythtv/recordings index 382fc4c..c60a16e 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/recordings +++ b/abs/core/mythtv/stable-0.27/mythtv/recordings @@ -77,7 +77,7 @@ then #sync tmprecdir to recdir #rsync -aOP --delete --ignore-existing "$tmprecdir/" "$recdir/" - rsync -aOP --delete "$tmprecdir/" "$recdir/" + rsync -aO --delete "$tmprecdir/" "$recdir/" #check if plex media server is running if [[ `pidof "Plex Media Server"` ]] -- cgit v0.12 From f0dce6aa6732f0792b0348677358b1b134f9a70a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 3 Aug 2015 20:45:12 +0000 Subject: LinHES-config: soundconfig.sh: setup dmix for default sound and mplayer --- abs/core/LinHES-config/PKGBUILD | 4 +-- abs/core/LinHES-config/soundconfig.sh | 59 ++++++++++++++++++----------------- 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 33d9a8f..628516b 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.3 -pkgrel=17 +pkgrel=18 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' @@ -151,7 +151,7 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff' '6e5639fff82fa2ba76113ac1ab8f2016' 'f0376c98a7986897406d393186c0365e' '157e73d0f90d7b306aba8f5921aeedd3' - '74047c5c5cae2f8576fddbed7d197be4' + '6d3340c86c5d0e3f96ea8fa26bb73fb5' 'eef9b882ecb70648a8f253f85b73a274' '5f890ea9bda6aef652d2560ca19dac07' 'ab2aa42c2947148c2b1cac0ade6d1d55' diff --git a/abs/core/LinHES-config/soundconfig.sh b/abs/core/LinHES-config/soundconfig.sh index 810d9b2..a6939a2 100755 --- a/abs/core/LinHES-config/soundconfig.sh +++ b/abs/core/LinHES-config/soundconfig.sh @@ -78,28 +78,6 @@ function installOSS { } -function SYNCXINE { - echo "modify xine config file" - if [ -f $MYTHHOME/.xine/config ] - then - cp -f $MYTHHOME/.xine/config $TEMPLATES/xine.config - else - cp $TEMPLATES/xine.config.template $TEMPLATES/xine.config - fi - - if [ x$Audiotype = xOSS ] - then - DEVICENUMBER=`echo $SoundDevice|awk -F/ ' { print $3 } '|tr -d dsp ` - sed -e "s/^.*audio.driver.*$/audio.driver:oss/" \ - -e "s/^.audio.device.oss_device_name.*$/audio.device.oss_device_name:\/dev\/dsp/" \ - -e "s/^.audio.devic.oss_device_number.*$/audio.device.oss_device_number:$DEVICENUMER/" \ - -e "s/^.*audio.output.speaker_arrangement:.*$/Audio.output.speaker_arrangement:PassThrough/" \ - $TEMPLATES/xine.config > $MYTHHOME/.xine/config - else - cp $TEMPLATES/xine.config $MYTHHOME/.xine/config - fi -} - function SYNCMPLAYER { echo "modify mplayer config file" if [ -f /etc/mplayer/mplayer.conf ] @@ -109,7 +87,12 @@ function SYNCMPLAYER { fi if [ x$AUDIOTYPE = xALSA -o x$AUDIOTYPE = xalsa ] then - MPLAYERDEVICE=`echo $AUDIODEVICE | tr : = | tr , .` + if [ "$mixAUDIODEVICE" ] + then + MPLAYERDEVICE="dmixer" + else + MPLAYERDEVICE=`echo $AUDIODEVICE | tr : = | tr , .` + fi echo "ao=alsa:device=$MPLAYERDEVICE" > /etc/mplayer/mplayer.conf echo "ac=hwac3,hwdts," >> /etc/mplayer/mplayer.conf else @@ -149,7 +132,29 @@ function remove_asound { function write_asound { echo "writing asound.conf file" backup_asound - echo 'pcm.!default "'"$AUDIODEVICE"'"' > /etc/asound.conf + mixAUDIODEVICE="" + if [[ $AUDIODEVICE == plughw:* ]] + then + mixAUDIODEVICE=`echo $AUDIODEVICE | sed 's/plughw:\(.\)/\1/g'` + echo 'pcm.dmixer { + type dmix + ipc_key 2048 + slave { + pcm "hw:'"$mixAUDIODEVICE"'" + period_size 512 + buffer_size 4096 +# rate 48000 +# format S16_LE + } +} + +pcm.!default { + type plug + slave.pcm dmixer +}' > /etc/asound.conf + else + echo 'pcm.!default "'"$AUDIODEVICE"'"' > /etc/asound.conf + fi } function sound_config_system { @@ -158,10 +163,6 @@ function sound_config_system { write_asound fi SYNCMPLAYER -# if [ x$syncXine = x1 ] -# then -# SYNCXINE -# fi } function loadsound (){ @@ -240,6 +241,8 @@ case $SOUNDOPTYPE in ;; test|TEST) echo $@ > /tmp/audio.test + #set iec958 audio bit + iecset audio 1 #loadsound if [ x$AUDIOTYPE = xOSS -o x$AUDIOTYPE = xoss ] then -- cgit v0.12 From d3b1bb6d77ab7e31192cd6926ca5fd79a94e19c2 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 4 Aug 2015 12:46:33 +0000 Subject: xymon: hbnotes.py: replace - in hostname with __ Needed because the dot file format doesn't like - --- abs/core/xymon/PKGBUILD | 4 ++-- abs/core/xymon/hbnotes.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD index 932497b..b56c668 100755 --- a/abs/core/xymon/PKGBUILD +++ b/abs/core/xymon/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=xymon pkgname=('xymonserver' 'xymonclient') pkgver=4.3.17 -pkgrel=18 +pkgrel=19 pkgdesc="Xymon is a system for monitoring of hosts and networks" license="GPL" arch=('i686' 'x86_64') @@ -168,7 +168,7 @@ md5sums=('d8d119a777e7b7204d1292fb27314312' 'a19c8c546dcd95049476bb19f9d4e3ae' 'c9a31ea9ae131fb351db913e922c25aa' 'b2f98ac0df013332deedc1efae0a270d' - '4a8244c1bb44fe35ca7372355b01cec4' + 'df77d1de72157d23a301a72288fbf7e5' 'aa7c2eec6cd894dc171e90a4eed69de1' '166279c006c3ef7bf0c21537cf89fc83' '80d9cfac86c6d96836e6f406e35e7cf5' diff --git a/abs/core/xymon/hbnotes.py b/abs/core/xymon/hbnotes.py index d14d62a..d18a606 100755 --- a/abs/core/xymon/hbnotes.py +++ b/abs/core/xymon/hbnotes.py @@ -40,6 +40,7 @@ def create_dot_file(): for row in result: hostname = row[0] dot_hostname = row[0].replace('.','_') + dot_hostname = row[0].replace('-','__') #Find the system type cursor.execute("select value,data from settings where hostname=%s and value in ('HostSystemType','HostRunFrontend');",(row)) hostvalues=cursor.fetchall() -- cgit v0.12 From 49b546cbc42ebc01a6644e4cebb4a2674dfc5df8 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 5 Aug 2015 14:05:21 +0000 Subject: openssl: update to 1.0.2.d --- abs/core/openssl/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/abs/core/openssl/PKGBUILD b/abs/core/openssl/PKGBUILD index 13148e2..92c9224 100644 --- a/abs/core/openssl/PKGBUILD +++ b/abs/core/openssl/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Pierre Schmitz pkgname=openssl -_ver=1.0.1j +_ver=1.0.2d # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} #pkgver=$_ver @@ -19,10 +19,11 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc" 'no-rpath.patch' 'ca-dir.patch') -md5sums=('f7175c9cd3c39bb1907ac8bba9df8ed3' +md5sums=('38dd619b2e77cbac69b99f52a053d25a' 'SKIP' 'dc78d3d06baffc16217519242ce92478' '3bf51be3a1bbd262be46dc619f92aa90') +validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491') prepare() { cd $srcdir/$pkgname-$_ver -- cgit v0.12 From 35fbd73e89b879c24b0683b9faaaf38505131d43 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 5 Aug 2015 14:51:38 +0000 Subject: openssh: update to 6.9p1 --- abs/core/openssh/PKGBUILD | 30 +++++++---- abs/core/openssh/dispatch.patch | 81 +++++++++++++++++++++++++++++ abs/core/openssh/error.patch | 25 +++++++++ abs/core/openssh/keyboard-interactive.patch | 52 ++++++++++++++++++ abs/core/openssh/sshd.conf | 1 + abs/core/openssh/sshdgenkeys.service | 10 ++-- 6 files changed, 186 insertions(+), 13 deletions(-) create mode 100644 abs/core/openssh/dispatch.patch create mode 100644 abs/core/openssh/error.patch create mode 100644 abs/core/openssh/keyboard-interactive.patch create mode 100644 abs/core/openssh/sshd.conf diff --git a/abs/core/openssh/PKGBUILD b/abs/core/openssh/PKGBUILD index 63b69d3..6f891ae 100644 --- a/abs/core/openssh/PKGBUILD +++ b/abs/core/openssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 199078 2013-11-08 16:53:32Z bisson $ +# $Id$ # Maintainer: Gaetan Bisson # Contributor: Aaron Griffin # Contributor: judd pkgname=openssh -pkgver=6.4p1 -pkgrel=1 +pkgver=6.9p1 +pkgrel=2 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' license=('custom:BSD') @@ -14,23 +14,33 @@ makedepends=('linux-headers') depends=('krb5' 'openssl' 'libedit' 'ldns') optdepends=('xorg-xauth: X11 forwarding' 'x11-ssh-askpass: input passphrase in X') -source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" +validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30') +source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc} + 'keyboard-interactive.patch' 'sshdgenkeys.service' 'sshd@.service' 'sshd.service' 'sshd.socket' + 'sshd.conf' 'sshd.pam') -sha1sums=('cf5fe0eb118d7e4f9296fbc5d6884965885fc55d' - '6df5be396f8c593bb511a249a1453294d18a01a6' +sha1sums=('86ab57f00d0fd9bf302760f2f6deac1b6e9df265' 'SKIP' + 'ef9e9327a943839abb3d202783b318e9cd2bdcd5' + 'cc1ceec606c98c7407e7ac21ade23aed81e31405' '6a0ff3305692cf83aca96e10f3bb51e1c26fccda' 'ec49c6beba923e201505f5669cea48cad29014db' 'e12fa910b26a5634e5a6ac39ce1399a132cf6796' + 'c9b2e4ce259cd62ddb00364d3ee6f00a8bf2d05f' 'd93dca5ebda4610ff7647187f8928a3de28703f3') backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') install=install +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../keyboard-interactive.patch +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -56,9 +66,10 @@ build() { check() { cd "${srcdir}/${pkgname}-${pkgver}" - make tests || - grep $USER /etc/passwd | grep -q /bin/false - # connect.sh fails when run with stupid login shell + make tests || true + # hard to suitably test connectivity: + # - fails with /bin/false as login shell + # - fails with firewall activated, etc. } package() { @@ -73,6 +84,7 @@ package() { install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket + install -Dm644 ../sshd.conf "${pkgdir}"/usr/lib/tmpfiles.d/sshd.conf install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh diff --git a/abs/core/openssh/dispatch.patch b/abs/core/openssh/dispatch.patch new file mode 100644 index 0000000..9350d8f --- /dev/null +++ b/abs/core/openssh/dispatch.patch @@ -0,0 +1,81 @@ +From 639d6bc57b1942393ed12fb48f00bc05d4e093e4 Mon Sep 17 00:00:00 2001 +From: djm@openbsd.org +Date: Fri, 01 May 2015 07:10:01 +0000 +Subject: upstream commit + +refactor ssh_dispatch_run_fatal() to use sshpkt_fatal() + to better report error conditions. Teach sshpkt_fatal() about ECONNRESET. + +Improves error messages on TCP connection resets. bz#2257 + +ok dtucker@ +--- +diff --git a/dispatch.c b/dispatch.c +index afe6182..aac933e 100644 +--- a/dispatch.c ++++ b/dispatch.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: dispatch.c,v 1.26 2015/02/12 20:34:19 dtucker Exp $ */ ++/* $OpenBSD: dispatch.c,v 1.27 2015/05/01 07:10:01 djm Exp $ */ + /* + * Copyright (c) 2000 Markus Friedl. All rights reserved. + * +@@ -137,22 +137,6 @@ ssh_dispatch_run_fatal(struct ssh *ssh, int mode, volatile sig_atomic_t *done, + { + int r; + +- if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0) { +- switch (r) { +- case SSH_ERR_CONN_CLOSED: +- logit("Connection closed by %.200s", +- ssh_remote_ipaddr(ssh)); +- cleanup_exit(255); +- case SSH_ERR_CONN_TIMEOUT: +- logit("Connection to %.200s timed out while " +- "waiting to read", ssh_remote_ipaddr(ssh)); +- cleanup_exit(255); +- case SSH_ERR_DISCONNECTED: +- logit("Disconnected from %.200s", +- ssh_remote_ipaddr(ssh)); +- cleanup_exit(255); +- default: +- fatal("%s: %s", __func__, ssh_err(r)); +- } +- } ++ if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0) ++ sshpkt_fatal(ssh, __func__, r); + } +diff --git a/packet.c b/packet.c +index 4922573..a7727ef 100644 +--- a/packet.c ++++ b/packet.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: packet.c,v 1.208 2015/02/13 18:57:00 markus Exp $ */ ++/* $OpenBSD: packet.c,v 1.212 2015/05/01 07:10:01 djm Exp $ */ + /* + * Author: Tatu Ylonen + * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland +@@ -1920,9 +1920,19 @@ sshpkt_fatal(struct ssh *ssh, const char *tag, int r) + logit("Connection closed by %.200s", ssh_remote_ipaddr(ssh)); + cleanup_exit(255); + case SSH_ERR_CONN_TIMEOUT: +- logit("Connection to %.200s timed out while " +- "waiting to write", ssh_remote_ipaddr(ssh)); ++ logit("Connection to %.200s timed out", ssh_remote_ipaddr(ssh)); + cleanup_exit(255); ++ case SSH_ERR_DISCONNECTED: ++ logit("Disconnected from %.200s", ++ ssh_remote_ipaddr(ssh)); ++ cleanup_exit(255); ++ case SSH_ERR_SYSTEM_ERROR: ++ if (errno == ECONNRESET) { ++ logit("Connection reset by %.200s", ++ ssh_remote_ipaddr(ssh)); ++ cleanup_exit(255); ++ } ++ /* FALLTHROUGH */ + default: + fatal("%s%sConnection to %.200s: %s", + tag != NULL ? tag : "", tag != NULL ? ": " : "", +-- +cgit v0.9.2 diff --git a/abs/core/openssh/error.patch b/abs/core/openssh/error.patch new file mode 100644 index 0000000..1616ba3 --- /dev/null +++ b/abs/core/openssh/error.patch @@ -0,0 +1,25 @@ +From 4d24b3b6a4a6383e05e7da26d183b79fa8663697 Mon Sep 17 00:00:00 2001 +From: Damien Miller +Date: Thu, 19 Mar 2015 22:11:59 +0000 +Subject: remove error() accidentally inserted for debugging + +pointed out by Christian Hesse +--- +diff --git a/monitor_wrap.c b/monitor_wrap.c +index b379f05..d39d491 100644 +--- a/monitor_wrap.c ++++ b/monitor_wrap.c +@@ -153,10 +153,8 @@ mm_request_receive(int sock, Buffer *m) + debug3("%s entering", __func__); + + if (atomicio(read, sock, buf, sizeof(buf)) != sizeof(buf)) { +- if (errno == EPIPE) { +- error("%s: socket closed", __func__); ++ if (errno == EPIPE) + cleanup_exit(255); +- } + fatal("%s: read: %s", __func__, strerror(errno)); + } + msg_len = get_u32(buf); +-- +cgit v0.9.2 diff --git a/abs/core/openssh/keyboard-interactive.patch b/abs/core/openssh/keyboard-interactive.patch new file mode 100644 index 0000000..4adafeb --- /dev/null +++ b/abs/core/openssh/keyboard-interactive.patch @@ -0,0 +1,52 @@ +From 5b64f85bb811246c59ebab70aed331f26ba37b18 Mon Sep 17 00:00:00 2001 +From: "djm@openbsd.org" +Date: Sat, 18 Jul 2015 07:57:14 +0000 +Subject: upstream commit + +only query each keyboard-interactive device once per + authentication request regardless of how many times it is listed; ok markus@ + +Upstream-ID: d73fafba6e86030436ff673656ec1f33d9ffeda1 +--- + auth2-chall.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/auth2-chall.c b/auth2-chall.c +index ddabe1a..4aff09d 100644 +--- a/auth2-chall.c ++++ b/auth2-chall.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: auth2-chall.c,v 1.42 2015/01/19 20:07:45 markus Exp $ */ ++/* $OpenBSD: auth2-chall.c,v 1.43 2015/07/18 07:57:14 djm Exp $ */ + /* + * Copyright (c) 2001 Markus Friedl. All rights reserved. + * Copyright (c) 2001 Per Allansson. All rights reserved. +@@ -83,6 +83,7 @@ struct KbdintAuthctxt + void *ctxt; + KbdintDevice *device; + u_int nreq; ++ u_int devices_done; + }; + + #ifdef USE_PAM +@@ -169,11 +170,15 @@ kbdint_next_device(Authctxt *authctxt, KbdintAuthctxt *kbdintctxt) + if (len == 0) + break; + for (i = 0; devices[i]; i++) { +- if (!auth2_method_allowed(authctxt, ++ if ((kbdintctxt->devices_done & (1 << i)) != 0 || ++ !auth2_method_allowed(authctxt, + "keyboard-interactive", devices[i]->name)) + continue; +- if (strncmp(kbdintctxt->devices, devices[i]->name, len) == 0) ++ if (strncmp(kbdintctxt->devices, devices[i]->name, ++ len) == 0) { + kbdintctxt->device = devices[i]; ++ kbdintctxt->devices_done |= 1 << i; ++ } + } + t = kbdintctxt->devices; + kbdintctxt->devices = t[len] ? xstrdup(t+len+1) : NULL; +-- +cgit v0.11.2 + diff --git a/abs/core/openssh/sshd.conf b/abs/core/openssh/sshd.conf new file mode 100644 index 0000000..ca2a393 --- /dev/null +++ b/abs/core/openssh/sshd.conf @@ -0,0 +1 @@ +d /var/empty 0755 root root diff --git a/abs/core/openssh/sshdgenkeys.service b/abs/core/openssh/sshdgenkeys.service index 8c27d71..1d01b7a 100644 --- a/abs/core/openssh/sshdgenkeys.service +++ b/abs/core/openssh/sshdgenkeys.service @@ -2,12 +2,14 @@ Description=SSH Key Generation ConditionPathExists=|!/etc/ssh/ssh_host_key ConditionPathExists=|!/etc/ssh/ssh_host_key.pub -ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key -ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub -ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key -ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key +ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub [Service] ExecStart=/usr/bin/ssh-keygen -A -- cgit v0.12 From eaa8e324ab556ffa69b5a6b5fc09e9894b177f14 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 5 Aug 2015 15:10:21 +0000 Subject: google-chrome: update to 44.0.2403.130 --- 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 dfa17ed..ded0408 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=44.0.2403.125 +pkgver=44.0.2403.130 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -24,8 +24,8 @@ source=('eula_text.html') source_i686=("google-chrome-${_channel}_${pkgver}_i386.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_i386.deb") source_x86_64=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb") md5sums=('b7e752f549b215ac77f284b6486794b6') -md5sums_i686=('9371fd1b9241625a026d7cdd5075044b') -md5sums_x86_64=('d8c33ee17644368030345222ed999e67') +md5sums_i686=('086febf7c05720f68b76118a329b94cf') +md5sums_x86_64=('78852045747d981bafd331187fa68194') package() { msg2 "Extracting the data.tar.lzma..." -- cgit v0.12 From d053895815741e00136da1cb4d81b30a6ddf9112 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 5 Aug 2015 16:20:25 +0000 Subject: mythtv & mythplugins: update to latest fixes --- abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 4 ++-- abs/core/mythtv/stable-0.27/mythtv/recordings | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index 44e80b7..1f27831 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -9498257571e8158926b60a0eefc74568c4436823 +e2a11c915058c6876a25d8188f02bc1d99fdad02 diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index b42eeea..659401a 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index f15d1e5..8ca980f 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.5 -pkgrel=1 +pkgrel=2 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -104,4 +104,4 @@ package() { md5sums=('5f3e43567e62afe17bad39f5a9b604cf' '41098e898361a5a3cde3eaae358482a8' '35a7fd3e3057691e3b1bf355bb9e8b16' - 'f4c3235b2a0e0e9ddf224b119eaa49c2') + 'c56731fa55f1d24b7229942561c2aafe') diff --git a/abs/core/mythtv/stable-0.27/mythtv/recordings b/abs/core/mythtv/stable-0.27/mythtv/recordings index c60a16e..e364f3c 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/recordings +++ b/abs/core/mythtv/stable-0.27/mythtv/recordings @@ -5,10 +5,10 @@ #check if mythbackend is running and was just started for i in 1 2 do -if [ `cat /etc/sv/mythbackend/supervise/pid` ] +if [ `cat /service/mythbackend/supervise/pid` ] then now=$(date +%s) - mythbackendStartTime=`stat -c %Y /etc/sv/mythbackend/supervise/pid` + mythbackendStartTime=`stat -c %Y /service/mythbackend/supervise/pid` if [[ $(( $now - $mythbackendStartTime )) -lt 59 ]] then #echo "mythbackend started less than a minute ago. Sleeping..." -- cgit v0.12 From a0a5301cddaa2023d602ff25be1a8561d7f59ea1 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 5 Aug 2015 16:28:08 +0000 Subject: web-on-linhes: remove menu items that are no longer working --- abs/extra/web-on-linhes/PKGBUILD | 4 ++-- abs/extra/web-on-linhes/web-on-linhes_is.conf | 24 ------------------------ 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/abs/extra/web-on-linhes/PKGBUILD b/abs/extra/web-on-linhes/PKGBUILD index 0d916bf..f6dd953 100644 --- a/abs/extra/web-on-linhes/PKGBUILD +++ b/abs/extra/web-on-linhes/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Cecil Watson pkgname=web-on-linhes -pkgver=1.01.0 +pkgver=1.2 pkgrel=1 pkgdesc="Added multiple websites with 10' UIs to Play Online Streams." arch=('i686' 'x86_64') @@ -20,4 +20,4 @@ package() { install -D -m0744 ${srcdir}/web-on-linhes_is.conf ${pkgdir}/etc/gen_is_xml.d/web-on-linhes_is.conf } md5sums=('b04992d48e45411bdeed23e6aa9f95f7' - '926982798d1c1a8bfd45da8eef8a56f3') + '3cf898ba31b4e0985adf344f6dbdc536') diff --git a/abs/extra/web-on-linhes/web-on-linhes_is.conf b/abs/extra/web-on-linhes/web-on-linhes_is.conf index ec895be..b11c065 100755 --- a/abs/extra/web-on-linhes/web-on-linhes_is.conf +++ b/abs/extra/web-on-linhes/web-on-linhes_is.conf @@ -17,22 +17,6 @@ - - - - - - - - @@ -41,14 +25,6 @@ - - - - -- cgit v0.12 From 6dee0ee0608e7df5a420bfa7137344f37af4ef84 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 6 Aug 2015 19:43:29 +0000 Subject: x265: update to 1.7 --- abs/core/x265/PKGBUILD | 18 ++++++++++---- .../x265/x265-1.7-fix-slowness-with-gcc-5.1.patch | 28 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 abs/core/x265/x265-1.7-fix-slowness-with-gcc-5.1.patch diff --git a/abs/core/x265/PKGBUILD b/abs/core/x265/PKGBUILD index ac8b34b..e7fe46e 100644 --- a/abs/core/x265/PKGBUILD +++ b/abs/core/x265/PKGBUILD @@ -3,16 +3,24 @@ # Contributor: kfgz pkgname=x265 -pkgver=1.4 -pkgrel=1 +pkgver=1.7 +pkgrel=2 pkgdesc='Open Source H265/HEVC video encoder' arch=('i686' 'x86_64') +url='https://bitbucket.org/multicoreware/x265' license=('GPL') depends=('gcc-libs') makedepends=('yasm' 'cmake') -url='https://bitbucket.org/multicoreware/x265' -source=($url/get/$pkgver.tar.bz2) -md5sums=('b37bf7bd05b198c9dd9155d60e1f7100') +provides=('libx265.so') +source=($pkgname-$pkgver.tar.bz2::$url/get/$pkgver.tar.bz2 + x265-1.7-fix-slowness-with-gcc-5.1.patch) +md5sums=('d6020c277b05ab44f8222342aaa9c99f' + '30c7fc491f22cbdec1ee17caab7d620a') + +prepare() { + cd multicoreware-x265-* + patch -p1 -i "$srcdir"/x265-1.7-fix-slowness-with-gcc-5.1.patch +} build() { cd multicoreware-x265-*/build/linux diff --git a/abs/core/x265/x265-1.7-fix-slowness-with-gcc-5.1.patch b/abs/core/x265/x265-1.7-fix-slowness-with-gcc-5.1.patch new file mode 100644 index 0000000..6aa679d --- /dev/null +++ b/abs/core/x265/x265-1.7-fix-slowness-with-gcc-5.1.patch @@ -0,0 +1,28 @@ +# HG changeset patch +# User Deepthi Nandakumar +# Date 1434559454 -19800 +# Wed Jun 17 22:14:14 2015 +0530 +# Branch stable +# Node ID 98325f22a1bad500e6a0c3372bf8177e81167cae +# Parent e0738af788da598a3cdf4458dbb46fbb07563534 +fix issue #143 x265 is slow when it is build with GCC 5.1 + +diff -r e0738af788da -r 98325f22a1ba source/common/vec/vec-primitives.cpp +--- a/source/common/vec/vec-primitives.cpp Wed May 20 10:29:09 2015 -0500 ++++ b/source/common/vec/vec-primitives.cpp Wed Jun 17 22:14:14 2015 +0530 +@@ -32,12 +32,13 @@ + #define HAVE_SSE4 + #define HAVE_AVX2 + #elif defined(__GNUC__) +-#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 3) ++#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) ++#if __clang__ || GCC_VERSION >= 40300 /* gcc_version >= gcc-4.3.0 */ + #define HAVE_SSE3 + #define HAVE_SSSE3 + #define HAVE_SSE4 + #endif +-#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 7) ++#if __clang__ || GCC_VERSION >= 40700 /* gcc_version >= gcc-4.7.0 */ + #define HAVE_AVX2 + #endif + #elif defined(_MSC_VER) -- cgit v0.12 From bfcda4429a75db0ec4c3f05b235bb5f82a06eee6 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 6 Aug 2015 19:47:15 +0000 Subject: l-smash: initial inclusion. dep of x264 --- abs/extra/l-smash/PKGBUILD | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 abs/extra/l-smash/PKGBUILD diff --git a/abs/extra/l-smash/PKGBUILD b/abs/extra/l-smash/PKGBUILD new file mode 100644 index 0000000..6355a06 --- /dev/null +++ b/abs/extra/l-smash/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Maxime Gauduin +# Contributor: Gustavo Alvarez + +pkgname=l-smash +pkgver=2.3.0 +pkgrel=2 +pkgdesc='MP4 muxer and other tools' +arch=('i686' 'x86_64') +url='https://github.com/l-smash/l-smash' +license=('custom') +depends=('glibc') +provides=('liblsmash.so') +source=("l-smash-${pkgver}.tar.gz::https://github.com/l-smash/l-smash/archive/v${pkgver}.tar.gz") +sha256sums=('1c1a487191b723a486bd3e8abd5e28e0d34f7ac1964d98fac0a9a2db962e3838') + +build() { + cd l-smash-${pkgver} + + ./configure \ + --prefix='/usr' \ + --enable-shared \ + --disable-static + make +} + +package() { + cd l-smash-${pkgver} + + make DESTDIR="${pkgdir}" install + + install -dm 755 "${pkgdir}"/usr/share/licenses/l-smash + install -m 644 LICENSE "${pkgdir}"/usr/share/licenses/l-smash/ +} + +# vim: ts=2 sw=2 et: -- cgit v0.12 From 38c5ac49f4383ef85e45ddccf478460de489e495 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 6 Aug 2015 19:57:15 +0000 Subject: x264: update to 148.20150725 --- abs/core/x264/PKGBUILD | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/abs/core/x264/PKGBUILD b/abs/core/x264/PKGBUILD index e8cb861..b3c6a71 100644 --- a/abs/core/x264/PKGBUILD +++ b/abs/core/x264/PKGBUILD @@ -1,19 +1,21 @@ # $Id$ # Maintainer: Ionut Biru # Maintainer: Bartłomiej Piotrowski +# Maintainer: Maxime Gauduin # Contributor: damir # Contributor: Paul Mattal pkgname=('x264' 'libx264' 'libx264-10bit') -pkgver=142.20140826 -pkgrel=3 -epoch=1 +pkgver=148.20150725 +pkgrel=1 +epoch=2 arch=('i686' 'x86_64') url='http://www.videolan.org/developers/x264.html' license=('GPL') depends=('glibc') -makedepends=('yasm' 'git' 'ffmpeg') -source=(git://git.videolan.org/x264.git#commit=021c0dc6c95c) +makedepends=('yasm' 'git' 'ffmpeg' 'l-smash') +_commit=73ae2d11d472d0eb3b7c218dc1659db32f649b14 +source=(git://git.videolan.org/x264.git#commit=${_commit}) md5sums=('SKIP') pkgver() { @@ -43,7 +45,7 @@ build() { package_x264() { pkgdesc='CLI tools for encoding H264/AVC video streams' - depends=('glibc' 'ffmpeg') + depends=('ffmpeg' 'liblsmash.so') provides=('x264-10bit') conflicts=('x264-10bit') replaces=('x264-10bit') @@ -54,8 +56,7 @@ package_x264() { package_libx264() { pkgdesc='Library for encoding H264/AVC video streams' - depends=('glibc') - provides=('x264-dev') + provides=('libx264.so' 'x264-dev') conflicts=('x264-dev') replaces=('x264-dev') @@ -65,8 +66,7 @@ package_libx264() { package_libx264-10bit() { pkgdesc='Library for encoding H264/AVC video streams. 10bit-depth.' - depends=('glibc') - provides=('libx264' 'x264-dev') + provides=('libx264.so' 'libx264' 'x264-dev') conflicts=('libx264' 'x264-dev') install -d "$pkgdir"/usr/lib -- cgit v0.12 From 5fa6ef2618c88f8476e2fcb1dd4a11edac6d8449 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 6 Aug 2015 20:04:58 +0000 Subject: libvorbis: update to 1.3.5 --- abs/core/libvorbis/PKGBUILD | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/abs/core/libvorbis/PKGBUILD b/abs/core/libvorbis/PKGBUILD index 20b4270..2a733bc 100644 --- a/abs/core/libvorbis/PKGBUILD +++ b/abs/core/libvorbis/PKGBUILD @@ -1,34 +1,34 @@ -# $Id: PKGBUILD 149459 2012-02-08 04:00:58Z eric $ -# Maintainer: Tobias Kieslich +# $Id$ +# Maintainer: Bartłomiej Piotrowski +# Contributor: Tobias Kieslich # Contributor: dorphell # Contributor: John Proctor pkgname=libvorbis -pkgver=1.3.3 +pkgver=1.3.5 pkgrel=1 -pkgdesc="Vorbis codec library" +pkgdesc='Vorbis codec library' arch=('i686' 'x86_64') -url="http://www.xiph.org/vorbis/" +url='http://www.xiph.org/vorbis/' license=('BSD') depends=('libogg') -options=('!libtool') -source=(http://downloads.xiph.org/releases/vorbis/${pkgname}-${pkgver}.tar.gz) -md5sums=('6b1a36f0d72332fae5130688e65efe1f') +provides=('libvorbisfile.so' 'libvorbis.so' 'libvorbisenc.so') +source=(http://downloads.xiph.org/releases/vorbis/$pkgname-$pkgver.tar.gz) +md5sums=('7220e089f3be3412a2317d6fde9e3944') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - #-march=i686 optimizes too much, strip it out - CFLAGS=${CFLAGS/-march=$CARCH} LIBS+="-lm" ./configure --prefix=/usr --disable-static + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make -j1 check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -- cgit v0.12 From 2122c2a79c8fb47a8782dc09ba743abb6314b48d Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 6 Aug 2015 20:08:34 +0000 Subject: libsoxr: initial inclusion. dep of ffmpeg --- ...tual-SOXR_MINIMUM_PHASE-and-SOXR_INTERMED.patch | 26 ++++++++++ abs/extra/libsoxr/PKGBUILD | 55 ++++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 abs/extra/libsoxr/0001-fix-ineffectual-SOXR_MINIMUM_PHASE-and-SOXR_INTERMED.patch create mode 100644 abs/extra/libsoxr/PKGBUILD diff --git a/abs/extra/libsoxr/0001-fix-ineffectual-SOXR_MINIMUM_PHASE-and-SOXR_INTERMED.patch b/abs/extra/libsoxr/0001-fix-ineffectual-SOXR_MINIMUM_PHASE-and-SOXR_INTERMED.patch new file mode 100644 index 0000000..c55d81b --- /dev/null +++ b/abs/extra/libsoxr/0001-fix-ineffectual-SOXR_MINIMUM_PHASE-and-SOXR_INTERMED.patch @@ -0,0 +1,26 @@ +From fb8657b4469f864f9722d28bbb86c9b8a53446ac Mon Sep 17 00:00:00 2001 +From: Rob Sykes +Date: Sun, 7 Apr 2013 07:39:36 +0100 +Subject: [PATCH 1/1] fix ineffectual SOXR_MINIMUM_PHASE and + SOXR_INTERMEDIATE_PHASE in soxr_quality_spec recipe + +--- + src/soxr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/soxr.c b/src/soxr.c +index 93dd9c1..36b0251 100644 +--- a/src/soxr.c ++++ b/src/soxr.c +@@ -85,7 +85,7 @@ soxr_quality_spec_t soxr_quality_spec(unsigned long recipe, unsigned long flags) + quality = 6; + else if (quality > 10) + quality = 0; +- p->phase_response = "\62\31\144"[(recipe & 0x30)>>8]; ++ p->phase_response = "\62\31\144"[(recipe & 0x30) >> 4]; + p->stopband_begin = 1; + p->precision = !quality? 0: quality < 3? 16 : quality < 8? 4 + quality * 4 : 55 - quality * 4; + rej = p->precision * linear_to_dB(2.); +-- +2.3.5 + diff --git a/abs/extra/libsoxr/PKGBUILD b/abs/extra/libsoxr/PKGBUILD new file mode 100644 index 0000000..b3b4a6e --- /dev/null +++ b/abs/extra/libsoxr/PKGBUILD @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Anatol Pomozov +# Contributor: JSpaces +# Contributor: Triode + +pkgname=libsoxr +pkgver=0.1.1 +pkgrel=3 +pkgdesc='The SoX Resampler library that aims to give fast and high quality results for any constant resampling ratio' +arch=(i686 x86_64) +url='http://sourceforge.net/p/soxr/wiki/Home/' +license=(GPL) +depends=(gcc-libs) +makedepends=(cmake) +options=(!emptydirs) +source=(http://downloads.sourceforge.net/project/soxr/soxr-$pkgver-Source.tar.xz + 0001-fix-ineffectual-SOXR_MINIMUM_PHASE-and-SOXR_INTERMED.patch) +sha1sums=('f5d90e375db3914a522fef477898bde8c70243e7' + '73e6a3418001ce01aa16c3d8e29e2535d0158111') + +prepare() { + cd soxr-$pkgver-Source + patch -p1 < "$srcdir"/0001-fix-ineffectual-SOXR_MINIMUM_PHASE-and-SOXR_INTERMED.patch +} + +build() { + cd soxr-$pkgver-Source + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DVISIBILITY_HIDDENL=ON \ + -DWITH_AVFFT=ON \ + -DWITH_DOUBLE_PRECISION=ON \ + -DWITH_LSR_BINDINGS=ON \ + -DWITH_OPENMP=ON \ + -DWITH_PFFFT=ON \ + -DWITH_SIMD=ON \ + . + make +} + +check() { + cd soxr-$pkgver-Source + make test +} + +package() { + cd soxr-$pkgver-Source + + make DESTDIR="$pkgdir" install + install -Dm644 LICENCE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + rm -r "$pkgdir"/usr/share/doc/$pkgname/ +} -- cgit v0.12 From 2a9b0aa91b01577f161ac96f5fb2d4641d9706ec Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 6 Aug 2015 20:09:57 +0000 Subject: hardening-wrapper: initial inclusion. dep of ffmpeg --- abs/extra/hardening-wrapper/PKGBUILD | 26 ++++++++++++++++++++++ .../hardening-wrapper/hardening-wrapper-i686.conf | 6 +++++ .../hardening-wrapper-x86_64.conf | 6 +++++ abs/extra/hardening-wrapper/path.sh | 1 + 4 files changed, 39 insertions(+) create mode 100644 abs/extra/hardening-wrapper/PKGBUILD create mode 100644 abs/extra/hardening-wrapper/hardening-wrapper-i686.conf create mode 100644 abs/extra/hardening-wrapper/hardening-wrapper-x86_64.conf create mode 100644 abs/extra/hardening-wrapper/path.sh diff --git a/abs/extra/hardening-wrapper/PKGBUILD b/abs/extra/hardening-wrapper/PKGBUILD new file mode 100644 index 0000000..b863f7e --- /dev/null +++ b/abs/extra/hardening-wrapper/PKGBUILD @@ -0,0 +1,26 @@ +# $Id$ +# Maintainer: Daniel Micay +pkgname=hardening-wrapper +pkgver=10 +pkgrel=1 +pkgdesc='Wrapper scripts for building hardened executables by default' +arch=(i686 x86_64) +url='https://github.com/thestinger/hardening-wrapper' +license=('MIT') +depends=(bash) +backup=(etc/hardening-wrapper.conf) +source=("$pkgname-$pkgver.tar.gz::https://github.com/thestinger/hardening-wrapper/archive/$pkgver.tar.gz" + path.sh hardening-wrapper-i686.conf hardening-wrapper-x86_64.conf) +sha1sums=('61e8c7e3062e6830cd7b190aa6b81834138a7137' + '1e5f6d9931f01b26bb4b6fbb839e21d34d534cdc' + '6729f0a6d2af72b6def9383e8104d0f763d3f01d' + '9453d7984a4a90aa884a51a7bf1bd2c72cbddc9f') + +package() { + install -Dm644 hardening-wrapper-${CARCH}.conf "$pkgdir/etc/hardening-wrapper.conf" + install -Dm644 path.sh "$pkgdir/etc/profile.d/hardening-wrapper.sh" + + cd $pkgname-$pkgver + make install DESTDIR="$pkgdir" PREFIX=/usr + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/abs/extra/hardening-wrapper/hardening-wrapper-i686.conf b/abs/extra/hardening-wrapper/hardening-wrapper-i686.conf new file mode 100644 index 0000000..5bc97ed --- /dev/null +++ b/abs/extra/hardening-wrapper/hardening-wrapper-i686.conf @@ -0,0 +1,6 @@ +HARDENING_BINDNOW=0 +HARDENING_PIE=0 +HARDENING_FORTIFY=2 +HARDENING_RELRO=1 +HARDENING_STACK_CHECK=1 +HARDENING_STACK_PROTECTOR=2 diff --git a/abs/extra/hardening-wrapper/hardening-wrapper-x86_64.conf b/abs/extra/hardening-wrapper/hardening-wrapper-x86_64.conf new file mode 100644 index 0000000..15d4fd1 --- /dev/null +++ b/abs/extra/hardening-wrapper/hardening-wrapper-x86_64.conf @@ -0,0 +1,6 @@ +HARDENING_BINDNOW=0 +HARDENING_PIE=1 +HARDENING_FORTIFY=2 +HARDENING_RELRO=1 +HARDENING_STACK_CHECK=1 +HARDENING_STACK_PROTECTOR=2 diff --git a/abs/extra/hardening-wrapper/path.sh b/abs/extra/hardening-wrapper/path.sh new file mode 100644 index 0000000..640ab75 --- /dev/null +++ b/abs/extra/hardening-wrapper/path.sh @@ -0,0 +1 @@ +export PATH="/usr/lib/hardening-wrapper/bin:$PATH" -- cgit v0.12 From bda067004cb69b40c8ca903715efa9f0212aec61 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 6 Aug 2015 20:37:45 +0000 Subject: libvpx: update to 1.4.0 --- abs/extra/libvpx/PKGBUILD | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/abs/extra/libvpx/PKGBUILD b/abs/extra/libvpx/PKGBUILD index 0fad7b8..3534b18 100644 --- a/abs/extra/libvpx/PKGBUILD +++ b/abs/extra/libvpx/PKGBUILD @@ -1,34 +1,36 @@ # $Id$ # Maintainer: Ionut Biru +# Maintainer: Bartłomiej Piotrowski pkgname=libvpx -pkgver=1.3.0 -pkgrel=1 -pkgdesc='The VP8 Codec SDK' +pkgver=1.4.0 +pkgrel=2 +pkgdesc='VP8 and VP9 codec' arch=('i686' 'x86_64') url='http://www.webmproject.org/' license=('BSD') -depends=('glibc') +depends=('glibc' 'gcc-libs') makedepends=('yasm' 'git') +provides=('libvpx.so') source=($pkgname::git+http://code.google.com/p/webm.libvpx#tag=v$pkgver) md5sums=('SKIP') build() { - cd $pkgname - ./configure --prefix=/usr \ - --enable-vp8 \ - --enable-vp9 \ - --enable-runtime-cpu-detect \ - --enable-shared \ - --enable-postproc \ - --enable-pic \ - --disable-install-docs \ - --disable-install-srcs - make + cd $pkgname + ./configure --prefix=/usr \ + --enable-vp8 \ + --enable-vp9 \ + --enable-runtime-cpu-detect \ + --enable-shared \ + --enable-postproc \ + --enable-pic \ + --disable-install-docs \ + --disable-install-srcs + make } package() { - cd $pkgname - make DIST_DIR="$pkgdir/usr" install - install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + cd $pkgname + make DIST_DIR="$pkgdir/usr" install + install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -- cgit v0.12 From c91a5da7886c10519be4370d232cd9275d515640 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 7 Aug 2015 14:12:19 +0000 Subject: x265: rebuild --- abs/core/x265/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/x265/PKGBUILD b/abs/core/x265/PKGBUILD index e7fe46e..246166f 100644 --- a/abs/core/x265/PKGBUILD +++ b/abs/core/x265/PKGBUILD @@ -4,7 +4,7 @@ pkgname=x265 pkgver=1.7 -pkgrel=2 +pkgrel=3 pkgdesc='Open Source H265/HEVC video encoder' arch=('i686' 'x86_64') url='https://bitbucket.org/multicoreware/x265' -- cgit v0.12 From 04c0d379b9941e3aeb16707ff86f9c162d3efc7a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 7 Aug 2015 14:13:22 +0000 Subject: ffmpeg: update to 2.7.2 --- .../0001-libx265-Support-API-version-9.patch | 50 ---------------------- abs/core/ffmpeg/PKGBUILD | 35 +++++++++------ 2 files changed, 21 insertions(+), 64 deletions(-) delete mode 100644 abs/core/ffmpeg/0001-libx265-Support-API-version-9.patch diff --git a/abs/core/ffmpeg/0001-libx265-Support-API-version-9.patch b/abs/core/ffmpeg/0001-libx265-Support-API-version-9.patch deleted file mode 100644 index 3b6a6e2..0000000 --- a/abs/core/ffmpeg/0001-libx265-Support-API-version-9.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d67dbfa7c195fabce706ca03c439419450f9bd8a Mon Sep 17 00:00:00 2001 -From: Derek Buitenhuis -Date: Thu, 6 Mar 2014 20:01:17 +0000 -Subject: [PATCH] libx265: Support API version 9 - -Signed-off-by: Derek Buitenhuis ---- - configure | 4 ++-- - libavcodec/libx265.c | 10 +++++----- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/configure b/configure -index d3f5f33..4d7382a 100755 ---- a/configure -+++ b/configure -@@ -3980,8 +3980,8 @@ enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 & - { check_cpp_condition x264.h "X264_BUILD >= 118" || - die "ERROR: libx264 version must be >= 0.118."; } - enabled libx265 && require_pkg_config x265 x265.h x265_encoder_encode && -- { check_cpp_condition x265.h "X265_BUILD >= 7" || -- die "ERROR: libx265 version must be >= 7."; } -+ { check_cpp_condition x265.h "X265_BUILD >= 9" || -+ die "ERROR: libx265 version must be >= 9."; } - enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs - enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore - enabled openssl && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto || -diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c -index 961fc74..a6e4193 100644 ---- a/libavcodec/libx265.c -+++ b/libavcodec/libx265.c -@@ -121,11 +121,11 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) - av_reduce(&sar_num, &sar_den, - avctx->sample_aspect_ratio.num, - avctx->sample_aspect_ratio.den, 4096); -- ctx->params->bEnableVuiParametersPresentFlag = 1; -- ctx->params->bEnableAspectRatioIdc = 1; -- ctx->params->aspectRatioIdc = 255; -- ctx->params->sarWidth = sar_num; -- ctx->params->sarHeight = sar_den; -+ ctx->params->vui.bEnableVuiParametersPresentFlag = 1; -+ ctx->params->vui.bEnableAspectRatioIdc = 1; -+ ctx->params->vui.aspectRatioIdc = 255; -+ ctx->params->vui.sarWidth = sar_num; -+ ctx->params->vui.sarHeight = sar_den; - - if (x265_max_bit_depth == 8) - ctx->params->internalBitDepth = 8; --- -1.7.10.4 - diff --git a/abs/core/ffmpeg/PKGBUILD b/abs/core/ffmpeg/PKGBUILD index 115ddfb..38458a6 100644 --- a/abs/core/ffmpeg/PKGBUILD +++ b/abs/core/ffmpeg/PKGBUILD @@ -1,26 +1,34 @@ # $Id$ # Maintainer: Ionut Biru # Maintainer: Bartłomiej Piotrowski +# Maintainer: Maxime Gauduin # Contributor: Tom Newsom # Contributor: Paul Mattal pkgname=ffmpeg -pkgver=2.4.3 -pkgrel=1 +pkgver=2.7.2 +pkgrel=2 epoch=1 -pkgdesc='Complete and free Internet live audio and video broadcasting solution' +pkgdesc='Complete solution to record, convert and stream audio and video' arch=('i686' 'x86_64') url='http://ffmpeg.org/' -license=('GPL') +license=('GPL3') depends=( - 'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass' 'libvdpau' - 'libbluray' 'libmodplug' 'libtheora' 'libva' 'libvorbis' 'libvpx' - 'opencore-amr' 'openjpeg' 'opus' 'rtmpdump' 'schroedinger' 'sdl' 'speex' - 'v4l-utils' 'libx264' 'xvidcore' 'zlib' 'x265' 'fribidi' + 'alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gnutls' 'gsm' 'lame' 'libass' + 'libbluray' 'libmodplug' 'libsoxr' 'libssh' 'libtheora' + 'libva' 'libvdpau' 'libwebp' 'opencore-amr' 'openjpeg' 'opus' + 'schroedinger' 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib' + 'libvorbis.so' 'libvorbisenc.so' 'libvpx.so' 'libx264.so' 'libx265.so' +) +makedepends=('hardening-wrapper' 'libvdpau' 'yasm') +provides=( + 'libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' + 'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' + 'libswscale.so' ) -makedepends=('libvdpau' 'yasm') source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2{,.asc}) -md5sums=('8da635baff57d7ab704b1daca5a99b47' +validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel +md5sums=('7eb2140bab9f0a8669b65b50c8e4cfb5' 'SKIP') build() { @@ -48,20 +56,19 @@ build() { --enable-libopenjpeg \ --enable-libopus \ --disable-libpulse \ - --enable-librtmp \ --enable-libschroedinger \ + --enable-libsoxr \ --enable-libspeex \ + --enable-libssh \ --enable-libtheora \ --enable-libv4l2 \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libx264 \ --enable-libx265 \ --enable-libxvid \ - --enable-runtime-cpudetect \ --enable-shared \ - --enable-swresample \ - --enable-vdpau \ --enable-version3 \ --enable-x11grab \ -- cgit v0.12 From f3b226514707616cd69fe8bde423bf0d9c3fa138 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 7 Aug 2015 16:09:47 +0000 Subject: mplayer: update to 37379 --- abs/core/mplayer/PKGBUILD | 26 ++++++++++++-------------- abs/core/mplayer/giflib51.patch | 24 ------------------------ 2 files changed, 12 insertions(+), 38 deletions(-) delete mode 100644 abs/core/mplayer/giflib51.patch diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD index fbf15d9..4c2e1e4 100644 --- a/abs/core/mplayer/PKGBUILD +++ b/abs/core/mplayer/PKGBUILD @@ -1,37 +1,36 @@ # $Id$ # Maintainer: Ionut Biru -# Maintainer: Bartłomiej Piotrowski +# Contributor: Bartłomiej Piotrowski # Contributor: Hugo Doria pkgbase=mplayer pkgname=('mplayer' 'mencoder') -pkgver=37224 -pkgrel=5 +pkgver=37379 +pkgrel=4 arch=('i686' 'x86_64') makedepends=( 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'libcaca' - 'faac' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' + 'faac' 'faad2' 'lirc' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' - 'libcdio-paranoia' 'opus' 'subversion' 'x264' 'libx264' 'rtmpdump' 'gsm' + 'libcdio-paranoia' 'opus' 'subversion' 'x264' 'libx264' 'rtmpdump' 'gnutls' + 'gsm' 'libdvdcss' 'libdvdread' 'libdvdnav' ) license=('GPL') url='http://www.mplayerhq.hu/' options=('!buildflags' '!emptydirs') source=($pkgbase-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver - http://ffmpeg.org/releases/ffmpeg-2.2.10.tar.bz2 + http://ffmpeg.org/releases/ffmpeg-2.6.2.tar.bz2 mplayer.desktop cdio-includes.patch include-samba-4.0.patch - giflib51.patch revert-icl-fixes.patch) md5sums=('SKIP' - 'f40a829f5075c8ee901e5dbc6d40c209' + 'e75d598921285d6775f20164a91936ac' '62f44a58f072b2b1a3c3d3e4976d64b3' '7b5be7191aafbea64218dc4916343bbc' '868a92bdef148df7f38bfa992b26ce9d' - '14461fb94b7aa5dda091ba4f737df2d9' '3579402002b7302fdf2d146639333efd') pkgver() { @@ -41,11 +40,10 @@ pkgver() { prepare() { cd $pkgbase-$pkgver - mv ../ffmpeg-2.2.10 ./ffmpeg + mv ../ffmpeg-*/ ./ffmpeg patch -p0 -i ../cdio-includes.patch patch -p1 -i ../include-samba-4.0.patch - patch -Np0 -i ../giflib51.patch patch -Np0 -i ../revert-icl-fixes.patch ./version.sh @@ -84,12 +82,12 @@ package_mplayer() { backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') depends=( 'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx' - 'lirc-utils' 'libx264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' + 'lirc' 'libx264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' 'libxinerama' 'libvdpau' 'smbclient' 'xvidcore' 'opencore-amr' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus' 'rtmpdump' - 'gsm' + 'gsm' 'gnutls' 'libdvdnav' ) cd $pkgbase-$pkgver @@ -112,7 +110,7 @@ package_mencoder() { 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' - 'libvorbis' 'opus' 'rtmpdump' 'gsm' + 'libvorbis' 'opus' 'rtmpdump' 'gsm' 'libdvdnav' ) make -C $pkgbase-$pkgver DESTDIR="$pkgdir" install-mencoder install-mencoder-man diff --git a/abs/core/mplayer/giflib51.patch b/abs/core/mplayer/giflib51.patch deleted file mode 100644 index e884b39..0000000 --- a/abs/core/mplayer/giflib51.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- libvo/vo_gif89a.c.orig 2014-06-11 10:06:29.243216331 +0000 -+++ libvo/vo_gif89a.c 2014-06-11 10:08:37.346078847 +0000 -@@ -75,6 +75,9 @@ - #define MakeMapObject GifMakeMapObject - #define FreeMapObject GifFreeMapObject - #define QuantizeBuffer GifQuantizeBuffer -+#if defined GIFLIB_MINOR && GIFLIB_MINOR >= 1 -+#define EGifCloseFile(a) EGifCloseFile(a, NULL) -+#endif - #endif - - // how many frames per second we are aiming for during output. ---- libmpdemux/demux_gif.c.orig 2014-06-11 10:46:48.120883788 +0000 -+++ libmpdemux/demux_gif.c 2014-06-11 10:47:28.290732272 +0000 -@@ -50,6 +50,9 @@ - #define DGifOpenFileHandle(a) DGifOpenFileHandle(a, NULL) - #define GifError() (gif ? gif->Error : 0) - #define GifErrorString() GifErrorString(gif->Error) -+#if defined GIFLIB_MINOR && GIFLIB_MINOR >= 1 -+#define DGifCloseFile(a) DGifCloseFile(a, NULL) -+#endif - #endif - - /* >= 4.2 prior GIFLIB did not have MAJOR/MINOR defines */ -- cgit v0.12 From 8d1ee123cb808870ef055f036053cc60f1ec39d2 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 7 Aug 2015 16:28:46 +0000 Subject: jsoncpp: initial inclusion. dep of cmake --- abs/extra/jsoncpp/PKGBUILD | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 abs/extra/jsoncpp/PKGBUILD diff --git a/abs/extra/jsoncpp/PKGBUILD b/abs/extra/jsoncpp/PKGBUILD new file mode 100644 index 0000000..0fd2f2a --- /dev/null +++ b/abs/extra/jsoncpp/PKGBUILD @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Andrea Scarpino +# Contributor: Jonahtan Schaeffer +# COntributor: Drake Arconis + +pkgname=jsoncpp +pkgver=1.6.5 +pkgrel=1 +pkgdesc='A C++ library for interacting with JSON' +url='https://github.com/open-source-parsers/jsoncpp' +license=('MIT' 'custom:Public_Domain') +arch=('i686' 'x86_64') +depends=('gcc-libs') +makedepends=('cmake') +source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/open-source-parsers/${pkgname}/archive/${pkgver}.tar.gz") +md5sums=('2bb16bb8d2b867acbdd71d1855062a89') + +build() { + cd ${pkgname}-${pkgver} + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_STATIC_LIBS=OFF + make +} + +check() { + cd ${pkgname}-${pkgver} + make test +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + -- cgit v0.12 From 3919048423f24816f3ea1bb621daf447d6da05ac Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 7 Aug 2015 17:05:55 +0000 Subject: emacs: update to 24.5 --- abs/extra/emacs/PKGBUILD | 19 +++++++++++-------- abs/extra/emacs/emacs.install | 10 +++++----- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/abs/extra/emacs/PKGBUILD b/abs/extra/emacs/PKGBUILD index f22828a..1d87274 100644 --- a/abs/extra/emacs/PKGBUILD +++ b/abs/extra/emacs/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 171502 2012-11-18 08:01:29Z eric $ +# $Id$ # Maintainer: Juergen Hoetzel # Contributor: Renchi Raju pkgname=emacs -pkgver=24.2 -pkgrel=3 +pkgver=24.5 +pkgrel=1 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html" license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig}) -md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158') - +validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) +md5sums=('50560ee00bac9bb9cf0e822764cd0832' + 'SKIP') build() { cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk3 --with-xft make } @@ -29,6 +30,8 @@ package() { # remove conflict with ctags package mv "$pkgdir"/usr/bin/{ctags,ctags.emacs} mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1} + # remove conflict with texinfo + rm "$pkgdir"/usr/share/info/info.info.gz # fix user/root permissions on usr/share files find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \; # fix perms on /var/games diff --git a/abs/extra/emacs/emacs.install b/abs/extra/emacs/emacs.install index fa9ffee..6712f44 100644 --- a/abs/extra/emacs/emacs.install +++ b/abs/extra/emacs/emacs.install @@ -1,11 +1,11 @@ ICON_PATH=usr/share/icons/hicolor INFO_DIR=usr/share/info -INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse +INFO_FILES=(ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake -forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode +forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail -speedbar tramp url vip viper widget woman) +speedbar srecode tramp url vip viper widget wisent woman) post_install() { gtk-update-icon-cache -q -t -f ${ICON_PATH} @@ -13,7 +13,7 @@ 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 + install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null done } @@ -27,6 +27,6 @@ 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 + install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null done } -- cgit v0.12 From ebceeeaf0b0b2052988a29d9734dcc5e79c4eb8c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 7 Aug 2015 17:17:56 +0000 Subject: cmake: update to 3.3.0 --- abs/core/cmake/PKGBUILD | 50 +++++++++++++++++++++++---------------- abs/core/cmake/__changelog | 2 ++ abs/core/cmake/findfreetype.patch | 26 -------------------- abs/core/cmake/rebuild.list | 5 ++++ 4 files changed, 37 insertions(+), 46 deletions(-) create mode 100644 abs/core/cmake/__changelog delete mode 100644 abs/core/cmake/findfreetype.patch create mode 100644 abs/core/cmake/rebuild.list diff --git a/abs/core/cmake/PKGBUILD b/abs/core/cmake/PKGBUILD index eb20157..7c29e73 100644 --- a/abs/core/cmake/PKGBUILD +++ b/abs/core/cmake/PKGBUILD @@ -1,31 +1,34 @@ -# $Id: PKGBUILD 200685 2013-12-02 11:59:05Z svenstaro $ -# Maintainer: Andrea Scarpino +# $Id$ +# Maintainer: Felix Yan +# Contributor: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=cmake -pkgver=2.8.12.1 -pkgrel=3 -pkgdesc="A cross-platform open-source make system" +pkgver=3.3.0 +pkgrel=1 +pkgdesc='A cross-platform open-source make system' arch=('i686' 'x86_64') url="http://www.cmake.org/" license=('custom') -depends=('curl' 'libarchive' 'shared-mime-info') -makedepends=('qt' 'emacs') -optdepends=('qt: cmake-gui') +depends=('curl' 'libarchive' 'shared-mime-info' 'jsoncpp') +makedepends=('python2-sphinx' 'emacs') +optdepends=('qt5-base: cmake-gui' + 'libxkbcommon-x11: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" - "findfreetype.patch") -md5sums=('9d38cd4e2c94c3cea97d0e2924814acc' - '90321de1d9d46cd8d6609d0509dbd7b0') +source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz") +md5sums=('b1d4823e3f74c961486d9f253da9825d') -build() { +prepare() { cd ${pkgname}-${pkgver} +} - patch -Np1 < ${srcdir}/findfreetype.patch +build() { + cd ${pkgname}-${pkgver} ./bootstrap --prefix=/usr \ --mandir=/share/man \ --docdir=/share/doc/cmake \ + --sphinx-man \ --system-libs \ --qt-gui \ --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN) @@ -37,12 +40,19 @@ package() { make DESTDIR="${pkgdir}" install vimpath="${pkgdir}/usr/share/vim/vimfiles" - install -Dm644 Docs/cmake-indent.vim "${vimpath}"/indent/cmake-indent.vim - install -Dm644 Docs/cmake-syntax.vim "${vimpath}"/syntax/cmake-syntax.vim - - install -Dm644 Docs/cmake-mode.el \ - "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el - emacs -batch -f batch-byte-compile "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el + install -d "${vimpath}"/{help,indent,syntax} + ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-help.vim \ + "${vimpath}"/help/ + ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-indent.vim \ + "${vimpath}"/indent/ + ln -s /usr/share/cmake-${pkgver%.*}/editors/vim/cmake-syntax.vim \ + "${vimpath}"/syntax/ + + install -d "${pkgdir}"/usr/share/emacs/site-lisp/ + emacs -batch -f batch-byte-compile \ + "${pkgdir}"/usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el + ln -s /usr/share/cmake-${pkgver%.*}/editors/emacs/cmake-mode.el \ + "${pkgdir}"/usr/share/emacs/site-lisp/ install -Dm644 Copyright.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/abs/core/cmake/__changelog b/abs/core/cmake/__changelog new file mode 100644 index 0000000..40ac04b --- /dev/null +++ b/abs/core/cmake/__changelog @@ -0,0 +1,2 @@ +PKGBUILD: change dep python-sphinx to python2-sphinx +PKGBUILD: remvoe makedep qt5-base diff --git a/abs/core/cmake/findfreetype.patch b/abs/core/cmake/findfreetype.patch deleted file mode 100644 index 454b591..0000000 --- a/abs/core/cmake/findfreetype.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake -index 179dc00..0f5a2b4 100644 ---- a/Modules/FindFreetype.cmake -+++ b/Modules/FindFreetype.cmake -@@ -62,10 +62,10 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h - ENV GTKMM_BASEPATH - [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] -- PATH_SUFFIXES include/freetype2 include -+ PATH_SUFFIXES include/freetype2 include/freetype include - ) - --find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h -+find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h - HINTS - ENV FREETYPE_DIR - PATHS -@@ -76,7 +76,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h - ENV GTKMM_BASEPATH - [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] -- PATH_SUFFIXES include/freetype2 include -+ PATH_SUFFIXES include/freetype2 include/freetype include include/freetype2/freetype - ) - - find_library(FREETYPE_LIBRARY diff --git a/abs/core/cmake/rebuild.list b/abs/core/cmake/rebuild.list new file mode 100644 index 0000000..de3bb0f --- /dev/null +++ b/abs/core/cmake/rebuild.list @@ -0,0 +1,5 @@ +quazip +glm +gluon +sfml +wt -- cgit v0.12 From 2f19f06e4cd2f8f65774f37080e4856fb69beabf Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 7 Aug 2015 17:22:19 +0000 Subject: libgudev: initial inclusion. dep of handbrake --- abs/extra/libgudev/PKGBUILD | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 abs/extra/libgudev/PKGBUILD diff --git a/abs/extra/libgudev/PKGBUILD b/abs/extra/libgudev/PKGBUILD new file mode 100644 index 0000000..363b588 --- /dev/null +++ b/abs/extra/libgudev/PKGBUILD @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Evangelos Foutras + +pkgname=libgudev +pkgver=230 +pkgrel=1 +pkgdesc="GObject bindings for libudev" +arch=('i686' 'x86_64') +url="https://wiki.gnome.org/Projects/libgudev" +license=('LGPL2.1') +depends=('libsystemd') +makedepends=('systemd' 'gobject-introspection' 'gtk-doc') +provides=('libgudev-1.0.so') +conflicts=('libsystemd<221') +source=(https://download.gnome.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) +sha256sums=('a2e77faced0c66d7498403adefcc0707105e03db71a2b2abd620025b86347c18') + +build() { + cd "$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --enable-gtk-doc + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: -- cgit v0.12 From 90e88a2c7e5ffafd09c05c3925d70e01420b1d23 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 7 Aug 2015 17:33:07 +0000 Subject: lz4: initial inclusion --- abs/core/lz4/PKGBUILD | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 abs/core/lz4/PKGBUILD diff --git a/abs/core/lz4/PKGBUILD b/abs/core/lz4/PKGBUILD new file mode 100644 index 0000000..cce3553 --- /dev/null +++ b/abs/core/lz4/PKGBUILD @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Sébastien Luttringer + +# Contacted by mail, author use svn commit as release version. +# He only push tested release code into svn and support using revision as version + +pkgname=lz4 +pkgver=131 +pkgrel=1 +pkgdesc='Very fast lossless compression algorithm' +arch=('i686' 'x86_64') +url='https://github.com/Cyan4973/lz4' +license=('GPL2') +makedepends=('git') +checkdepends=('diffutils') +depends=('glibc') +source=("git+https://github.com/Cyan4973/lz4.git#tag=r$pkgver") +md5sums=('SKIP') + +build() { + cd $pkgname + make PREFIX=/usr +} + +check() { + $pkgname/programs/lz4 /etc/passwd passwd.lz4 + $pkgname/programs/lz4 -d passwd.lz4 passwd + diff -q /etc/passwd passwd + rm passwd +} + +package() { + cd $pkgname + make install PREFIX=/usr DESTDIR="$pkgdir" +} + +# vim:set ts=2 sw=2 et: -- cgit v0.12 From 7e9d5ed1e5eeefe36fed0522dc993e76d29587c8 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 7 Aug 2015 18:13:15 +0000 Subject: libseccomp: initial inclusion --- abs/core/libseccomp/PKGBUILD | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 abs/core/libseccomp/PKGBUILD diff --git a/abs/core/libseccomp/PKGBUILD b/abs/core/libseccomp/PKGBUILD new file mode 100644 index 0000000..63a4d4e --- /dev/null +++ b/abs/core/libseccomp/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Daniel Micay +# Contributor: Patryk Kowalczyk < patryk at kowalczyk dot ws> + +pkgname=libseccomp +pkgver=2.2.3 +pkgrel=1 +pkgdesc='Enhanced seccomp library' +arch=('i686' 'x86_64') +license=('LGPL2.1') +url="http://sourceforge.net/projects/libseccomp/" +depends=('glibc') +source=("https://github.com/seccomp/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz") +md5sums=('7db418d35d7a6168400bf6b05502f8bf') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} -- cgit v0.12 From bc3c70f5ecf22018224f20ed9add8799de133194 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 7 Aug 2015 18:56:23 +0000 Subject: systemd: update to 224 --- ...ng-references-to-var-lib-backlight-random.patch | 54 --- ...ator-When-parsing-the-root-cmdline-option.patch | 29 -- ...-stop-a-running-user-manager-from-garbage.patch | 36 -- ...unt-check-for-NULL-before-reading-pm-what.patch | 29 -- ...-fix-off-by-one-error-in-tag_to_udev_node.patch | 50 --- ...ator-Generate-explicit-dependencies-on-sy.patch | 102 ------ ...nerator-Generate-explicit-dependencies-on.patch | 55 ---- ...FsckPassNo-from-systemd-fsck-root.service.patch | 22 -- ...005-mount-service-drop-FsckPassNo-support.patch | 364 --------------------- .../0006-efi-boot-generator-hookup-to-fsck.patch | 81 ----- ...sck-root-only-run-when-requested-in-fstab.patch | 95 ------ abs/core/systemd/PKGBUILD | 171 +++++----- abs/core/systemd/__changelog | 4 + abs/core/systemd/arch.conf | 7 + abs/core/systemd/initcpio-hook-udev | 2 +- abs/core/systemd/initcpio-install-systemd | 39 ++- abs/core/systemd/initcpio-install-udev | 1 - abs/core/systemd/loader.conf | 1 + abs/core/systemd/splash-arch.bmp | Bin 0 -> 378226 bytes abs/core/systemd/systemd.install | 225 +++++++++---- 20 files changed, 278 insertions(+), 1089 deletions(-) delete mode 100644 abs/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch delete mode 100644 abs/core/systemd/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch delete mode 100644 abs/core/systemd/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch delete mode 100644 abs/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch delete mode 100644 abs/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch delete mode 100644 abs/core/systemd/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch delete mode 100644 abs/core/systemd/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch delete mode 100644 abs/core/systemd/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch delete mode 100644 abs/core/systemd/0005-mount-service-drop-FsckPassNo-support.patch delete mode 100644 abs/core/systemd/0006-efi-boot-generator-hookup-to-fsck.patch delete mode 100644 abs/core/systemd/0007-fsck-root-only-run-when-requested-in-fstab.patch mode change 100755 => 100644 abs/core/systemd/PKGBUILD create mode 100644 abs/core/systemd/__changelog create mode 100644 abs/core/systemd/arch.conf create mode 100644 abs/core/systemd/loader.conf create mode 100644 abs/core/systemd/splash-arch.bmp diff --git a/abs/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch b/abs/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch deleted file mode 100644 index 49b960c..0000000 --- a/abs/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6c8c92fef72cf6a7ef7109a424ef82dbdc4f6952 Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Wed, 2 Oct 2013 07:46:24 -0400 -Subject: [PATCH] fix lingering references to /var/lib/{backlight,random-seed} - -This should have been part of ef5bfcf668e6029faa78534dfe. ---- - man/systemd-backlight@.service.xml | 2 +- - man/systemd-random-seed.service.xml | 2 +- - units/systemd-backlight@.service.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/man/systemd-backlight@.service.xml b/man/systemd-backlight@.service.xml -index 2b73625..4318964 100644 ---- a/man/systemd-backlight@.service.xml -+++ b/man/systemd-backlight@.service.xml -@@ -58,7 +58,7 @@ - is a service that restores the display backlight - brightness at early-boot and saves it at shutdown. On - disk, the backlight brightness is stored in -- /var/lib/backlight/. Note that by -+ /var/lib/systemd/backlight/. Note that by - default, only firmware backlight devices are - saved/restored. - -diff --git a/man/systemd-random-seed.service.xml b/man/systemd-random-seed.service.xml -index 8cd14b7..e5cd037 100644 ---- a/man/systemd-random-seed.service.xml -+++ b/man/systemd-random-seed.service.xml -@@ -61,7 +61,7 @@ - for details. Saving/restoring the random seed across - boots increases the amount of available entropy early - at boot. On disk the random seed is stored in -- /var/lib/random-seed. -+ /var/lib/systemd/random-seed. - - - -diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in -index b0e75db..5caa5d5 100644 ---- a/units/systemd-backlight@.service.in -+++ b/units/systemd-backlight@.service.in -@@ -9,7 +9,7 @@ - Description=Load/Save Screen Backlight Brightness of %I - Documentation=man:systemd-backlight@.service(8) - DefaultDependencies=no --RequiresMountsFor=/var/lib/backlight -+RequiresMountsFor=/var/lib/systemd/backlight - Conflicts=shutdown.target - After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service - Before=sysinit.target shutdown.target --- -1.8.4 - diff --git a/abs/core/systemd/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch b/abs/core/systemd/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch deleted file mode 100644 index 3cdbcf0..0000000 --- a/abs/core/systemd/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7f5806d7095a197e4788a7803642831beec295bf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= -Date: Mon, 30 Sep 2013 00:32:33 +0200 -Subject: [PATCH 1/7] fstab-generator: When parsing the root= cmdline option, - set FsckPassNo to 1 - -[tomegun: without this we would never fsck the rootfs if it was directly -mounted 'rw' from the initrd. We now risk fsck'ing it twice in the case it -is mounted 'ro', so that should be addressed in a separate patch.] ---- - src/fstab-generator/fstab-generator.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c -index 9e7d55d..a7536f8 100644 ---- a/src/fstab-generator/fstab-generator.c -+++ b/src/fstab-generator/fstab-generator.c -@@ -442,7 +442,7 @@ static int parse_new_root_from_proc_cmdline(void) { - } - - log_debug("Found entry what=%s where=/sysroot type=%s", what, type); -- r = add_mount(what, "/sysroot", type, opts, 0, noauto, nofail, false, -+ r = add_mount(what, "/sysroot", type, opts, 1, noauto, nofail, false, - SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline"); - - return (r < 0) ? r : 0; --- -1.8.5.1 - diff --git a/abs/core/systemd/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch b/abs/core/systemd/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch deleted file mode 100644 index 9a92209..0000000 --- a/abs/core/systemd/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 95842c3f552072c9d153b3c0200f1bbb5bc3c2fb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= -Date: Sun, 15 Dec 2013 12:18:00 +0100 -Subject: [PATCH] login: Don't stop a running user manager from - garbage-collecting the user. - -With the current logic, a user will never be garbage-collected, since its -manager will always be around. Change the logic such that a user is -garbage-collected when it has no sessions and linger is disabled. - -This is a backport from the master branch to 208 which also backports -the improved handling of running slice and service jobs. ---- - src/login/logind-user.c | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/src/login/logind-user.c b/src/login/logind-user.c -index adbe638..e2fce5c 100644 ---- a/src/login/logind-user.c -+++ b/src/login/logind-user.c -@@ -629,12 +629,6 @@ int user_check_gc(User *u, bool drop_not_started) { - if (u->slice_job || u->service_job) - return 1; - -- if (u->slice && manager_unit_is_active(u->manager, u->slice) != 0) -- return 1; -- -- if (u->service && manager_unit_is_active(u->manager, u->service) != 0) -- return 1; -- - return 0; - } - --- -1.8.5.1 - diff --git a/abs/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch b/abs/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch deleted file mode 100644 index 2725648..0000000 --- a/abs/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9c03872bc8fb2a381eafe7301ef9811b641686dd Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Fri, 4 Oct 2013 18:22:40 -0400 -Subject: [PATCH] mount: check for NULL before reading pm->what - -Since a57f7e2c828b85, a mount unit with garbage in it would cause -systemd to crash on loading it. - -ref: https://bugs.freedesktop.org/show_bug.cgi?id=70148 ---- - src/core/mount.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/mount.c b/src/core/mount.c -index 93bfa99..db055f0 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -182,7 +182,7 @@ static int mount_add_mount_links(Mount *m) { - * for the source path (if this is a bind mount) to be - * available. */ - pm = get_mount_parameters_fragment(m); -- if (pm && path_is_absolute(pm->what)) { -+ if (pm && pm->what && path_is_absolute(pm->what)) { - r = unit_require_mounts_for(UNIT(m), pm->what); - if (r < 0) - return r; --- -1.8.4.1 - diff --git a/abs/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch b/abs/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch deleted file mode 100644 index 8c8ea46..0000000 --- a/abs/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 1d5989fd803d2019de0f6aaaf3cfb1cb2bbc3cdb Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Sun, 6 Oct 2013 18:26:23 -0400 -Subject: [PATCH] shared/util: fix off-by-one error in tag_to_udev_node - -Triggered false negatives when encoding a string which needed every -character to be escaped, e.g. "LABEL=/". ---- - src/shared/util.c | 2 +- - src/test/test-device-nodes.c | 4 +++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/shared/util.c b/src/shared/util.c -index 82f4221..31cea79 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c -@@ -3527,7 +3527,7 @@ static char *tag_to_udev_node(const char *tagvalue, const char *by) { - if (u == NULL) - return NULL; - -- enc_len = strlen(u) * 4; -+ enc_len = strlen(u) * 4 + 1; - t = new(char, enc_len); - if (t == NULL) - return NULL; -diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c -index 2f3dedb..59ba4be 100644 ---- a/src/test/test-device-nodes.c -+++ b/src/test/test-device-nodes.c -@@ -26,7 +26,7 @@ - - /* helpers for test_encode_devnode_name */ - static char *do_encode_string(const char *in) { -- size_t out_len = strlen(in) * 4; -+ size_t out_len = strlen(in) * 4 + 1; - char *out = malloc(out_len); - - assert_se(out); -@@ -46,6 +46,8 @@ static void test_encode_devnode_name(void) { - assert_se(expect_encoded_as("pinkiepie", "pinkiepie")); - assert_se(expect_encoded_as("valíd\\ųtf8", "valíd\\x5cųtf8")); - assert_se(expect_encoded_as("s/ash/ng", "s\\x2fash\\x2fng")); -+ assert_se(expect_encoded_as("/", "\\x2f")); -+ assert_se(expect_encoded_as("!", "\\x21")); - } - - int main(int argc, char *argv[]) { --- -1.8.4.1 - diff --git a/abs/core/systemd/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch b/abs/core/systemd/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch deleted file mode 100644 index 57edf64..0000000 --- a/abs/core/systemd/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 64e70e4b86d3f732d3513189312f6220d1d5cfbc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= -Date: Mon, 30 Sep 2013 01:34:44 +0200 -Subject: [PATCH 2/7] fstab-generator: Generate explicit dependencies on - systemd-fsck@.service instead of using FsckPassNo - -[tomegun: - * order all fsck instances after fsck-root - * check for OOM - * added notes in the manpages] ---- - man/systemd-fsck@.service.xml | 3 ++- - man/systemd-fstab-generator.xml | 5 +++++ - src/fstab-generator/fstab-generator.c | 21 +++++++++++++++++---- - units/systemd-fsck@.service.in | 2 +- - 4 files changed, 25 insertions(+), 6 deletions(-) - -diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml -index e934352..17bd1c0 100644 ---- a/man/systemd-fsck@.service.xml -+++ b/man/systemd-fsck@.service.xml -@@ -62,7 +62,8 @@ - system - check. systemd-fsck-root.service is - responsible for file system checks on the root -- file system. -+ file system. The root file system check is performed -+ before the other file systems. - - systemd-fsck will - forward file system checking progress to the -diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml -index 9ca16c7..740db8f 100644 ---- a/man/systemd-fstab-generator.xml -+++ b/man/systemd-fstab-generator.xml -@@ -61,6 +61,11 @@ - reloaded. This will instantiate mount and swap units - as necessary. - -+ The passno field -+ is treated like a simlpe boolean, and the ordering information -+ is discarded. However, the root filesystem is checked -+ before all the other filesystems. -+ - See - systemd.mount5 - and -diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c -index a7536f8..77247de 100644 ---- a/src/fstab-generator/fstab-generator.c -+++ b/src/fstab-generator/fstab-generator.c -@@ -209,17 +209,30 @@ static int add_mount( - "Before=%s\n", - post); - -+ if (passno > 0) { -+ _cleanup_free_ char *fsck = NULL; -+ -+ fsck = unit_name_from_path_instance("systemd-fsck", what, ".service"); -+ if (!fsck) -+ return log_oom(); -+ -+ fprintf(f, -+ "Requires=%s\n" -+ "After=%s\n", -+ fsck, -+ fsck); -+ } -+ -+ - fprintf(f, - "\n" - "[Mount]\n" - "What=%s\n" - "Where=%s\n" -- "Type=%s\n" -- "FsckPassNo=%i\n", -+ "Type=%s\n", - what, - where, -- type, -- passno); -+ type); - - if (!isempty(opts) && - !streq(opts, "defaults")) -diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in -index e229cdc..c12efa8 100644 ---- a/units/systemd-fsck@.service.in -+++ b/units/systemd-fsck@.service.in -@@ -10,7 +10,7 @@ Description=File System Check on %f - Documentation=man:systemd-fsck@.service(8) - DefaultDependencies=no - BindsTo=%i.device --After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device -+After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device systemd-fsck-root.service - Before=shutdown.target - - [Service] --- -1.8.5.1 - diff --git a/abs/core/systemd/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch b/abs/core/systemd/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch deleted file mode 100644 index c1b3aa0..0000000 --- a/abs/core/systemd/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 4c8bda2442bfc6d84a5deb241dc29efcb81bf3af Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= -Date: Mon, 30 Sep 2013 01:34:45 +0200 -Subject: [PATCH 3/7] gpt-auto-generator: Generate explicit dependencies on - systemd-fsck@.service instead of using FsckPassNo - -[tomegun: check for OOM] ---- - src/gpt-auto-generator/gpt-auto-generator.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c -index fae4b71..25440e7 100644 ---- a/src/gpt-auto-generator/gpt-auto-generator.c -+++ b/src/gpt-auto-generator/gpt-auto-generator.c -@@ -182,7 +182,7 @@ static int add_swap(const char *path, const char *fstype) { - } - - static int add_home(const char *path, const char *fstype) { -- _cleanup_free_ char *unit = NULL, *lnk = NULL; -+ _cleanup_free_ char *unit = NULL, *lnk = NULL, *fsck = NULL; - _cleanup_fclose_ FILE *f = NULL; - - if (dir_is_empty("/home") <= 0) -@@ -200,19 +200,23 @@ static int add_home(const char *path, const char *fstype) { - return -errno; - } - -+ fsck = unit_name_from_path_instance("systemd-fsck", path, ".service"); -+ if (!fsck) -+ return log_oom(); -+ - fprintf(f, - "# Automatically generated by systemd-gpt-auto-generator\n\n" - "[Unit]\n" - "DefaultDependencies=no\n" -- "After=" SPECIAL_LOCAL_FS_PRE_TARGET "\n" -+ "Requires=%s\n" -+ "After=" SPECIAL_LOCAL_FS_PRE_TARGET " %s\n" - "Conflicts=" SPECIAL_UMOUNT_TARGET "\n" - "Before=" SPECIAL_UMOUNT_TARGET " " SPECIAL_LOCAL_FS_TARGET "\n\n" - "[Mount]\n" - "What=%s\n" - "Where=/home\n" -- "Type=%s\n" -- "FsckPassNo=2\n", -- path, fstype); -+ "Type=%s\n", -+ fsck, fsck, path, fstype); - - fflush(f); - if (ferror(f)) { --- -1.8.5.1 - diff --git a/abs/core/systemd/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch b/abs/core/systemd/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch deleted file mode 100644 index 90ff545..0000000 --- a/abs/core/systemd/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4952a9beff339b75641a7a84c226c11d6bd680c4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= -Date: Mon, 30 Sep 2013 01:34:46 +0200 -Subject: [PATCH 4/7] Remove FsckPassNo from systemd-fsck-root.service - ---- - units/systemd-fsck-root.service.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in -index 4388314..4162983 100644 ---- a/units/systemd-fsck-root.service.in -+++ b/units/systemd-fsck-root.service.in -@@ -19,5 +19,4 @@ Type=oneshot - RemainAfterExit=yes - ExecStart=@rootlibexecdir@/systemd-fsck - StandardOutput=journal+console --FsckPassNo=1 - TimeoutSec=0 --- -1.8.5.1 - diff --git a/abs/core/systemd/0005-mount-service-drop-FsckPassNo-support.patch b/abs/core/systemd/0005-mount-service-drop-FsckPassNo-support.patch deleted file mode 100644 index 9758c46..0000000 --- a/abs/core/systemd/0005-mount-service-drop-FsckPassNo-support.patch +++ /dev/null @@ -1,364 +0,0 @@ -From accdd018ede77ef1c057775396c18c73406cbcb4 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen -Date: Sat, 5 Oct 2013 17:28:09 +0200 -Subject: [PATCH 5/7] mount/service: drop FsckPassNo support - -We now treat passno as boleans in the generators, and don't need this any more. fsck itself -is able to sequentialize checks on the same local media, so in the common case the ordering -is redundant. - -It is still possible to force an order by using .d fragments, in case that is desired. ---- - TODO | 4 --- - man/systemd.mount.xml | 22 --------------- - man/systemd.service.xml | 27 ------------------- - src/core/load-fragment-gperf.gperf.m4 | 2 -- - src/core/load-fragment.c | 30 --------------------- - src/core/load-fragment.h | 1 - - src/core/mount.c | 32 +--------------------- - src/core/mount.h | 1 - - src/core/service.c | 51 ----------------------------------- - src/core/service.h | 2 -- - 10 files changed, 1 insertion(+), 171 deletions(-) - -diff --git a/TODO b/TODO -index 29a76ef..f0060d9 100644 ---- a/TODO -+++ b/TODO -@@ -84,8 +84,6 @@ Features: - - * ensure scope units may be started only a single time - --* document that in instead of FsckPassNo= people should just add a manual dep to systemd-fsck@.service to their mount units. -- - * better error message if you run systemctl without systemd running - - * systemctl status output should should include list of triggering units and their status -@@ -562,8 +560,6 @@ Features: - - * when breaking cycles drop sysv services first, then services from /run, then from /etc, then from /usr - --* move passno parsing to fstab generator -- - * automount: implement expire: - - set superblock timeout AUTOFS_DEV_IOCTL_TIMEOUT_CMD - - periodically run AUTOFS_DEV_IOCTL_EXPIRE_CMD -diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml -index 48af1ca..217289a 100644 ---- a/man/systemd.mount.xml -+++ b/man/systemd.mount.xml -@@ -273,28 +273,6 @@ - - - -- Compatibility Options -- -- The following option is also available in the -- [Mount] section, but exists purely -- for compatibility reasons and should not be used in -- newly written mount files. -- -- -- -- FsckPassNo= -- -- The pass number for -- the file system checking service for -- this mount. See -- systemd.service5 -- for more information on this setting. -- -- -- -- -- -- - See Also - - systemd1, -diff --git a/man/systemd.service.xml b/man/systemd.service.xml -index 81a4078..b1e3af2 100644 ---- a/man/systemd.service.xml -+++ b/man/systemd.service.xml -@@ -970,33 +970,6 @@ - range 0-99. - - -- -- FsckPassNo= -- Set the fsck passno -- priority to use to order this service -- in relation to other file system -- checking services. This option is only -- necessary to fix ordering in relation -- to fsck jobs automatically created for -- all /etc/fstab -- entries with a value in the fs_passno -- column > 0. As such it should only be -- used as option for fsck -- services. Almost always it is a better -- choice to add explicit ordering -- directives via -- After= or -- Before=, -- instead. For more details see -- systemd.unit5. If -- used, pass an integer value in the -- same range as -- /etc/fstab's -- fs_passno column. See -- fstab5 -- for details. -- -- - - - -diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 -index 31fb7bc..e3025d2 100644 ---- a/src/core/load-fragment-gperf.gperf.m4 -+++ b/src/core/load-fragment-gperf.gperf.m4 -@@ -173,7 +173,6 @@ Service.NonBlocking, config_parse_bool, 0, - Service.BusName, config_parse_unit_string_printf, 0, offsetof(Service, bus_name) - Service.NotifyAccess, config_parse_notify_access, 0, offsetof(Service, notify_access) - Service.Sockets, config_parse_service_sockets, 0, 0 --Service.FsckPassNo, config_parse_fsck_passno, 0, offsetof(Service, fsck_passno) - EXEC_CONTEXT_CONFIG_ITEMS(Service)m4_dnl - CGROUP_CONTEXT_CONFIG_ITEMS(Service)m4_dnl - KILL_CONTEXT_CONFIG_ITEMS(Service)m4_dnl -@@ -225,7 +224,6 @@ Mount.What, config_parse_string, 0, - Mount.Where, config_parse_path, 0, offsetof(Mount, where) - Mount.Options, config_parse_string, 0, offsetof(Mount, parameters_fragment.options) - Mount.Type, config_parse_string, 0, offsetof(Mount, parameters_fragment.fstype) --Mount.FsckPassNo, config_parse_fsck_passno, 0, offsetof(Mount, parameters_fragment.passno) - Mount.TimeoutSec, config_parse_sec, 0, offsetof(Mount, timeout_usec) - Mount.DirectoryMode, config_parse_mode, 0, offsetof(Mount, directory_mode) - EXEC_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl -diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index fb7efca..4067930 100644 ---- a/src/core/load-fragment.c -+++ b/src/core/load-fragment.c -@@ -1033,35 +1033,6 @@ int config_parse_sysv_priority(const char *unit, - } - #endif - --int config_parse_fsck_passno(const char *unit, -- const char *filename, -- unsigned line, -- const char *section, -- const char *lvalue, -- int ltype, -- const char *rvalue, -- void *data, -- void *userdata) { -- -- int *passno = data; -- int i, r; -- -- assert(filename); -- assert(lvalue); -- assert(rvalue); -- assert(data); -- -- r = safe_atoi(rvalue, &i); -- if (r || i < 0) { -- log_syntax(unit, LOG_ERR, filename, line, -r, -- "Failed to parse fsck pass number, ignoring: %s", rvalue); -- return 0; -- } -- -- *passno = (int) i; -- return 0; --} -- - DEFINE_CONFIG_PARSE_ENUM(config_parse_kill_mode, kill_mode, KillMode, "Failed to parse kill mode"); - - int config_parse_kill_signal(const char *unit, -@@ -2708,7 +2679,6 @@ void unit_dump_config_items(FILE *f) { - { config_parse_start_limit_action, "ACTION" }, - { config_parse_set_status, "STATUS" }, - { config_parse_service_sockets, "SOCKETS" }, -- { config_parse_fsck_passno, "PASSNO" }, - { config_parse_environ, "ENVIRON" }, - { config_parse_syscall_filter, "SYSCALL" }, - { config_parse_cpu_shares, "SHARES" }, -diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h -index 90e5e3a..404df76 100644 ---- a/src/core/load-fragment.h -+++ b/src/core/load-fragment.h -@@ -56,7 +56,6 @@ int config_parse_exec_secure_bits(const char *unit, const char *filename, unsign - int config_parse_bounding_set(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); - int config_parse_limit(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); - int config_parse_sysv_priority(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); --int config_parse_fsck_passno(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); - int config_parse_kill_signal(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); - int config_parse_exec_mount_flags(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); - int config_parse_timer(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); -diff --git a/src/core/mount.c b/src/core/mount.c -index 70cd372..88563b3 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -313,33 +313,6 @@ static int mount_add_device_links(Mount *m) { - if (r < 0) - return r; - -- if (p->passno > 0 && -- UNIT(m)->manager->running_as == SYSTEMD_SYSTEM) { -- char *name; -- Unit *fsck; -- /* Let's add in the fsck service */ -- -- /* aka SPECIAL_FSCK_SERVICE */ -- name = unit_name_from_path_instance("systemd-fsck", p->what, ".service"); -- if (!name) -- return -ENOMEM; -- -- r = manager_load_unit_prepare(UNIT(m)->manager, name, NULL, NULL, &fsck); -- if (r < 0) { -- log_warning_unit(name, -- "Failed to prepare unit %s: %s", name, strerror(-r)); -- free(name); -- return r; -- } -- free(name); -- -- SERVICE(fsck)->fsck_passno = p->passno; -- -- r = unit_add_two_dependencies(UNIT(m), UNIT_AFTER, UNIT_REQUIRES, fsck, true); -- if (r < 0) -- return r; -- } -- - return 0; - } - -@@ -1410,7 +1383,6 @@ static int mount_add_one( - const char *where, - const char *options, - const char *fstype, -- int passno, - bool set_flags) { - int r; - Unit *u; -@@ -1530,8 +1502,6 @@ static int mount_add_one( - free(p->fstype); - p->fstype = f; - -- p->passno = passno; -- - if (load_extras) { - r = mount_add_extras(MOUNT(u)); - if (r < 0) -@@ -1601,7 +1571,7 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) { - if (!d || !p) - return log_oom(); - -- k = mount_add_one(m, d, p, o, fstype, 0, set_flags); -+ k = mount_add_one(m, d, p, o, fstype, set_flags); - if (k < 0) - r = k; - } -diff --git a/src/core/mount.h b/src/core/mount.h -index 7cd4320..a955069 100644 ---- a/src/core/mount.h -+++ b/src/core/mount.h -@@ -58,7 +58,6 @@ typedef struct MountParameters { - char *what; - char *options; - char *fstype; -- int passno; - } MountParameters; - - typedef enum MountResult { -diff --git a/src/core/service.c b/src/core/service.c -index 96ed2d3..ce75757 100644 ---- a/src/core/service.c -+++ b/src/core/service.c -@@ -1056,48 +1056,6 @@ static int service_load_sysv(Service *s) { - } - #endif - --static int fsck_fix_order(Service *s) { -- Unit *other; -- int r; -- -- assert(s); -- -- if (s->fsck_passno <= 0) -- return 0; -- -- /* For each pair of services where both have an fsck priority -- * we order things based on it. */ -- -- LIST_FOREACH(units_by_type, other, UNIT(s)->manager->units_by_type[UNIT_SERVICE]) { -- Service *t; -- UnitDependency d; -- -- t = SERVICE(other); -- -- if (s == t) -- continue; -- -- if (UNIT(t)->load_state != UNIT_LOADED) -- continue; -- -- if (t->fsck_passno <= 0) -- continue; -- -- if (t->fsck_passno < s->fsck_passno) -- d = UNIT_AFTER; -- else if (t->fsck_passno > s->fsck_passno) -- d = UNIT_BEFORE; -- else -- continue; -- -- r = unit_add_dependency(UNIT(s), d, UNIT(t), true); -- if (r < 0) -- return r; -- } -- -- return 0; --} -- - static int service_verify(Service *s) { - assert(s); - -@@ -1254,10 +1212,6 @@ static int service_load(Unit *u) { - return r; - #endif - -- r = fsck_fix_order(s); -- if (r < 0) -- return r; -- - if (s->bus_name) - if ((r = unit_watch_bus_name(u, s->bus_name)) < 0) - return r; -@@ -1381,11 +1335,6 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { - prefix, s->sysv_runlevels); - #endif - -- if (s->fsck_passno > 0) -- fprintf(f, -- "%sFsckPassNo: %i\n", -- prefix, s->fsck_passno); -- - if (s->status_text) - fprintf(f, "%sStatus Text: %s\n", - prefix, s->status_text); -diff --git a/src/core/service.h b/src/core/service.h -index ce5b5e0..37fa6ff 100644 ---- a/src/core/service.h -+++ b/src/core/service.h -@@ -157,8 +157,6 @@ struct Service { - pid_t main_pid, control_pid; - int socket_fd; - -- int fsck_passno; -- - bool permissions_start_only; - bool root_directory_start_only; - bool remain_after_exit; --- -1.8.5.1 - diff --git a/abs/core/systemd/0006-efi-boot-generator-hookup-to-fsck.patch b/abs/core/systemd/0006-efi-boot-generator-hookup-to-fsck.patch deleted file mode 100644 index 3830ecf..0000000 --- a/abs/core/systemd/0006-efi-boot-generator-hookup-to-fsck.patch +++ /dev/null @@ -1,81 +0,0 @@ -From d09ee17da21b7ca2259067ac4e54f8a1cc3c0fc0 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen -Date: Sat, 5 Oct 2013 17:32:21 +0200 -Subject: [PATCH 6/7] efi-boot-generator: hookup to fsck - ---- - TODO | 1 - - src/efi-boot-generator/efi-boot-generator.c | 26 ++++++++++++++++++++++---- - 2 files changed, 22 insertions(+), 5 deletions(-) - -diff --git a/TODO b/TODO -index f0060d9..814d82d 100644 ---- a/TODO -+++ b/TODO -@@ -308,7 +308,6 @@ Features: - * introduce ExecCondition= in services - - * EFI: -- - fsck hookup for the ESP mount is missing - - write man page for efi boot generator - - honor language efi variables for default language selection (if there are any?) - - honor timezone efi variables for default timezone selection (if there are any?) -diff --git a/src/efi-boot-generator/efi-boot-generator.c b/src/efi-boot-generator/efi-boot-generator.c -index 05b95ed..e20d325 100644 ---- a/src/efi-boot-generator/efi-boot-generator.c -+++ b/src/efi-boot-generator/efi-boot-generator.c -@@ -26,13 +26,14 @@ - #include "path-util.h" - #include "util.h" - #include "mkdir.h" -+#include "unit-name.h" - - static const char *arg_dest = "/tmp"; - - int main(int argc, char *argv[]) { - int r = EXIT_SUCCESS; - sd_id128_t id; -- _cleanup_free_ char *name = NULL; -+ _cleanup_free_ char *name = NULL, *what = NULL, *fsck = NULL; - _cleanup_fclose_ FILE *f = NULL; - - if (argc > 1 && argc != 4) { -@@ -75,15 +76,32 @@ int main(int argc, char *argv[]) { - return EXIT_FAILURE; - } - -+ r = asprintf(&what, -+ "/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", -+ SD_ID128_FORMAT_VAL(id)); -+ if (r < 0) { -+ log_oom(); -+ return EXIT_FAILURE; -+ } -+ -+ fsck = unit_name_from_path_instance("systemd-fsck", what, ".service"); -+ if (!fsck) { -+ log_oom(); -+ return EXIT_FAILURE; -+ } -+ - fprintf(f, - "# Automatially generated by systemd-efi-boot-generator\n\n" - "[Unit]\n" -- "Description=EFI System Partition\n\n" -+ "Description=EFI System Partition\n" -+ "Requires=%s\n" -+ "After=%s\n" -+ "\n" - "[Mount]\n" - "Where=/boot\n" -- "What=/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n" -+ "What=%s\n" - "Options=umask=0077\n", -- SD_ID128_FORMAT_VAL(id)); -+ fsck, fsck, what); - - free(name); - name = strjoin(arg_dest, "/boot.automount", NULL); --- -1.8.5.1 - diff --git a/abs/core/systemd/0007-fsck-root-only-run-when-requested-in-fstab.patch b/abs/core/systemd/0007-fsck-root-only-run-when-requested-in-fstab.patch deleted file mode 100644 index 112b5b5..0000000 --- a/abs/core/systemd/0007-fsck-root-only-run-when-requested-in-fstab.patch +++ /dev/null @@ -1,95 +0,0 @@ -From a7623afb7a48ab1d7b5b24fbd5f1033acfb2301c Mon Sep 17 00:00:00 2001 -From: Tom Gundersen -Date: Sat, 19 Oct 2013 11:38:42 +0200 -Subject: [PATCH 7/7] fsck-root: only run when requested in fstab - -fsck-root is redundant in case an initrd is used, or in case the rootfs -is never remounted 'rw', so the new default is the correct behavior for -most users. For the rest, they should enable it in fstab. ---- - Makefile.am | 1 - - man/systemd-fsck@.service.xml | 4 +++- - src/fstab-generator/fstab-generator.c | 31 ++++++++++++++++++++++--------- - 3 files changed, 25 insertions(+), 11 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index ca01179..a29a32a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4447,7 +4447,6 @@ SYSINIT_TARGET_WANTS += \ - systemd-update-utmp.service - LOCAL_FS_TARGET_WANTS += \ - systemd-remount-fs.service \ -- systemd-fsck-root.service \ - tmp.mount - MULTI_USER_TARGET_WANTS += \ - getty.target \ -diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml -index 17bd1c0..811392b 100644 ---- a/man/systemd-fsck@.service.xml -+++ b/man/systemd-fsck@.service.xml -@@ -63,7 +63,9 @@ - check. systemd-fsck-root.service is - responsible for file system checks on the root - file system. The root file system check is performed -- before the other file systems. -+ before the other file systems. Either service is enabled -+ at boot if passno in /etc/fstab for -+ the filesystem is set to a value greater than zero. - - systemd-fsck will - forward file system checking progress to the -diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c -index 77247de..78d7609 100644 ---- a/src/fstab-generator/fstab-generator.c -+++ b/src/fstab-generator/fstab-generator.c -@@ -210,17 +210,29 @@ static int add_mount( - post); - - if (passno > 0) { -- _cleanup_free_ char *fsck = NULL; -+ if (streq(where, "/")) { -+ lnk = strjoin(arg_dest, "/", SPECIAL_LOCAL_FS_TARGET, ".wants/", "systemd-fsck-root.service", NULL); -+ if (!lnk) -+ return log_oom(); - -- fsck = unit_name_from_path_instance("systemd-fsck", what, ".service"); -- if (!fsck) -- return log_oom(); -+ mkdir_parents_label(lnk, 0755); -+ if (symlink("systemd-fsck-root.service", lnk) < 0) { -+ log_error("Failed to create symlink %s: %m", lnk); -+ return -errno; -+ } -+ } else { -+ _cleanup_free_ char *fsck = NULL; - -- fprintf(f, -- "Requires=%s\n" -- "After=%s\n", -- fsck, -- fsck); -+ fsck = unit_name_from_path_instance("systemd-fsck", what, ".service"); -+ if (!fsck) -+ return log_oom(); -+ -+ fprintf(f, -+ "Requires=%s\n" -+ "After=%s\n", -+ fsck, -+ fsck); -+ } - } - - -@@ -248,6 +260,7 @@ static int add_mount( - - if (!noauto) { - if (post) { -+ free(lnk); - lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL); - if (!lnk) - return log_oom(); --- -1.8.5.1 - diff --git a/abs/core/systemd/PKGBUILD b/abs/core/systemd/PKGBUILD old mode 100755 new mode 100644 index 59b0955..6e4bc37 --- a/abs/core/systemd/PKGBUILD +++ b/abs/core/systemd/PKGBUILD @@ -2,149 +2,163 @@ # Maintainer: Tom Gundersen pkgbase=systemd -pkgname=('systemd' 'systemd-sysvcompat') -pkgver=208 -pkgrel=6 +pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat') +pkgver=224 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" -makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' - 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd' 'libxslt' - 'linux-api-headers' 'pam' 'python2' 'quota-tools' 'xz') +makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' + 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt' + 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers' + 'python2-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git') options=('strip' 'debug') -source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" +source=("git://github.com/systemd/systemd.git#tag=v$pkgver" 'initcpio-hook-udev' 'initcpio-install-systemd' 'initcpio-install-udev' - '0001-fix-lingering-references-to-var-lib-backlight-random.patch' - '0001-mount-check-for-NULL-before-reading-pm-what.patch' - '0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch' - '0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch' - '0001-fstab-generator-When-parsing-the-root-cmdline-option.patch' - '0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch' - '0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch' - '0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch' - '0005-mount-service-drop-FsckPassNo-support.patch' - '0006-efi-boot-generator-hookup-to-fsck.patch' - '0007-fsck-root-only-run-when-requested-in-fstab.patch') + 'arch.conf' + 'loader.conf' + 'splash-arch.bmp') +md5sums=('SKIP' + '90ea67a7bb237502094914622a39e281' + '976c5511b6493715e381f43f16cdb151' + '1b3aa3a0551b08af9305d33f85b5c2fc' + '20ead378f5d6df4b2a3e670301510a7d' + 'ddaef54f68f6c86c6c07835fc668f62a' + '1e2f9a8b0fa32022bf0a8f39123e5f4e') prepare() { - cd "$pkgname-$pkgver" - patch -Np1 < "$srcdir"/0001-fix-lingering-references-to-var-lib-backlight-random.patch - patch -Np1 < "$srcdir"/0001-mount-check-for-NULL-before-reading-pm-what.patch - patch -Np1 < "$srcdir"/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch - # Fix lingering user managers - patch -Np1 < "$srcdir"/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch - # Backport changes in fstab passno handling - # Basically, we only need 0001 and 0007, but 0007 is based on earlier patches, - # and it doesn't hurt to backport them all. - patch -Np1 < "$srcdir"/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch - patch -Np1 < "$srcdir"/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch - patch -Np1 < "$srcdir"/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch - patch -Np1 < "$srcdir"/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch - patch -Np1 < "$srcdir"/0005-mount-service-drop-FsckPassNo-support.patch - patch -Np1 < "$srcdir"/0006-efi-boot-generator-hookup-to-fsck.patch - patch -Np1 < "$srcdir"/0007-fsck-root-only-run-when-requested-in-fstab.patch - - autoreconf + cd "$pkgname" + + # networkd: fix neworkd crash + # https://github.com/systemd/systemd/commit/49f6e11e89b4 + git cherry-pick -n 49f6e11e89b4 + + ./autogen.sh } build() { - cd "$pkgname-$pkgver" + cd "$pkgname" + + local timeservers=({0..3}.arch.pool.ntp.org) ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ --sysconfdir=/etc \ - --enable-introspection \ - --enable-gtk-doc \ + --enable-lz4 \ + --enable-compat-libs \ + --enable-gnuefi \ --disable-audit \ --disable-ima \ + --disable-kdbus \ --with-sysvinit-path= \ --with-sysvrcnd-path= \ - --with-firmware-path="/usr/lib/firmware/updates:/usr/lib/firmware" + --with-ntp-servers="${timeservers[*]}" make } -check() { - make -C "$pkgname-$pkgver" check || : -} - package_systemd() { pkgdesc="system and service manager" - license=('GPL2' 'LGPL2.1' 'MIT') - depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' - 'pam' 'util-linux' 'xz') - provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" - 'libgudev-1.0.so' 'libsystemd-daemon.so' 'libsystemd-id128.so' - 'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so') - replaces=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev') - conflicts=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev') + license=('GPL2' 'LGPL2.1') + depends=('acl' 'bash' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap' + 'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libseccomp' 'util-linux' + 'xz') + provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver") + replaces=('nss-myhostname' 'systemd-tools' 'udev') + conflicts=('nss-myhostname' 'systemd-tools' 'udev') optdepends=('cryptsetup: required for encrypted block devices' - 'libmicrohttpd: systemd-journal-gatewayd' + 'libmicrohttpd: remote journald capabilities' 'quota-tools: kernel-level quota management' - 'python2: systemd library bindings' - 'systemd-sysvcompat: symlink package to provide sysvinit binaries') + 'systemd-sysvcompat: symlink package to provide sysvinit binaries' + 'polkit: allow administration as unprivileged user') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/dbus-1/system.d/org.freedesktop.hostname1.conf etc/dbus-1/system.d/org.freedesktop.login1.conf etc/dbus-1/system.d/org.freedesktop.locale1.conf etc/dbus-1/system.d/org.freedesktop.machine1.conf etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/dbus-1/system.d/org.freedesktop.import1.conf + etc/dbus-1/system.d/org.freedesktop.network1.conf etc/pam.d/systemd-user etc/systemd/bootchart.conf + etc/systemd/coredump.conf etc/systemd/journald.conf + etc/systemd/journal-remote.conf + etc/systemd/journal-upload.conf etc/systemd/logind.conf etc/systemd/system.conf + etc/systemd/timesyncd.conf + etc/systemd/resolved.conf etc/systemd/user.conf etc/udev/udev.conf) install="systemd.install" - make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - - printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" - - # fix .so links in manpage stubs - find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \ - -exec sed -ri '1s|^\.so (.*)\.([0-9]+)|.so man\2/\1.\2|' {} + + make -C "$pkgname" DESTDIR="$pkgdir" install - # don't write units to /etc by default -- we'll enable this on post_install - # as a sane default - rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" - rmdir "$pkgdir/etc/systemd/system/getty.target.wants" + # don't write units to /etc by default. some of these will be re-enabled on + # post_install. + rm -r "$pkgdir/etc/systemd/system/"*.wants # get rid of RPM macros rm -r "$pkgdir/usr/lib/rpm" # add back tmpfiles.d/legacy.conf - install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" + install -m644 "$pkgname/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group sed -i 's#GROUP="dialout"#GROUP="uucp"#g; s#GROUP="tape"#GROUP="storage"#g; s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules + sed -i 's/dialout/uucp/g; + s/tape/storage/g; + s/cdrom/optical/g' "$pkgdir"/usr/lib/sysusers.d/basic.conf # add mkinitcpio hooks install -Dm644 "$srcdir/initcpio-install-systemd" "$pkgdir/usr/lib/initcpio/install/systemd" install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev" install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev" - # ensure proper permissions for /var/log/journal + # ensure proper permissions for /var/log/journal. This is only to placate chown root:systemd-journal "$pkgdir/var/log/journal" chmod 2755 "$pkgdir/var/log/journal" + # we'll create this on installation + #rmdir "$pkgdir/var/log/journal/remote" + # fix pam file sed 's|system-auth|system-login|g' -i "$pkgdir/etc/pam.d/systemd-user" + # ship default policy to leave services disabled + echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset + ### split out manpages for sysvcompat rm -rf "$srcdir/_sysvcompat" install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ "$srcdir"/_sysvcompat/usr/share/man/man8 - # include MIT license, since it's technically custom - install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \ - "$pkgdir/usr/share/licenses/systemd/LICENSE.MIT" + ### split off runtime libraries + rm -rf "$srcdir/_libsystemd" + install -dm755 "$srcdir"/_libsystemd/usr/lib + cd "$srcdir"/_libsystemd + mv "$pkgdir"/usr/lib/lib{systemd,udev}*.so* usr/lib + + # add example bootctl configuration + install -Dm644 "$srcdir/arch.conf" "$pkgdir"/usr/share/systemd/bootctl/arch.conf + install -Dm644 "$srcdir/loader.conf" "$pkgdir"/usr/share/systemd/bootctl/loader.conf + install -Dm644 "$srcdir/splash-arch.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp +} + +package_libsystemd() { + pkgdesc="systemd client libraries" + depends=('glibc' 'libgcrypt' 'lz4' 'xz') + license=('GPL2') + provides=('libsystemd.so' 'libsystemd-daemon.so' 'libsystemd-id128.so' + 'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so') + + mv "$srcdir/_libsystemd"/* "$pkgdir" } package_systemd-sysvcompat() { @@ -166,18 +180,3 @@ package_systemd-sysvcompat() { } # vim: ft=sh syn=sh et -md5sums=('df64550d92afbffb4f67a434193ee165' - '29245f7a240bfba66e2b1783b63b6b40' - '8b68b0218a3897d4d37a6ccf47914774' - 'bde43090d4ac0ef048e3eaee8202a407' - '1b191c4e7a209d322675fd199e3abc66' - 'a693bef63548163ffc165f4c4801ebf7' - 'ccafe716d87df9c42af0d1960b5a4105' - '441e3d464ee6af5fe4af6a8bc10d7980' - '718d841203cf2ea9e24a7d0f1d19d48b' - '623c77bad0d2968e44963d72924825f1' - 'e52fc8368853c7800ab03ab8868cfd41' - '2096f33bd36dfa0a7f0431d0a429787a' - 'd2481a6ea199b581e243a950125b0ca6' - 'c2aee634a3a6c50778968f0d5c756f40' - 'ef8b8212d504bb73c10bf4e85f0703b2') diff --git a/abs/core/systemd/__changelog b/abs/core/systemd/__changelog new file mode 100644 index 0000000..841eee3 --- /dev/null +++ b/abs/core/systemd/__changelog @@ -0,0 +1,4 @@ +PKGBUILD: change dep python-lxml to python2-lxml +PKGBUILD: comment out rmdir "$pkgdir/var/log/journal/remote" +PKGBUILD: Change for tool in runlevel reboot shutdown poweroff halt telinit; do + to for tool in runlevel telinit; do diff --git a/abs/core/systemd/arch.conf b/abs/core/systemd/arch.conf new file mode 100644 index 0000000..250b778 --- /dev/null +++ b/abs/core/systemd/arch.conf @@ -0,0 +1,7 @@ +## This is just an example config file. +## Please edit the paths and kernel parameters according to your system. + +title Arch Linux +linux /vmlinuz-linux +initrd /initramfs-linux.img +options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap diff --git a/abs/core/systemd/initcpio-hook-udev b/abs/core/systemd/initcpio-hook-udev index 0bc32e0..ea9a11f 100644 --- a/abs/core/systemd/initcpio-hook-udev +++ b/abs/core/systemd/initcpio-hook-udev @@ -2,7 +2,7 @@ run_earlyhook() { kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf - systemd-tmpfiles --prefix=/dev --create + systemd-tmpfiles --prefix=/dev --create --boot /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never udevd_running=1 } diff --git a/abs/core/systemd/initcpio-install-systemd b/abs/core/systemd/initcpio-install-systemd index 2c59074..96df98a 100644 --- a/abs/core/systemd/initcpio-install-systemd +++ b/abs/core/systemd/initcpio-install-systemd @@ -4,7 +4,7 @@ strip_quotes() { local len=${#1} quotes=$'[\'"]' str=${!1} if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then - declare -g "$1=${str:1:-1}" + printf -v "$1" %s "${str:1:-1}" fi } @@ -34,6 +34,7 @@ add_udev_rule() { strip_quotes 'value' # just take the first word as the binary name binary=${value%% *} + [[ ${binary:0:1} == '$' ]] && continue if [[ ${binary:0:1} != '/' ]]; then binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary") fi @@ -98,13 +99,16 @@ build() { # from base add_binary /bin/mount add_binary /usr/bin/kmod /usr/bin/modprobe - - # systemd add_binary /usr/lib/systemd/systemd /init - add_binary /usr/bin/systemd-tmpfiles - # generate sysroot.mount and sysroot-usr.mount - add_file "/usr/lib/systemd/system-generators/systemd-fstab-generator" + map add_binary \ + /usr/bin/systemd-tmpfiles \ + /usr/lib/systemd/systemd-hibernate-resume \ + /usr/lib/systemd/system-generators/systemd-fstab-generator \ + /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \ + /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator + + add_module "kdbus?" # udev rules and systemd units map add_udev_rule "$rules" \ @@ -112,10 +116,9 @@ build() { 60-persistent-storage.rules \ 64-btrfs.rules \ 80-drivers.rules \ - 99-systemd.rules \ + 99-systemd.rules map add_systemd_unit \ - ctrl-alt-del.target \ initrd-cleanup.service \ initrd-fs.target \ initrd-parse-etc.service \ @@ -125,24 +128,32 @@ build() { initrd-udevadm-cleanup-db.service \ initrd.target \ kmod-static-nodes.service \ + local-fs.target \ + local-fs-pre.target \ + paths.target \ + reboot.target \ + slices.target \ sockets.target \ + swap.target \ systemd-fsck@.service \ + systemd-hibernate-resume@.service \ systemd-journald.service \ + systemd-journald-audit.socket \ + systemd-journald-dev-log.socket \ systemd-tmpfiles-setup-dev.service \ systemd-udev-trigger.service \ systemd-udevd-control.socket \ systemd-udevd-kernel.socket \ - systemd-udevd.service + systemd-udevd.service \ + timers.target add_symlink "/usr/lib/systemd/system/default.target" "initrd.target" + add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target" - # libdbus needs the passwd info of the root user - # TODO: make sure this is no longer necessary when systemctl moves to sd-bus + # udev wants /etc/group since it doesn't launch with --resolve-names=never add_file "/etc/nsswitch.conf" - add_file "/etc/passwd" add_binary "$(readlink -f /usr/lib/libnss_files.so)" - - # udev wants /etc/group since it doesn't launch with --resolve-names=never + add_file "/etc/passwd" add_file "/etc/group" } diff --git a/abs/core/systemd/initcpio-install-udev b/abs/core/systemd/initcpio-install-udev index 419c19e..7f0301a 100644 --- a/abs/core/systemd/initcpio-install-udev +++ b/abs/core/systemd/initcpio-install-udev @@ -3,7 +3,6 @@ build() { local rules tool - add_file "/etc/udev/udev.conf" add_binary /usr/lib/systemd/systemd-udevd add_binary /usr/bin/udevadm add_binary /usr/bin/systemd-tmpfiles diff --git a/abs/core/systemd/loader.conf b/abs/core/systemd/loader.conf new file mode 100644 index 0000000..1f7cd7e --- /dev/null +++ b/abs/core/systemd/loader.conf @@ -0,0 +1 @@ +default arch diff --git a/abs/core/systemd/splash-arch.bmp b/abs/core/systemd/splash-arch.bmp new file mode 100644 index 0000000..f083d4b Binary files /dev/null and b/abs/core/systemd/splash-arch.bmp differ diff --git a/abs/core/systemd/systemd.install b/abs/core/systemd/systemd.install index 1e79585..b0a3e1f 100644 --- a/abs/core/systemd/systemd.install +++ b/abs/core/systemd/systemd.install @@ -1,7 +1,7 @@ -#!/bin/sh +#!/bin/bash sd_booted() { - [ -e sys/fs/cgroup/systemd ] + [[ -d run/systemd/system && ! -L run/systemd/system ]] } add_privs() { @@ -11,110 +11,195 @@ add_privs() { fi } -post_common() { - systemd-machine-id-setup - - add_privs usr/bin/systemd-detect-virt 'cap_dac_override,cap_sys_ptrace+ep' +add_journal_acls() { + # ignore errors, since the filesystem might not support ACLs + setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null + : +} - udevadm hwdb --update - journalctl --update-catalog +maybe_reexec() { + # don't reexec on 209-1 upgrade due to large infrastructural changes. + if [[ $(vercmp 209-1 "$2") -eq 1 ]]; then + echo ':: systemd has not been reexecuted. It is recommended that you' + echo ' reboot at your earliest convenience.' + return + fi if sd_booted; then systemctl --system daemon-reexec fi } -mask_net_naming() { - if [ ! -e etc/udev/rules.d/80-net-name-slot.rules ]; then - printf >etc/udev/rules.d/80-net-name-slot.rules '# %s\n' \ - "This file masks persistent renaming rules for network devices. If you" \ - "delete this file, /usr/lib/udev/rules.d/80-net-name-slot.rules may" \ - "rename network devices according to ID_NET_NAME_{ONBOARD,SLOT,PATH}" \ - "properties of your network devices, with priority in that order. See" \ - "the output of 'udevadm test-builtin net_id /sys/class/net/\$interface'" \ - "for details on what that new name might be." \ - "" \ - "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" - fi +_dir_empty() { + set -- "$1"/* + [[ ! -e $1 && ! -L $1 ]] } -_208_changes() { - chown root:systemd-journal var/log/journal - chmod 2755 var/log/journal +post_common() { + systemd-sysusers + udevadm hwdb --update + journalctl --update-catalog +} - if [ -e var/lib/backlight ] && [ ! -e var/lib/systemd/backlight ]; then +_204_1_changes() { + printf '==> The /bin/systemd symlink has been removed. Any references in your\n' + printf ' bootloader (or elsewhere) must be updated to /usr/lib/systemd/systemd.\n' +} + +_205_1_changes() { + printf '==> systemd 205 restructures the cgroup hierarchy and changes internal\n' + printf ' protocols. You should reboot at your earliest convenience.\n' +} + +_206_1_changes() { + printf '==> The "timestamp" hook for mkinitcpio no longer exists. If you used\n' + printf ' this hook, you must remove it from /etc/mkinitcpio.conf. A "systemd"\n' + printf ' hook has been added which provides this functionality, and more.\n' +} + +_208_1_changes() { + if [[ -e var/lib/backlight && ! -e var/lib/systemd/backlight ]]; then mv -T var/lib/backlight var/lib/systemd/backlight fi - if [ -e var/lib/random-seed ] && [ ! -e var/lib/systemd/random-seed ]; then + if [[ -e var/lib/random-seed && ! -e var/lib/systemd/random-seed ]]; then mv -T var/lib/random-seed var/lib/systemd/random-seed fi } -post_install() { - post_common +_208_8_changes() { + add_journal_acls +} - # enable getty@tty1 by default, but don't track the file - systemctl enable getty@tty1.service +_209_1_changes() { + # attempt to preserve existing behavior - echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your" - echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat" + local old_rule=etc/udev/rules.d/80-net-name-slot.rules + local new_rule=etc/udev/rules.d/80-net-setup-link.rules + + echo ":: Network device naming is now controlled by udev's net_setup_link" + echo " builtin. Refer to the systemd.link manpage for a full description." + + # not clear what action we can take here, so don't do anything + [[ -e $new_rule ]] && return 0 + + # rename the old rule to the new one so that we preserve the user's + # existing option. + if [[ -e $old_rule ]]; then + printf ':: Renaming %s to %s in order\n' "${old_rule##*/}" "${new_rule##*/}" + printf ' to preserve existing network naming behavior.\n' + mv -v "$old_rule" "$new_rule" + else + echo ':: No changes have been made to your network naming configuration.' + echo ' Interfaces should continue to maintain the same names.' + fi } -post_upgrade() { - post_common - - # getty@tty1.service is no longer enabled by default, but we don't want to break - # existing setups. - if [ "$(vercmp 183 "$2")" -eq 1 ]; then - # systemctl seems to be whiny on sysvinit. this will succeed unless something - # horrific happens, so just mask the error. - systemctl -q enable getty@tty1.service || true +_210_1_changes() { + if sd_booted; then + # If /etc/systemd/network is non-empty, then this is a 209 user who used + # networkd. Re-enable it for them. + if ! _dir_empty etc/systemd/network; then + systemctl enable systemd-networkd + fi fi +} - if [ "$(vercmp 194-4 "$2")" -eq 1 ]; then - printf '==> journald now writes to /var/log/journal by default. This can be\n' - printf ' controlled with the Storage setting in /etc/systemd/journald.conf\n' +_213_4_changes() { + if sd_booted; then + # if /etc/resolv.conf is a symlink, just assume that it was being managed + # by systemd-networkd, and re-enable systemd-resolved. + if [[ -L etc/resolv.conf ]]; then + systemctl enable systemd-resolved + fi fi +} + +_214_2_changes() { + # /run/systemd/network/resolv.conf -> /run/systemd/resolve/resolv.conf + if [[ etc/resolv.conf -ef run/systemd/network/resolv.conf ]]; then + ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf - # logind's protocol changed. kindly restart the daemon to avoid locking - # out further logins. - if [ "$(vercmp 195 "$2")" -eq 1 ]; then if sd_booted; then - systemctl restart systemd-logind.service + if [[ ! -d run/systemd/resolve ]]; then + mkdir run/systemd/resolve + fi + + if [[ -f run/systemd/network/resolv.conf ]]; then + mv run/systemd/{network,resolve}/resolv.conf + fi fi fi - if [ "$(vercmp 196-1 "$2")" -eq 1 ]; then - printf '==> The legacy configuration options are no longer supported in rc.conf,\n' - printf ' convert your rc.conf to the new configuration formats.\n' - fi + echo ':: coredumps are no longer sent to the journal by default. To re-enable:' + echo ' echo >/etc/sysctl.d/50-coredump.conf \' + echo ' "kernel.core_pattern=|/usr/lib/systemd/systemd-coredump %p %u %g %s %t %e"' +} - if [ "$(vercmp 197-1 "$2")" -eq 1 ]; then - mask_net_naming - printf '==> Persistent net naming rules have been shipped as disabled.\n' - printf ' See /etc/udev/rules.d/80-net-name-slot.rules for more detail\n' - fi +_215_2_changes() { + # create at least the symlink from /etc/os-release to /usr/lib/os-release + systemd-tmpfiles --create etc.conf +} - if [ "$(vercmp 204-1 "$2")" -eq 1 ]; then - printf '==> The /bin/systemd symlink has been removed. Any references in your\n' - printf ' bootloader (or elsewhere) must be updated to /usr/lib/systemd/systemd.\n' - fi +_216_2_changes() { + echo ':: Coredumps are handled by systemd by default. Collection behavior can be' + echo ' tuned in /etc/systemd/coredump.conf.' +} - if [ "$(vercmp 205-1 "$2")" -eq 1 ]; then - printf '==> systemd 205 restructures the cgroup hierarchy and changes internal\n' - printf ' protocols. You should reboot at your earliest convenience.\n' +_219_2_changes() { + if mkdir -m2755 var/log/journal/remote 2>/dev/null; then + chgrp systemd-journal-remote var/log/journal/remote fi +} - if [ "$(vercmp 206-1 "$2")" -eq 1 ]; then - printf '==> The "timestamp" hook for mkinitcpio no longer exists. If you used\n' - printf ' this hook, you must remove it from /etc/mkinitcpio.conf. A "systemd"\n' - printf ' hook has been added which provides this functionality, and more.\n' +_219_4_changes() { + if ! systemctl is-enabled -q remote-fs.target; then + systemctl enable -q remote-fs.target fi +} - if [ "$(vercmp 208-1 "$2")" -eq 1 ]; then - _208_changes - fi +post_install() { + systemd-machine-id-setup + + post_common "$@" + + add_journal_acls + + # enable some services by default, but don't track them + systemctl enable getty@tty1.service remote-fs.target + + echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your" + echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat" + + # group 'systemd-journal-remote' is created by systemd-sysusers + mkdir -m2755 var/log/journal/remote + chgrp systemd-journal-remote var/log/journal/remote +} + +post_upgrade() { + post_common "$@" + + maybe_reexec "$@" + + local v upgrades=(204-1 + 205-1 + 206-1 + 208-1 + 208-8 + 209-1 + 210-1 + 213-4 + 214-2 + 215-2 + 216-2 + 219-2 + 219-4) + + for v in "${upgrades[@]}"; do + if [[ $(vercmp "$v" "$2") -eq 1 ]]; then + "_${v//-/_}_changes" + fi + done } # vim:set ts=2 sw=2 et: -- cgit v0.12 From f70bcedc39d211e8bff56add602e2f1a5d0b2674 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 7 Aug 2015 19:23:58 +0000 Subject: handbrake: update to 0.10.2 --- abs/extra/handbrake/PKGBUILD | 17 +++-- .../handbrake/standard-presets-fix-type.patch | 88 ++++++++++++++++++++++ 2 files changed, 98 insertions(+), 7 deletions(-) create mode 100644 abs/extra/handbrake/standard-presets-fix-type.patch diff --git a/abs/extra/handbrake/PKGBUILD b/abs/extra/handbrake/PKGBUILD index 058f218..499f790 100644 --- a/abs/extra/handbrake/PKGBUILD +++ b/abs/extra/handbrake/PKGBUILD @@ -4,18 +4,18 @@ # Contributor: Sebastien Piccand pkgname=('handbrake' 'handbrake-cli') -pkgver=0.10.0 -pkgrel=1 +pkgver=0.10.2 +pkgrel=3 arch=('i686' 'x86_64') -url="http://handbrake.fr/" +url="https://handbrake.fr/" license=('GPL') makedepends=('intltool' 'python2' 'yasm' 'wget' 'bzip2' 'gcc-libs' 'libnotify' 'gst-plugins-base' 'gtk3' 'dbus-glib' 'fribidi' 'libass' 'lame' 'fontconfig' 'freetype2' 'libxml2' 'libogg' 'libvorbis' 'cmake' 'libtheora' 'libsamplerate' 'libbluray' 'x264' 'libx264' - 'libdvdnav') -source=(http://downloads.sourceforge.net/project/handbrake/$pkgver/HandBrake-$pkgver.tar.bz2) -sha256sums=('a91042da3cc08454844f7c171ee2fde4f0ed08176407fc0328d5118227ed4114') + 'libdvdnav' 'librsvg' 'libgudev') +source=(https://handbrake.fr/mirror/HandBrake-$pkgver.tar.bz2) +sha256sums=('4cc3828393b26a982dbe00febd700c5090d3443c1d45492e0b373e02da73c699') prepare() { cd "$srcdir/HandBrake-$pkgver" @@ -46,7 +46,9 @@ package_handbrake() { depends=('bzip2' 'gcc-libs' 'gst-plugins-base' 'libnotify' 'dbus-glib' 'fribidi' 'libass' 'lame' 'gtk3' 'fontconfig' 'freetype2' 'libxml2' 'libogg' 'libvorbis' 'libtheora' 'libsamplerate' 'libbluray' - 'libx264' 'libdvdnav' 'desktop-file-utils' 'hicolor-icon-theme') + 'libx264' 'libdvdnav' 'librsvg' 'libgudev' 'desktop-file-utils' + 'hicolor-icon-theme') + depends+=('libx264.so') optdepends=('gst-plugins-good: for video previews' 'gst-libav: for video previews') install=$pkgname.install @@ -61,6 +63,7 @@ package_handbrake-cli() { pkgdesc="Multithreaded video transcoder (CLI)" depends=('bzip2' 'gcc-libs' 'zlib' 'fribidi' 'libass' 'lame' 'libxml2' 'libtheora' 'libsamplerate' 'libbluray' 'libx264' 'libdvdnav') + depends+=('libx264.so') cd "$srcdir/HandBrake-$pkgver/build" install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI" diff --git a/abs/extra/handbrake/standard-presets-fix-type.patch b/abs/extra/handbrake/standard-presets-fix-type.patch new file mode 100644 index 0000000..797c3fa --- /dev/null +++ b/abs/extra/handbrake/standard-presets-fix-type.patch @@ -0,0 +1,88 @@ +Index: branches/0.10.x/gtk/src/standard_presets.xml +=================================================================== +--- branches/0.10.x/gtk/src/standard_presets.xml (revision 6995) ++++ branches/0.10.x/gtk/src/standard_presets.xml (revision 7008) +@@ -85,5 +85,5 @@ + + PictureDenoiseFilter +- off ++ off + PictureDenoiseCustom + +@@ -216,5 +216,5 @@ + + PictureDenoiseFilter +- off ++ off + PictureDenoiseCustom + +@@ -347,5 +347,5 @@ + + PictureDenoiseFilter +- off ++ off + PictureDenoiseCustom + +@@ -478,5 +478,5 @@ + + PictureDenoiseFilter +- off ++ off + PictureDenoiseCustom + +@@ -625,5 +625,5 @@ + + PictureDenoiseFilter +- off ++ off + PictureDenoiseCustom + +@@ -772,5 +772,5 @@ + + PictureDenoiseFilter +- off ++ off + PictureDenoiseCustom + +@@ -919,5 +919,5 @@ + + PictureDenoiseFilter +- off ++ off + PictureDenoiseCustom + +@@ -1050,5 +1050,5 @@ + + PictureDenoiseFilter +- off ++ off + PictureDenoiseCustom + +@@ -1181,5 +1181,5 @@ + + PictureDenoiseFilter +- off ++ off + PictureDenoiseCustom + +@@ -1312,5 +1312,5 @@ + + PictureDenoiseFilter +- off ++ off + PictureDenoiseCustom + +@@ -1458,5 +1458,5 @@ + + PictureDenoiseFilter +- off ++ off + PictureDenoiseCustom + +@@ -1605,5 +1605,5 @@ + + PictureDenoiseFilter +- off ++ off + PictureDenoiseCustom + -- cgit v0.12 From dede22dab59777de2d32928db744e5202f644aef Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 7 Aug 2015 20:09:57 +0000 Subject: mythtv & plugins: rebuild --- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 659401a..32acd30 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.5 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index 8ca980f..ef238a4 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.5 -pkgrel=2 +pkgrel=3 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12 From 35a8b2c75a53610337bfeb7ae493f66ebd001d86 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 7 Aug 2015 20:16:17 +0000 Subject: libplatform: initial inclusion. dep of libcec --- abs/extra/libplatform/PKGBUILD | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 abs/extra/libplatform/PKGBUILD diff --git a/abs/extra/libplatform/PKGBUILD b/abs/extra/libplatform/PKGBUILD new file mode 100644 index 0000000..87036eb --- /dev/null +++ b/abs/extra/libplatform/PKGBUILD @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: BlackIkeEagle +# Contributor: Cedric Girard + +pkgname=libplatform +pkgver=1.0.10 +pkgrel=1 +pkgdesc="Platform support library used by libCEC and binary add-ons for Kodi" +arch=('i686' 'x86_64') +url="https://github.com/Pulse-Eight/platform" +license=('GPL') +provides=('libplatform') +conflicts=('libplatform') +makedepends=('cmake') +depends=('gcc-libs') +source=(https://github.com/Pulse-Eight/platform/archive/${pkgver}.tar.gz) +sha256sums=('6ba3239cb1c0a5341efcf9488f4d3dfad8c26d6b2994b2b2247e5a61568ab5cd') + +build() { + cd "$srcdir"/platform-${pkgver} + cmake . \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=1 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib + make +} + +package() { + cd "$srcdir"/platform-${pkgver} + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: -- cgit v0.12 From 906eebaf38dfb61464c8c68d14d1f12bbff9db64 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 7 Aug 2015 20:21:47 +0000 Subject: libcec: update to 3.0.1 --- abs/core/libcec/PKGBUILD | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/abs/core/libcec/PKGBUILD b/abs/core/libcec/PKGBUILD index b877e84..11d4992 100644 --- a/abs/core/libcec/PKGBUILD +++ b/abs/core/libcec/PKGBUILD @@ -4,24 +4,31 @@ # vim: ft=sh: pkgname=libcec -pkgver=2.2.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" arch=('i686' 'x86_64') url="http://libcec.pulse-eight.com/" license=('GPL') -depends=('udev' 'lockdev') +makedepends=('cmake') +depends=('udev' 'lockdev' 'libplatform' 'libxrandr') source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/$pkgname/archive/$pkgname-$pkgver.tar.gz") +sha256sums=('7e3670c8949a1964d6e5481f56dfff838857da10bdc60b506f6e9b7f117e253e') build() { - cd "$pkgname-$pkgname-$pkgver" - autoreconf -vif - ./configure --prefix=/usr - make + cd "$pkgname-$pkgname-$pkgver" + mkdir build + cd build + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=1 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib + make } package() { - cd "$pkgname-$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd "$pkgname-$pkgname-$pkgver/build" + make DESTDIR="$pkgdir" install } -sha256sums=('fd4f47a18d6e0f4b9e6f5831280207ee2b2a5fc2741ae32ae09ad12a8aa52917') -- cgit v0.12 From f7441834812bc08f6ff2acc3877880e110467a01 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 7 Aug 2015 21:23:27 +0000 Subject: ffmpeg-compat: update to 0.10.16 --- abs/extra/ffmpeg-compat/PKGBUILD | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/abs/extra/ffmpeg-compat/PKGBUILD b/abs/extra/ffmpeg-compat/PKGBUILD index 2627385..258f4d8 100644 --- a/abs/extra/ffmpeg-compat/PKGBUILD +++ b/abs/extra/ffmpeg-compat/PKGBUILD @@ -6,22 +6,24 @@ # Contributor: Paul Mattal pkgname=ffmpeg-compat -pkgver=0.10.15 -pkgrel=1 +pkgver=0.10.16 +pkgrel=2 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution' arch=('i686' 'x86_64') url='http://ffmpeg.org/' license=('GPL') depends=( - 'alsa-lib' 'bzip2' 'gsm' 'lame' 'libass' - 'libmodplug' 'libtheora' 'libva' 'libvorbis' 'libvpx' - 'opencore-amr' 'openjpeg' 'rtmpdump' 'schroedinger' 'sdl' 'speex' - 'v4l-utils' 'libx264' 'xvidcore' 'zlib' + 'alsa-lib' 'bzip2' 'gsm' 'lame' 'libass' 'libmodplug' + 'libtheora' 'libva' 'opencore-amr' 'openjpeg' 'rtmpdump' 'schroedinger' + 'sdl' 'speex' 'v4l-utils' 'xvidcore' 'zlib' + 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so' ) makedepends=('libvdpau' 'yasm' 'x264') -source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2) -sha256sums=('8b6dbf73c192d2217e6ded8e0dd560c678f362e373d87c28ed9fc8eb52293d5d') +source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2{,.asc}) +validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel +sha256sums=('e77823cbd58dfdb61f88059476070bc432d80e3821c14abcf804ef709d2f3fd1' + 'SKIP') build() { cd ffmpeg-$pkgver -- cgit v0.12 From 08f42061af64774c92b82b10b237fc5a8fc3a487 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 8 Aug 2015 03:17:38 +0000 Subject: plex-home-theater: rebuild for x264 --- abs/extra/plex-home-theater/PKGBUILD | 44 ++++---- .../plex-home-theater/plex-libcec-2.2.0.patch | 114 --------------------- abs/extra/plex-home-theater/plex-libcec.patch | 63 ++++++++++++ abs/extra/plex-home-theater/plex-lirc-socket.patch | 29 ------ 4 files changed, 86 insertions(+), 164 deletions(-) delete mode 100644 abs/extra/plex-home-theater/plex-libcec-2.2.0.patch create mode 100644 abs/extra/plex-home-theater/plex-libcec.patch delete mode 100644 abs/extra/plex-home-theater/plex-lirc-socket.patch diff --git a/abs/extra/plex-home-theater/PKGBUILD b/abs/extra/plex-home-theater/PKGBUILD index 906e49d..6de7cb1 100755 --- a/abs/extra/plex-home-theater/PKGBUILD +++ b/abs/extra/plex-home-theater/PKGBUILD @@ -3,57 +3,59 @@ # Contributor: Daniel Wallace pkgname=plex-home-theater -_pkgver=1.4.1.469-47a90f01 -pkgver=${_pkgver%-*} -pkgrel=1 +pkgver=1.4.1.469 +_pkghash=47a90f01 +pkgrel=2 pkgdesc='Plex Home Theater' arch=('i686' 'x86_64') url='http://www.plexapp.com/' license=('GPL2') +install="${pkgname}.install" depends=('boost-libs' 'curl' 'ffmpeg-compat' 'glew' 'libcdio' 'libmad' 'libmicrohttpd' 'libmpeg2' 'libsamplerate' 'libssh' 'libusb-compat' 'libvdpau' 'libxrandr' 'lzo' 'sdl_image' 'sdl_mixer' 'smbclient' 'taglib' 'tinyxml' 'yajl') -makedepends=('boost' 'cmake' 'doxygen' 'java-environment' 'libcec' +makedepends=('boost' 'cmake' 'doxygen' 'git' 'java-environment' 'libcec' 'libplist' 'libshairport' 'nasm' 'swig' 'unzip' 'zip') optdepends=('libplist: AirPlay support' 'libshairport: AirPlay support' 'libcec: Pulse-Eight USB-CEC adapter support') -install="${pkgname}.install" -source=("https://github.com/plexinc/plex-home-theater-public/archive/v${_pkgver}.tar.gz" +source=("https://github.com/plexinc/plex-home-theater-public/archive/v${pkgver}-${_pkghash}.tar.gz" 'plex-ffmpeg-compat.patch' - 'plex-libcec-2.2.0.patch' - 'plex-lirc-socket.patch' + 'plex-libcec.patch' 'plex_lib.conf' 'plexhometheater.sh') prepare() { - cd plex-home-theater-public-${_pkgver} + cd plex-home-theater-public-${pkgver}-${_pkghash} - patch -Np1 -i ../plex-libcec-2.2.0.patch - patch -Np1 -i ../plex-lirc-socket.patch + patch -Np1 -i ../plex-libcec.patch patch -Np1 -i ../plex-ffmpeg-compat.patch } build() { - cd plex-home-theater-public-${_pkgver} + cd plex-home-theater-public-${pkgver}-${_pkghash} if [[ -d build ]]; then rm -rf build fi mkdir build && cd build - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' \ - -DCMAKE_C_FLAGS="$CMAKE_C_FLAGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \ - -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \ - -DENABLE_{AUTOUPDATE,DUMP_SYMBOLS}='FALSE' -DENABLE_PYTHON='TRUE' \ - -DPYTHON_EXEC='/usr/bin/python2' -DUSE_INTERNAL_FFMPEG='FALSE' \ - -DCREATE_BUNDLE='FALSE' + cmake .. \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_C_FLAGS="$CMAKE_C_FLAGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \ + -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \ + -DCREATE_BUNDLE='FALSE' \ + -DDUMP_SYMBOLS='FALSE' \ + -DENABLE_AUTOUPDATE='FALSE' \ + -DENABLE_PYTHON='TRUE' \ + -DPYTHON_EXEC='/usr/bin/python2' \ + -DUSE_INTERNAL_FFMPEG='FALSE' make } package() { - cd plex-home-theater-public-${_pkgver}/build + cd plex-home-theater-public-${pkgver}-${_pkghash}/build make DESTDIR="${pkgdir}" install install -dm 755 "${pkgdir}"/usr/{lib/plexhometheater,share/{applications,pixmaps}} @@ -69,9 +71,9 @@ package() { install -D -m0744 ${srcdir}/plex_lib.conf ${pkgdir}/etc/gen_lib_xml.d/plex_lib.conf } +# vim: ts=2 sw=2 et: md5sums=('62456ec6266f769f2c873ed7132b26d3' '6704244166497db7fa6b3ddd43a0e53b' - '066484ad4949f96ddddaa8b1d4d709e1' - '09e67d694093eb6bd243fb9a4ddf5d70' + '0f753e1ebea13e5a2029a59b9db79877' 'c1eedd9f89ee727230833db9ef1e5d29' '4ceae60ed2f9e4304eda4f80d407e799') diff --git a/abs/extra/plex-home-theater/plex-libcec-2.2.0.patch b/abs/extra/plex-home-theater/plex-libcec-2.2.0.patch deleted file mode 100644 index 8c35296..0000000 --- a/abs/extra/plex-home-theater/plex-libcec-2.2.0.patch +++ /dev/null @@ -1,114 +0,0 @@ -From e62cdd0c9ae9818c5c35c6b6b57ba8ff322ca052 Mon Sep 17 00:00:00 2001 -From: Maxime Gauduin -Date: Tue, 4 Nov 2014 17:07:10 +0100 -Subject: [PATCH] libCEC 2.2.0 fixes - ---- - project/BuildDependencies/scripts/0_package.list | 1 + - project/BuildDependencies/scripts/libcec_d.bat | 15 --------------- - project/BuildDependencies/scripts/libcec_d.txt | 2 +- - system/peripherals.xml | 2 +- - xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp | 2 ++ - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 11 ++++++++--- - 6 files changed, 13 insertions(+), 20 deletions(-) - delete mode 100644 project/BuildDependencies/scripts/libcec_d.bat - -diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list -index d2a00aa..6f441f3 100644 ---- a/project/BuildDependencies/scripts/0_package.list -+++ b/project/BuildDependencies/scripts/0_package.list -@@ -11,4 +11,5 @@ libnfs-1.6.0-win32 - libshairplay-d689c6-win32 - libjpeg-turbo-1.2.0-win32 - libbluray-0.2.3-win32 -+libcec-2.2.0-win32-1 - taglib-1.8beta-win32 -diff --git a/project/BuildDependencies/scripts/libcec_d.bat b/project/BuildDependencies/scripts/libcec_d.bat -deleted file mode 100644 -index 0b41b8a..0000000 ---- a/project/BuildDependencies/scripts/libcec_d.bat -+++ /dev/null -@@ -1,15 +0,0 @@ --@ECHO OFF -- --SET LOC_PATH=%CD% --SET FILES=%LOC_PATH%\libcec_d.txt -- --CALL dlextract.bat libcec %FILES% -- --cd %TMP_PATH% -- --mkdir "%CUR_PATH%\include\libcec" --xcopy libcec\include\* "%CUR_PATH%\include\libcec\." /E /Q /I /Y -- --copy libcec\libcec.dll "%XBMC_PATH%\system\." -- --cd %LOC_PATH% -diff --git a/project/BuildDependencies/scripts/libcec_d.txt b/project/BuildDependencies/scripts/libcec_d.txt -index 065ce3a..3d0265e 100644 ---- a/project/BuildDependencies/scripts/libcec_d.txt -+++ b/project/BuildDependencies/scripts/libcec_d.txt -@@ -1,3 +1,3 @@ - ; filename source of the file - --libcec-2.1.1.zip http://mirrors.xbmc.org/build-deps/win32/ -+libcec-2.2.0-win32.zip http://mirrors.xbmc.org/build-deps/win32/ -diff --git a/system/peripherals.xml b/system/peripherals.xml -index 68205df..ea0bb17 100644 ---- a/system/peripherals.xml -+++ b/system/peripherals.xml -@@ -28,7 +28,7 @@ - - - -- -+ - - - -diff --git a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp -index da169c1..f3c8149 100644 ---- a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp -+++ b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp -@@ -101,6 +101,8 @@ bool CPeripheralBusCEC::PerformDeviceScan(PeripheralScanResults &results) - break; - case ADAPTERTYPE_RPI: - result.m_mappedBusType = PERIPHERAL_BUS_RPI; -+ // the Pi's adapter cannot be removed, no need to rescan -+ m_bNeedsPolling = false; - break; - default: - break; -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 056a77e..9823427 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1302,8 +1302,8 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu - - void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - { -- // use the same client version as libCEC version -- m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT; -+ // client version matches the version of libCEC that we originally used the API from -+ m_configuration.clientVersion = CEC_CLIENT_VERSION_2_2_0; - - // device name 'XBMC' - snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str()); -@@ -1378,8 +1378,13 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; - m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; - -- // double tap prevention timeout in ms -+#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD) -+ // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50 -+ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50; -+#else -+ // backwards compatibility. will be removed once the next major release of libCEC is out - m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+#endif - } - - void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) --- -2.1.3 - diff --git a/abs/extra/plex-home-theater/plex-libcec.patch b/abs/extra/plex-home-theater/plex-libcec.patch new file mode 100644 index 0000000..2087569 --- /dev/null +++ b/abs/extra/plex-home-theater/plex-libcec.patch @@ -0,0 +1,63 @@ +diff -rupN plex-home-theater-public-1.4.1.469-47a90f01.orig/system/peripherals.xml plex-home-theater-public-1.4.1.469-47a90f01/system/peripherals.xml +--- plex-home-theater-public-1.4.1.469-47a90f01.orig/system/peripherals.xml 2015-07-22 11:09:33.213307552 +0200 ++++ plex-home-theater-public-1.4.1.469-47a90f01/system/peripherals.xml 2015-07-22 11:09:47.349594239 +0200 +@@ -28,7 +28,7 @@ + + + +- ++ + + + +diff -rupN plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp +--- plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp 2015-07-22 11:09:32.826651274 +0200 ++++ plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp 2015-07-22 11:09:47.349594239 +0200 +@@ -101,6 +101,8 @@ bool CPeripheralBusCEC::PerformDeviceSca + break; + case ADAPTERTYPE_RPI: + result.m_mappedBusType = PERIPHERAL_BUS_RPI; ++ // the Pi's adapter cannot be removed, no need to rescan ++ m_bNeedsPolling = false; + break; + default: + break; +diff -rupN plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/devices/PeripheralCecAdapter.cpp plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +--- plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/devices/PeripheralCecAdapter.cpp 2015-07-22 11:09:32.826651274 +0200 ++++ plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/devices/PeripheralCecAdapter.cpp 2015-07-22 11:13:05.310907421 +0200 +@@ -282,7 +283,7 @@ bool CPeripheralCecAdapter::InitialiseFe + } + else + { +- CLog::Log(LOGDEBUG, "%s - using libCEC v%s", __FUNCTION__, m_cecAdapter->ToString((cec_server_version)m_configuration.serverVersion)); ++ CLog::Log(LOGDEBUG, "%s - using libCEC v%s", __FUNCTION__, m_cecAdapter->ToString((cec_version)m_configuration.serverVersion)); + SetVersionInfo(m_configuration); + } + +@@ -295,7 +296,7 @@ bool CPeripheralCecAdapter::InitialiseFe + + void CPeripheralCecAdapter::SetVersionInfo(const libcec_configuration &configuration) + { +- m_strVersionInfo.Format("libCEC %s - firmware v%d", m_cecAdapter->ToString((cec_server_version)configuration.serverVersion), configuration.iFirmwareVersion); ++ m_strVersionInfo.Format("libCEC %s - firmware v%d", m_cecAdapter->ToString((cec_version)configuration.serverVersion), configuration.iFirmwareVersion); + + // append firmware build date + if (configuration.iFirmwareBuildDate != CEC_FW_BUILD_UNKNOWN) +@@ -1303,7 +1304,7 @@ void CPeripheralCecAdapter::SetConfigura + void CPeripheralCecAdapter::SetConfigurationFromSettings(void) + { + // use the same client version as libCEC version +- m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT; ++ m_configuration.clientVersion = LIBCEC_VERSION_CURRENT; + + // device name 'XBMC' + snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str()); +@@ -1379,7 +1380,7 @@ void CPeripheralCecAdapter::SetConfigura + m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; + + // double tap prevention timeout in ms +- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); ++ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50; + } + + void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) diff --git a/abs/extra/plex-home-theater/plex-lirc-socket.patch b/abs/extra/plex-home-theater/plex-lirc-socket.patch deleted file mode 100644 index 0a7ebf3..0000000 --- a/abs/extra/plex-home-theater/plex-lirc-socket.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c20e1deb62521acaca945fe6af780cdfb477610b Mon Sep 17 00:00:00 2001 -From: Maxime Gauduin -Date: Thu, 30 Oct 2014 09:43:48 +0100 -Subject: [PATCH] Fix lirc socket path - ---- - configure.in | 4 ++-- - plex/CMakeModules/PlatformConfigLINUX.cmake | 2 +- - plex/CMakeModules/PlatformConfigRPI.cmake | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.in b/configure.in -index 002245a..85ad398 100644 ---- a/configure.in -+++ b/configure.in -@@ -452,9 +452,9 @@ AC_ARG_ENABLE([texturepacker], - - AC_ARG_WITH([lirc-device], - [AS_HELP_STRING([--with-lirc-device=file], -- [specify the default LIRC device (default is /dev/lircd)])], -+ [specify the default LIRC device (default is /var/run/lirc/lircd)])], - [lirc_device=$withval], -- [lirc_device=/dev/lircd]) -+ [lirc_device=/var/run/lirc/lircd]) - AC_DEFINE_UNQUOTED([LIRC_DEVICE], ["$lirc_device"], [Default LIRC device]) - - AC_ARG_ENABLE([udev], -diff --git a/plex/CMakeModules/PlatformConfigLINUX.cmake b/plex/CMakeModules/PlatformConfigLINUX.cmake -index 078fafb..3afa5c1 100644 -- cgit v0.12 From ea1aafd3af42ac0c5b573212b9b24ab7d9b4d397 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 8 Aug 2015 17:07:00 +0000 Subject: plex-media-server: update to 0.9.12.8.1362 --- abs/extra/plex-media-server/PKGBUILD | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/abs/extra/plex-media-server/PKGBUILD b/abs/extra/plex-media-server/PKGBUILD index 02a7416..151b927 100644 --- a/abs/extra/plex-media-server/PKGBUILD +++ b/abs/extra/plex-media-server/PKGBUILD @@ -7,11 +7,11 @@ # Contributor: Praekon pkgname=plex-media-server -pkgver=0.9.12.4.1192 -_pkgsum=9a47d21 -pkgrel=3 +pkgver=0.9.12.8.1362 +_pkgsum=4601e39 +pkgrel=1 pkgdesc='Plex Media Server' -arch=('arm' 'armv7h' 'i686' 'x86_64') +arch=('x86_64') url='https://plex.tv/' license=('custom') depends=('systemd' 'runit-scripts>=8.3-9') @@ -24,9 +24,9 @@ source=('plexmediaserver.conf.d' 'plexmediaserver.service' 'terms.txt' 'plexmediascanner.sh') -source_arm=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/PlexMediaServer-${pkgver}-${_pkgsum}-arm.spk") -source_armv7h=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/PlexMediaServer-${pkgver}-${_pkgsum}-arm7.spk") -source_i686=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/plexmediaserver-${pkgver}-${_pkgsum}.i386.rpm") +#source_arm=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/PlexMediaServer-${pkgver}-${_pkgsum}-arm.spk") +#source_armv7h=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/PlexMediaServer-${pkgver}-${_pkgsum}-arm7.spk") +#source_i686=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/plexmediaserver-${pkgver}-${_pkgsum}.i386.rpm") source_x86_64=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/plexmediaserver-${pkgver}-${_pkgsum}.x86_64.rpm") prepare() { @@ -46,6 +46,8 @@ package() { install -m 644 plexmediaserver.conf.d "${pkgdir}"/etc/conf.d/plexmediaserver install -m 755 -D plexmediascanner.sh "${pkgdir}"/usr/LH/bin/plexmediascanner.sh + #install -dm 755 "${pkgdir}"/var/lib/plex + #chown 421:421 -R "${pkgdir}"/var/lib/plex install -dm 755 "${pkgdir}"/usr/share/licenses/plex-media-server install -m 644 terms.txt "${pkgdir}"/usr/share/licenses/plex-media-server/ @@ -56,7 +58,4 @@ md5sums=('b67fd10314ab756169ec963f710cb9e3' '34268b981e3b8c833a0e2270429232a6' 'bd703bc750b989a27edd590eb8c8e9d7' '506ec15815bba749a743780edd2323c8') -md5sums_arm=('53b2d858284dfe75610b9ec08162198e') -md5sums_armv7h=('630780e6b18a5fb67ab4a26ebac2a4ec') -md5sums_i686=('b10dc378e66cd8cff5cbfdf6ad0ae540') -md5sums_x86_64=('0426a8a700dd38887c978beca6e45580') +md5sums_x86_64=('b2346789c479489dc2134cf9570aa8c5') -- cgit v0.12 From 468dfe604fbae3ccb5367bb011f864df2a9c7bab Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 8 Aug 2015 21:36:43 +0000 Subject: kodi: update to 15.0 --- abs/extra/kodi/PKGBUILD | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/abs/extra/kodi/PKGBUILD b/abs/extra/kodi/PKGBUILD index 134d325..09b14f2 100644 --- a/abs/extra/kodi/PKGBUILD +++ b/abs/extra/kodi/PKGBUILD @@ -13,9 +13,9 @@ _prefix=/usr pkgbase=kodi pkgname=('kodi' 'kodi-eventclients') -pkgver=14.2 -_codename=Helix -pkgrel=3 +pkgver=15.0 +_codename=Isengard +pkgrel=1 arch=('i686' 'x86_64') url="http://kodi.tv" license=('GPL2') @@ -24,9 +24,10 @@ makedepends=( 'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs' 'libass' 'libbluray' 'libcdio' 'libcec' 'libgl' 'libmariadbclient' 'libmicrohttpd' 'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libssh' 'libva' - 'libvdpau' 'libxrandr' 'libxslt' 'lzo' 'nasm' 'nss-mdns' 'python2-pillow' - 'python2-pybluez' 'python2-simplejson' 'rtmpdump' 'sdl2' 'sdl_image' - 'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower' 'yajl' 'zip' + 'libvdpau' 'libxrandr' 'libxslt' 'lzo' 'mesa' 'nasm' 'nss-mdns' + 'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'rtmpdump' 'sdl2' + 'sdl_image' 'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower' + 'yajl' 'zip' ) source=( "$pkgname-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz" @@ -41,10 +42,6 @@ prepare() { sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl sed 's/python/python2/' -i tools/Linux/kodi.sh.in sed 's/shell python/shell python2/' -i tools/EventClients/Makefile.in - # disable wiiremote due to incompatibility with bluez-5.29 - sed '/WiiRemote/d' -i tools/EventClients/Makefile.in - sed '/mkdir -p $(DESTDIR)$(bindir)/i \ -install:' -i tools/EventClients/Makefile.in } build() { @@ -62,9 +59,9 @@ build() { --disable-debug \ --enable-optimizations \ --enable-libbluray \ - --enable-external-libraries \ + --enable-shared-libraries \ --with-lirc-device=/run/lirc/lircd \ - ac_cv_lib_bluetooth_hci_devid=no + ac_cv_type__Bool=yes # Now (finally) build make @@ -137,6 +134,6 @@ package_kodi-eventclients() { make DESTDIR="$pkgdir" eventclients WII_EXTRA_OPTS=-DCWIID_OLD } -md5sums=('aa534c483cdd6cda71e5350c2094175b' +md5sums=('d3bd3dc9fd705bcf59d8c91199994537' 'f6adc8e06d7076143ca2ad118126b158' 'f04d1c89f5108c6aba36cf708a74cc95') -- cgit v0.12 From 50895f38e1d64e9ea39558f6aab60dc6f5fbbea8 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 9 Aug 2015 19:46:56 +0000 Subject: initscripts: update to 2014.09.1 --- abs/core/initscripts/PKGBUILD | 9 ++++++--- abs/core/initscripts/__changelog | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/abs/core/initscripts/PKGBUILD b/abs/core/initscripts/PKGBUILD index ca5b4c1..5eae239 100644 --- a/abs/core/initscripts/PKGBUILD +++ b/abs/core/initscripts/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Aaron Griffin pkgname=initscripts -pkgver=2014.03.1 -pkgrel=2 +pkgver=2014.09.1 +pkgrel=1 pkgdesc="Maintained fork of system initialization/bootup scripts" arch=('any') url="https://bitbucket.org/TZ86/initscripts-fork/overview" @@ -24,7 +24,7 @@ optdepends=('dhcpcd: DHCP network configuration' makedepends=(asciidoc) install=initscripts.install source=(https://bitbucket.org/TZ86/$pkgname-fork/get/$pkgver.tar.bz2) -md5sums=('f13aab36792429344ff685b64206722d') +md5sums=('10428fab486b57ed47f7a19033239446') package() { cd TZ86-$pkgname-* @@ -34,6 +34,9 @@ package() { #comment out some rc.conf options sed -i 's/NETWORK_PERSIST=/#NETWORK_PERSIST=/g' ${pkgdir}/etc/rc.conf sed -i 's/DAEMONS=/#DAEMONS=/g' ${pkgdir}/etc/rc.conf + + #use systemd-tmpfiles instead of arch-tmpfiles + sed -i 's:/usr/lib/initscripts/arch-tmpfiles:/usr/bin/systemd-tmpfiles:g' ${pkgdir}/etc/rc.d/functions } # vim:set ts=2 sw=2 et: diff --git a/abs/core/initscripts/__changelog b/abs/core/initscripts/__changelog index 6fe0a05..54bfb2d 100644 --- a/abs/core/initscripts/__changelog +++ b/abs/core/initscripts/__changelog @@ -3,4 +3,5 @@ - PKGBUILD: removed initscripts from provides, conflicts, replaces - PKGBUILD: remove dep sysvinit - PKGBUILD: comment out of rc.conf NETWORK_PERSIST= and DAEMONS= +- PKGBUILD: use systemd-tmpfiles instead of arch-tmpfiles - PKGBUILD: add dep bootlogd -- cgit v0.12 From 19ebf7c8c7ccdde7f0e2ee779f56b57d596df5fd Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 9 Aug 2015 19:47:51 +0000 Subject: filesystem: update to 2015.02 --- abs/core/filesystem/PKGBUILD | 71 ++++++++++++++++++++++++---------- abs/core/filesystem/crypttab | 12 +++--- abs/core/filesystem/filesystem.install | 34 +++++++++++----- abs/core/filesystem/group | 7 ++++ abs/core/filesystem/gshadow | 9 ++++- abs/core/filesystem/locale.sh | 22 +++++------ abs/core/filesystem/passwd | 21 ++++++---- abs/core/filesystem/shadow | 5 +++ 8 files changed, 124 insertions(+), 57 deletions(-) diff --git a/abs/core/filesystem/PKGBUILD b/abs/core/filesystem/PKGBUILD index 7b0ca08..0dec23d 100644 --- a/abs/core/filesystem/PKGBUILD +++ b/abs/core/filesystem/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187026 2013-06-03 11:15:07Z allan $ +# $Id$ # Maintainer: Tom Gundersen pkgname=filesystem -pkgver=2013.05 -pkgrel=4 +pkgver=2015.02 +pkgrel=1 pkgdesc='Base filesystem' arch=('i686' 'x86_64') license=('GPL') @@ -20,8 +20,36 @@ source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'archlinux.7.txt' 'locale.sh') +lint() { + # ensure that passwd is sync'd to shadow and group is sync'd to gshadow. + local r=0 + + local passwd shadow group gshadow + + for f in passwd shadow group gshadow; do + mapfile -t "$f" < <(cut -d: -f1 "$f" | sort) + done + + # we can cheat and do simple string comparison only because we can make some + # assumptions about the data in these files + if [[ ${passwd[*]} != "${shadow[*]}" ]]; then + error 'passwd is not in sync with shadow!' + r=1 + fi + + if [[ ${group[*]} != "${gshadow[*]}" ]]; then + error 'group is not in sync with gshadow!' + r=1 + fi + + return $r +} + build() { cd ${srcdir} + + lint + a2x -d manpage -f manpage archlinux.7.txt } @@ -43,7 +71,7 @@ package() { # setup /etc install -d etc/{ld.so.conf.d,skel,profile.d} - for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf os-release passwd resolv.conf securetty shells profile; do + for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do install -m644 ${srcdir}/${f} etc/ done ln -s /proc/self/mounts etc/mtab @@ -53,9 +81,10 @@ package() { touch etc/arch-release install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh + install -Dm644 "$srcdir"/os-release "$pkgdir"/usr/lib/os-release # setup /var - for d in cache/man local opt log/old lib/misc empty; do + for d in cache local opt log/old lib/misc empty; do install -d -m755 var/${d} done install -d -m1777 var/{tmp,spool/mail} @@ -65,9 +94,9 @@ package() { ln -s ../run var/run ln -s ../run/lock var/lock - - #setup /usr hierarchy - + # + # setup /usr hierarchy + # for d in bin include lib share/misc src; do install -d -m755 usr/${d} done @@ -79,17 +108,17 @@ package() { # add lib symlinks # ln -s usr/lib ${pkgdir}/lib - [[ ${CARCH} = "x86_64" ]] && ( + [[ ${CARCH} = "x86_64" ]] && ( ln -s usr/lib ${pkgdir}/lib64 ln -s lib ${pkgdir}/usr/lib64 ) -# # -# # add bin symlinks -# # - ln -s usr/bin ${pkgdir}/bin - ln -s usr/bin ${pkgdir}/sbin - ln -s bin ${pkgdir}/usr/sbin + # + # add bin symlinks + # + ln -s usr/bin ${pkgdir}/bin + ln -s usr/bin ${pkgdir}/sbin + ln -s bin ${pkgdir}/usr/sbin # # install archlinux(7) manpage @@ -104,23 +133,23 @@ package() { done ln -s ../man usr/local/share/man } -md5sums=('7b8e40f8f793e60f471511641bb1c9f2' +md5sums=('4d7417d2bf8872665c0907f09ae37c34' '7813c481156f6b280a3ba91fc6236368' '9e4533df61f0c82d6b2e2371f7376282' '4c4540eeb748bf1f71d631b8c1dcf0b3' 'f28150d4c0b22a017be51b9f7f9977ed' '6e488ffecc8ba142c0cf7e2d7aeb832e' - '1cfd310dff0804a7d21958487c32a3b1' - '2ef2429c2c98d0883906aa6f5363be80' + 'a998d1e6c7cc5791a7f4a2b49b2d10ce' + '1ec1b16e2a71fad63ab8f147069a5d97' '693c97f2c9a519bb97a17008e92c2b74' - '1745349eb24ed21b4cfaa6f423bddb76' + 'f0a5071f50d8864d2810c44e23eb00cc' '7bc65f234dfb6abf24e7c3b03e86f4ff' 'd41d8cd98f00b204e9800998ecf8427e' '3d96b9f0f4ea7b583261682a20283c46' '6f48288b6fcaf0065fcb7b0e525413e0' '22518e922891f9359f971f4f5b4e793c' - 'f45389e116ab0b9e9968287617d27c7d' + '69e460404f45bdb7288d1de662e56dd9' '0b6f835598c7640184e476057b3c7722' 'a8a962370cd0128465d514e6a1f74130' '2e193c4a37245f2323ebe87f1a673563' - '3807d07215d9116331fe1cf8feeaa0f8') + '71ed98c52e11ada1f936ac8cb14eecd9') diff --git a/abs/core/filesystem/crypttab b/abs/core/filesystem/crypttab index 195945a..087d09e 100644 --- a/abs/core/filesystem/crypttab +++ b/abs/core/filesystem/crypttab @@ -9,9 +9,9 @@ # NOTE: Do not list your root (/) partition here, it must be set up # beforehand by the initramfs (/etc/mkinitcpio.conf). -# -# home /dev/hda4 /etc/mypassword1 -# data1 /dev/hda3 /etc/mypassword2 -# data2 /dev/hda5 /etc/cryptfs.key -# swap /dev/hdx4 /dev/urandom swap,cipher=aes-cbc-essiv:sha256,size=256 -# vol /dev/hdb7 none +# +# home UUID=b8ad5c18-f445-495d-9095-c9ec4f9d2f37 /etc/mypassword1 +# data1 /dev/sda3 /etc/mypassword2 +# data2 /dev/sda5 /etc/cryptfs.key +# swap /dev/sdx4 /dev/urandom swap,cipher=aes-cbc-essiv:sha256,size=256 +# vol /dev/sdb7 none diff --git a/abs/core/filesystem/filesystem.install b/abs/core/filesystem/filesystem.install index c043744..9793ad2 100644 --- a/abs/core/filesystem/filesystem.install +++ b/abs/core/filesystem/filesystem.install @@ -1,14 +1,14 @@ # args: [options] _addgroup() { - if ! getent group "$1" >/dev/null; then - groupadd "$@" >/dev/null + if ! getent group "$1" >/dev/null && groupadd "$@" >/dev/null; then + need_group_update=1 fi } # args: [options] _adduser() { - if ! getent passwd "$1" >/dev/null; then - useradd "$@" >/dev/null + if ! getent passwd "$1" >/dev/null && useradd "$@" >/dev/null; then + need_passwd_update=1 fi } @@ -24,22 +24,38 @@ post_upgrade() { _addgroup network -g 90 _addgroup games -g 50 _addgroup uucp -g 14 + _addgroup proc -g 26 _addgroup http -g 33 - _adduser http -u 33 -d /srv/http -g http -s /bin/false + _adduser http -u 33 -d /srv/http -g http -s /usr/bin/nologin _addgroup scanner -g 96 _addgroup rfkill -g 24 _addgroup lock -g 54 _addgroup uuidd -g 68 - _adduser uuidd -u 68 -d / -g uuidd -s /sbin/nologin + _adduser uuidd -u 68 -d / -g uuidd -s /usr/bin/nologin _addgroup dbus -g 81 - _adduser dbus -u 81 -d / -g dbus -s /sbin/nologin + _adduser dbus -u 81 -d / -g dbus -s /usr/bin/nologin + _addgroup input -g 97 _addgroup systemd-journal -g 190 + _addgroup systemd-journal-gateway -g 191 + _adduser systemd-journal-gateway -u 191 -g 191 -d / -s /usr/bin/nologin + _addgroup systemd-timesync -g 192 + _adduser systemd-timesync -u 192 -g 192 -d / -s /usr/bin/nologin + _addgroup systemd-network -g 193 + _adduser systemd-network -u 193 -g 193 -d / -s /usr/bin/nologin + _addgroup systemd-bus-proxy -g 194 + _adduser systemd-bus-proxy -u 194 -g 194 -d / -s /usr/bin/nologin + _addgroup systemd-resolve -g 195 + _adduser systemd-resolve -u 195 -g 195 -d / -s /usr/bin/nologin - # sync gshadow to group (fixes FS#19869) - if ! grep -q '^lock:' etc/gshadow; then + # update shadow files if needed + if (( need_group_update )); then grpconv >/dev/null fi + if (( need_passwd_update )); then + pwconv >/dev/null + fi + if ! grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf fi diff --git a/abs/core/filesystem/group b/abs/core/filesystem/group index 6c91b29..f922ead 100644 --- a/abs/core/filesystem/group +++ b/abs/core/filesystem/group @@ -17,6 +17,7 @@ utmp:x:20: locate:x:21: rfkill:x:24: smmsp:x:25: +proc:x:26: http:x:33: games:x:50: lock:x:54: @@ -29,7 +30,13 @@ optical:x:93: floppy:x:94: storage:x:95: scanner:x:96: +input:x:97: power:x:98: nobody:x:99: users:x:100: systemd-journal:x:190: +systemd-journal-gateway:x:191: +systemd-timesync:x:192: +systemd-network:x:193: +systemd-bus-proxy:x:194: +systemd-resolve:x:195: diff --git a/abs/core/filesystem/gshadow b/abs/core/filesystem/gshadow index fb475bf..b89cf77 100644 --- a/abs/core/filesystem/gshadow +++ b/abs/core/filesystem/gshadow @@ -17,6 +17,7 @@ utmp:x:: locate::: rfkill:x:: smmsp::: +proc::: http::: games::: lock::: @@ -29,7 +30,13 @@ optical::: floppy:x:: storage:x:: scanner:x:: +input:x:: power:x:: nobody::: users::: -systemd-journal:x:: +systemd-journal::: +systemd-journal-gateway::: +systemd-timesync::: +systemd-network::: +systemd-bus-proxy::: +systemd-resolve::: diff --git a/abs/core/filesystem/locale.sh b/abs/core/filesystem/locale.sh index 5fd4174..11b7dc9 100644 --- a/abs/core/filesystem/locale.sh +++ b/abs/core/filesystem/locale.sh @@ -1,19 +1,17 @@ #!/bin/sh -unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \ - LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION - -if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then - . "$XDG_CONFIG_HOME/locale.conf" -elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then - . "$HOME/.config/locale.conf" -elif [ -r /etc/locale.conf ]; then - . /etc/locale.conf -elif [ -r /etc/rc.conf ]; then - LANG=$(. /etc/rc.conf 2>/dev/null; echo "$LOCALE") +if [ -z "$LANG" ]; then + if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then + . "$XDG_CONFIG_HOME/locale.conf" + elif [ -n "$HOME" ] && [ -r "$HOME/.config/locale.conf" ]; then + . "$HOME/.config/locale.conf" + elif [ -r /etc/locale.conf ]; then + . /etc/locale.conf + fi fi -export LANG="${LANG:-C}" +LANG=${LANG:-C} +export LANG [ -n "$LC_CTYPE" ] && export LC_CTYPE [ -n "$LC_NUMERIC" ] && export LC_NUMERIC [ -n "$LC_TIME" ] && export LC_TIME diff --git a/abs/core/filesystem/passwd b/abs/core/filesystem/passwd index 671fc48..b3e79eb 100644 --- a/abs/core/filesystem/passwd +++ b/abs/core/filesystem/passwd @@ -1,9 +1,14 @@ root:x:0:0:root:/root:/bin/bash -bin:x:1:1:bin:/bin:/bin/false -daemon:x:2:2:daemon:/sbin:/bin/false -mail:x:8:12:mail:/var/spool/mail:/bin/false -ftp:x:14:11:ftp:/srv/ftp:/bin/false -http:x:33:33:http:/srv/http:/bin/false -uuidd:x:68:68:uuidd:/:/sbin/nologin -dbus:x:81:81:dbus:/:/sbin/nologin -nobody:x:99:99:nobody:/:/bin/false +bin:x:1:1:bin:/bin:/usr/bin/nologin +daemon:x:2:2:daemon:/:/usr/bin/nologin +mail:x:8:12:mail:/var/spool/mail:/usr/bin/nologin +ftp:x:14:11:ftp:/srv/ftp:/usr/bin/nologin +http:x:33:33:http:/srv/http:/usr/bin/nologin +uuidd:x:68:68:uuidd:/:/usr/bin/nologin +dbus:x:81:81:dbus:/:/usr/bin/nologin +nobody:x:99:99:nobody:/:/usr/bin/nologin +systemd-journal-gateway:x:191:191:systemd-journal-gateway:/:/usr/bin/nologin +systemd-timesync:x:192:192:systemd-timesync:/:/usr/bin/nologin +systemd-network:x:193:193:systemd-network:/:/usr/bin/nologin +systemd-bus-proxy:x:194:194:systemd-bus-proxy:/:/usr/bin/nologin +systemd-resolve:x:195:195:systemd-resolve:/:/usr/bin/nologin diff --git a/abs/core/filesystem/shadow b/abs/core/filesystem/shadow index 39ebb13..4c6e3d1 100644 --- a/abs/core/filesystem/shadow +++ b/abs/core/filesystem/shadow @@ -7,3 +7,8 @@ http:x:14871:::::: uuidd:x:14871:::::: dbus:x:14871:::::: nobody:x:14871:::::: +systemd-journal-gateway:x:14871:::::: +systemd-timesync:x:14871:::::: +systemd-network:x:14871:::::: +systemd-bus-proxy:x:14871:::::: +systemd-resolve:x:14871:::::: -- cgit v0.12 From 62e86dba8de31177e5403a1ee3a528b710abff9b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 10 Aug 2015 12:28:06 +0000 Subject: udisks: rebuild --- abs/core/udisks/PKGBUILD | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/abs/core/udisks/PKGBUILD b/abs/core/udisks/PKGBUILD index 8e2a311..68d728e 100644 --- a/abs/core/udisks/PKGBUILD +++ b/abs/core/udisks/PKGBUILD @@ -3,18 +3,25 @@ pkgname=udisks pkgver=1.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="Disk Management Service" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/udisks" license=('GPL') -depends=('systemd' 'util-linux' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' - 'device-mapper' 'libatasmart' 'lsof') +depends=('systemd' 'util-linux' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' + 'parted' 'device-mapper' 'libatasmart' 'lsof' 'libgudev') makedepends=('intltool' 'docbook-xsl') source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service drop-pci-db.patch) +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # https://bugs.freedesktop.org/show_bug.cgi?id=90778 + sed -i '1i #include ' src/helpers/job-drive-detach.c +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ -- cgit v0.12 From fcfd1f95702bba3ed94577781384b7dd90758ded Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 10 Aug 2015 12:28:44 +0000 Subject: dbus: update to 1.8.20 --- abs/core/dbus/30-dbus | 2 +- abs/core/dbus/PKGBUILD | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/abs/core/dbus/30-dbus b/abs/core/dbus/30-dbus index 42b3a5f..96a5182 100644 --- a/abs/core/dbus/30-dbus +++ b/abs/core/dbus/30-dbus @@ -1,6 +1,6 @@ #!/bin/bash # launches a session dbus instance -if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && type dbus-launch >/dev/null; then +if [ -z "${DBUS_SESSION_BUS_ADDRESS-}" ] && type dbus-launch >/dev/null; then eval $(dbus-launch --sh-syntax --exit-with-session) fi diff --git a/abs/core/dbus/PKGBUILD b/abs/core/dbus/PKGBUILD index e554405..f7bb849 100644 --- a/abs/core/dbus/PKGBUILD +++ b/abs/core/dbus/PKGBUILD @@ -5,8 +5,8 @@ pkgbase=dbus pkgname=('dbus' 'libdbus') -pkgver=1.8.12 -pkgrel=2 +pkgver=1.8.20 +pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64) @@ -14,10 +14,10 @@ license=('GPL' 'custom') makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl') source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc} 30-dbus) -md5sums=('0ca23fc84c09cb3d29b9c27811ff4475' +md5sums=('b49890bbabedab3a1c3f4f73c7ff8b2b' 'SKIP' - '3314d727fa57fc443fce25b5cbeebbcc') -validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') + '6683a05bd749929ef9442816c22c3268') +validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie build() { cd dbus-$pkgver @@ -26,7 +26,7 @@ build() { --with-system-pid-file=/run/dbus/pid \ --with-system-socket=/run/dbus/system_bus_socket \ --with-console-auth-dir=/run/console/ \ - --enable-inotify --disable-dnotify \ + --enable-inotify \ --disable-verbose-mode --disable-static \ --disable-tests --disable-asserts \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ @@ -51,7 +51,7 @@ package_dbus(){ rm -rf "${pkgdir}/var/run" rm -rf "${pkgdir}/usr/lib/pkgconfig" - install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus" + install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus.sh" install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING" } -- cgit v0.12 From 98a9c4e9715a88bfb51042cbaa83998650b9db18 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 10 Aug 2015 12:39:43 +0000 Subject: libunistring: dep of gettext --- abs/core/libunistring/PKGBUILD | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 abs/core/libunistring/PKGBUILD diff --git a/abs/core/libunistring/PKGBUILD b/abs/core/libunistring/PKGBUILD new file mode 100644 index 0000000..a9d9e81 --- /dev/null +++ b/abs/core/libunistring/PKGBUILD @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski +# Contributor: Jan de Groot +# Contributor: Sergej Pupykin +# Contributor: Emmanuel 'guinness' Boudreault +# Contributor: Patrick McCarty + +pkgname=libunistring +pkgver=0.9.6 +pkgrel=1 +pkgdesc='Library for manipulating Unicode strings and C strings' +url='http://www.gnu.org/software/libunistring/' +arch=('i686' 'x86_64') +license=('GPL') +depends=('glibc') +install=libunistring.install +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('dfae4ff5583649ed24d8f368f1d0543b') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +check() { + make -C $pkgname-$pkgver check +} + +package() { + make -C $pkgname-$pkgver DESTDIR="$pkgdir" install +} -- cgit v0.12 From df3f8b92e3e7630fedc9ca158bc603cb3aff4942 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 10 Aug 2015 12:52:28 +0000 Subject: gettext: update to 0.19.5 --- abs/core/gettext/PKGBUILD | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/abs/core/gettext/PKGBUILD b/abs/core/gettext/PKGBUILD index 8b915e5..87bcf54 100644 --- a/abs/core/gettext/PKGBUILD +++ b/abs/core/gettext/PKGBUILD @@ -1,34 +1,35 @@ -# $Id: PKGBUILD 142112 2011-11-05 10:14:09Z tpowa $ +# $Id$ # Maintainer: pkgname=gettext -pkgver=0.18.1.1 -pkgrel=4 +pkgver=0.19.5 +pkgrel=1 pkgdesc="GNU internationalization library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/gettext/" license=('GPL') -groups=('base') -depends=('gcc-libs' 'acl' 'sh' 'glib2') -optdepends=('cvs: for autopoint tool') -options=(!libtool !docs) +groups=('base' 'base-devel') +depends=('gcc-libs' 'acl' 'sh' 'glib2' 'libunistring') +optdepends=('git: for autopoint infrastructure updates') +options=(!docs) install=gettext.install -source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz) -md5sums=('3dd55b952826d2b32f51308f2f91aa89') +source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz{,.sig}) +validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # Daiki Ueno build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's/libexpat.so.0/libexpat.so.1/' gettext-tools/src/x-glade.c - ./configure --prefix=/usr --enable-csharp + ./configure --prefix=/usr make } -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# make check -#} +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -j1 -k check +} package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } +md5sums=('0f3c108d64e8dcd9e6fbdff4ca722feb' + 'SKIP') -- cgit v0.12 From 6782a7515790d455738f485f2147bc5477657766 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 10 Aug 2015 12:54:00 +0000 Subject: intltool: update 0.51.0 --- abs/core/intltool/PKGBUILD | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/abs/core/intltool/PKGBUILD b/abs/core/intltool/PKGBUILD index 44ff833..3ddeaaf 100644 --- a/abs/core/intltool/PKGBUILD +++ b/abs/core/intltool/PKGBUILD @@ -1,31 +1,32 @@ -# $Id: PKGBUILD 155385 2012-04-03 01:23:12Z eric $ +# $Id$ # Maintainer: Eric Bélanger pkgname=intltool -pkgver=0.50.2 +pkgver=0.51.0 pkgrel=1 pkgdesc="The internationalization tool collection" arch=('any') url="https://edge.launchpad.net/intltool" license=('GPL') depends=('perl-xml-parser') -source=(http://edge.launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc}) -sha1sums=('7fddbd8e1bf94adbf1bc947cbf3b8ddc2453f8ad' - '85c71e9651df41fc330c5f171fdfe1bf11e44f65') +source=(http://launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc}) +sha1sums=('a0c3bcb99d1bcfc5db70f8d848232a47c47da090' + 'SKIP') +validpgpkeys=('9EBD001680E8C8F9FAC61A9BE1A701D4C9DE75B5') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr 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 doc/I18N-HOWTO "${pkgdir}/usr/share/doc/${pkgname}/I18N-HOWTO" } -- cgit v0.12 From 59afebf4e09cb74383fe0237471d05e3157e84c4 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 10 Aug 2015 13:49:44 +0000 Subject: udevil: update to 0.4.4 --- abs/core/udevil/PKGBUILD | 22 ++++++++++------------ abs/core/udevil/__changelog | 1 + 2 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 abs/core/udevil/__changelog diff --git a/abs/core/udevil/PKGBUILD b/abs/core/udevil/PKGBUILD index 912d0bf..bae0f80 100644 --- a/abs/core/udevil/PKGBUILD +++ b/abs/core/udevil/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80589 2012-11-26 14:58:37Z bpiotrowski $ +# $Id$ # Maintainer: Bartłomiej Piotrowski # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ pkgname=udevil -pkgver=0.3.5 +pkgver=0.4.4 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Mount and unmount without password' @@ -11,29 +11,27 @@ url='http://ignorantguru.github.com/udevil/' license=('GPL3') makedepends=('intltool' 'gettext') depends=('udev' 'glib2') -optdepends=('nfs-utils: mount nfs shares' +optdepends=('davfs2: mount WebDAV shares' + 'nfs-utils: mount nfs shares' 'sshfs: mount sftp shares' 'curlftpfs: mount ftp shares' 'cifs-utils: mount samba shares' - 'eject: eject via devmon' 'zenity: devmon popups' - 'pmount: devmon mount without suid udevil' - 'udisks: devmon mount without suid udevil' 'udisks2: devmon mount without suid udevil') provides=('devmon') backup=('etc/udevil/udevil.conf') install=$pkgname.install -source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz) +source=($pkgname-$pkgver.tar.gz::https://github.com/IgnorantGuru/udevil/archive/$pkgver.tar.gz) +md5sums=('281aa065d92c679cb41728069e72b272') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver + sed -i 's:#include :#include \n#include :g' src/device-info.h ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } - -md5sums=('0acb03c85f06fc8b59c6997830613529') diff --git a/abs/core/udevil/__changelog b/abs/core/udevil/__changelog new file mode 100644 index 0000000..8561a28 --- /dev/null +++ b/abs/core/udevil/__changelog @@ -0,0 +1 @@ +PKGBUILD: add #include to device-info.h to fix error -- cgit v0.12 From a66263918230bc1d3f24cfdb8e6278dc0ac44cfc Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 10 Aug 2015 14:08:18 +0000 Subject: imap: upgrage 2007f-5 --- abs/core/imap/PKGBUILD | 60 ++++++++++++++-------- .../imap/c-client-2006k_GENTOO_amd64-so-fix.patch | 13 +++++ 2 files changed, 52 insertions(+), 21 deletions(-) create mode 100644 abs/core/imap/c-client-2006k_GENTOO_amd64-so-fix.patch diff --git a/abs/core/imap/PKGBUILD b/abs/core/imap/PKGBUILD index b251daf..cad646c 100644 --- a/abs/core/imap/PKGBUILD +++ b/abs/core/imap/PKGBUILD @@ -1,40 +1,40 @@ # $Id$ -pkgname=imap +pkgbase=imap +pkgname=(imap c-client) pkgver=2007f -pkgrel=4 -pkgdesc="An IMAP/POP server" +pkgrel=5 arch=('i686' 'x86_64') license=('APACHE') url="http://www.washington.edu/imap" -depends=('openssl' 'pam') -provides=('imap-server' 'pop3-server') -conflicts=('courier-mta' 'courier-imap') +makedepends=('pam') source=("ftp://ftp.cac.washington.edu/imap/${pkgname}-${pkgver}.tar.gz" + 'c-client-2006k_GENTOO_amd64-so-fix.patch' 'imap' 'ipop2' 'ipop3') options=('staticlibs') -backup=(etc/xinetd.d/{imap,ipop2,ipop3} etc/ssl/certs/{imapd,ipop3d}.pem) md5sums=('2126fd125ea26b73b20f01fcd5940369' + '7f3937a871edd54203fe51f91423e204' '3ae5b3b333bc8ea2da106f6a97d7bd8d' '448f988dc5f9bdb2223dcea3abc4f5f1' '1499b13015075f0aafba04324a6f523a') prepare() { + cd $srcdir/$pkgbase-$pkgver + sed \ -e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \ -e "s:SSLDIR=/usr/local/ssl:SSLDIR=/usr:" \ -e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \ - -i $srcdir/$pkgname-$pkgver/src/osdep/unix/Makefile + -i src/osdep/unix/Makefile + + patch -p1 -i $srcdir/c-client-2006k_GENTOO_amd64-so-fix.patch } build() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgbase-$pkgver # NOTE: if you wish to enforce SSL, use SSLTYPE=unix.nopwd - if [ "$CARCH" == "x86_64" ]; then - yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC" - else yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix - fi + yes "y" | make lnp EXTRAAUTHENTICATORS=gss PASSWDTYPE=pam SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lpam" # create ssl certs for secure imap for i in imapd ipop3d; do @@ -59,18 +59,18 @@ EOF done } -package() { - cd $srcdir/$pkgname-$pkgver +package_imap() { + pkgdesc="An IMAP/POP server" + depends=('c-client') + provides=('imap-server' 'pop3-server') + conflicts=('courier-mta' 'courier-imap') + backup=(etc/xinetd.d/{imap,ipop2,ipop3} etc/ssl/certs/{imapd,ipop3d}.pem) + + cd $srcdir/$pkgbase-$pkgver install -d $pkgdir/usr/bin install -D -m755 imapd/imapd $pkgdir/usr/bin/imapd install -D -m755 ipopd/ipop2d $pkgdir/usr/bin/ipop2d install -D -m755 ipopd/ipop3d $pkgdir/usr/bin/ipop3d - for i in c-client mail imap4r1 rfc822 linkage misc smtp nntp \ - osdep env_unix env fs ftl nl tcp sslio utf8 utf8aux; do - install -D -m644 c-client/${i}.h $pkgdir/usr/include/imap/${i}.h - done - install -D -m644 c-client/c-client.a $pkgdir/usr/lib/c-client.a - ln -sf c-client.a $pkgdir/usr/lib/libc-client.a # install certs install -D -m600 imapd.pem $pkgdir/etc/ssl/certs/imapd.pem @@ -81,3 +81,21 @@ package() { install -D -m644 ../ipop2 $pkgdir/etc/xinetd.d/ipop2 install -D -m644 ../ipop3 $pkgdir/etc/xinetd.d/ipop3 } + +package_c-client() { + pkgdesc="Imap client library" + depends=('pam') + + cd $srcdir/$pkgbase-$pkgver + + for i in c-client mail imap4r1 rfc822 linkage misc smtp nntp \ + osdep env_unix env fs ftl nl tcp sslio utf8 utf8aux; do + install -D -m644 c-client/${i}.h $pkgdir/usr/include/imap/${i}.h + done + install -D -m644 c-client/c-client.a $pkgdir/usr/lib/c-client.a + ln -sf c-client.a $pkgdir/usr/lib/libc-client.a + + install -D -m755 c-client/libc-client.so.1.0.0 $pkgdir/usr/lib/libc-client.so.1.0.0 + ln -sf /usr/lib/libc-client.so.1.0.0 $pkgdir/usr/lib/libc-client.so.1 + ln -sf /usr/lib/libc-client.so.1.0.0 $pkgdir/usr/lib/libc-client.so +} diff --git a/abs/core/imap/c-client-2006k_GENTOO_amd64-so-fix.patch b/abs/core/imap/c-client-2006k_GENTOO_amd64-so-fix.patch new file mode 100644 index 0000000..79b067d --- /dev/null +++ b/abs/core/imap/c-client-2006k_GENTOO_amd64-so-fix.patch @@ -0,0 +1,13 @@ +diff -r 7c3e6c6ef2ba src/osdep/unix/Makefile +--- a/src/osdep/unix/Makefile Thu Feb 21 18:51:32 2008 +0100 ++++ b/src/osdep/unix/Makefile Thu Feb 21 18:53:15 2008 +0100 +@@ -962,6 +962,9 @@ onceenv: + -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS + echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS + echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE ++ echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \ ++ -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \ ++ >> ARCHIVE + echo $(OS) > OSTYPE + ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy + ./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS) -- cgit v0.12 From 997c6b992822c4304685fdbf501354ba3df9e695 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 10 Aug 2015 14:14:03 +0000 Subject: libunistring: commit .install --- abs/core/libunistring/libunistring.install | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 abs/core/libunistring/libunistring.install diff --git a/abs/core/libunistring/libunistring.install b/abs/core/libunistring/libunistring.install new file mode 100644 index 0000000..58dd2ef --- /dev/null +++ b/abs/core/libunistring/libunistring.install @@ -0,0 +1,22 @@ +infodir=usr/share/info +filelist=(libunistring.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: -- cgit v0.12 From 9c273574caea01c1adc975529f4ae857e0872f00 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 10 Aug 2015 14:21:48 +0000 Subject: gd: update to 2.1.1 --- abs/extra/gd/PKGBUILD | 25 ++++++++++----------- abs/extra/gd/color_c_null_pointer.patch | 18 ---------------- abs/extra/gd/gd-2.1.1-libvpx-1.4.0.patch | 37 ++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 30 deletions(-) delete mode 100644 abs/extra/gd/color_c_null_pointer.patch create mode 100644 abs/extra/gd/gd-2.1.1-libvpx-1.4.0.patch diff --git a/abs/extra/gd/PKGBUILD b/abs/extra/gd/PKGBUILD index b050624..f3dfcd2 100644 --- a/abs/extra/gd/PKGBUILD +++ b/abs/extra/gd/PKGBUILD @@ -1,27 +1,28 @@ # $Id$ pkgname=gd -pkgver=2.1.0 -pkgrel=3 +pkgver=2.1.1 +pkgrel=2 pkgdesc="Library for the dynamic creation of images by programmers" arch=('i686' 'x86_64') url="http://www.libgd.org/" license=('custom') depends=('fontconfig' 'libvpx' 'libxpm' 'libtiff') +makedepends=('git') optdepends=('perl: bdftogd script') -source=("https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${pkgver}.tar.xz" - 'color_c_null_pointer.patch') -md5sums=('03588159bf4faab9079849c8d709acc6' - '51f5ff073eabbd7809e0ce438d5bb1c2') +source=("${pkgname}::git+https://github.com/libgd/libgd.git#tag=${pkgname}-${pkgver}" + gd-2.1.1-libvpx-1.4.0.patch) +md5sums=('SKIP' + '9114dd8259aaa88b0a09188fe7b19afc') prepare() { - cd libgd-${pkgver} - # CVE-2014-2497 - patch -p1 -i ${srcdir}/color_c_null_pointer.patch + cd ${pkgname} + ./bootstrap.sh + patch -p1 -i "${srcdir}/gd-2.1.1-libvpx-1.4.0.patch" } build() { - cd libgd-${pkgver} + cd ${pkgname} ./configure \ --prefix=/usr \ --disable-rpath \ @@ -31,12 +32,12 @@ build() { } check() { - cd libgd-${pkgver} + cd ${pkgname} make check } package() { - cd libgd-${pkgver} + cd ${pkgname} make DESTDIR="${pkgdir}" install install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/abs/extra/gd/color_c_null_pointer.patch b/abs/extra/gd/color_c_null_pointer.patch deleted file mode 100644 index 95b3eeb..0000000 --- a/abs/extra/gd/color_c_null_pointer.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up ./src/gdxpm.c.color_c_null_pointer ./src/gdxpm.c ---- ./src/gdxpm.c.color_c_null_pointer 2013-06-25 11:58:23.000000000 +0200 -+++ ./src/gdxpm.c 2014-07-16 16:43:44.000000000 +0200 -@@ -62,6 +62,13 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFro - - for(i = 0; i < number; i++) { - char *c_color = image.colorTable[i].c_color; -+ if (!c_color) -+ { -+ /* unsupported color key or color key not defined */ -+ gdImageDestroy(im); -+ im = 0; -+ goto done; -+ } - if(strcmp(c_color, "None") == 0) { - colors[i] = gdImageGetTransparent(im); - if(colors[i] == -1) colors[i] = gdImageColorAllocate(im, 0, 0, 0); -diff -up ./x.color_c_null_pointer ./x diff --git a/abs/extra/gd/gd-2.1.1-libvpx-1.4.0.patch b/abs/extra/gd/gd-2.1.1-libvpx-1.4.0.patch new file mode 100644 index 0000000..c698972 --- /dev/null +++ b/abs/extra/gd/gd-2.1.1-libvpx-1.4.0.patch @@ -0,0 +1,37 @@ +From d41eb72cd4545c394578332e5c102dee69e02ee8 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Tue, 7 Apr 2015 13:11:03 +0200 +Subject: [PATCH] Fix build with latest libvpx 1.4.0 + +These new constants exist at least since 1.0.0 +Compatibility ones have been droped in 1.4.0 +--- + src/webpimg.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/webpimg.c b/src/webpimg.c +index cf73d64..e49fcc6 100644 +--- a/src/webpimg.c ++++ b/src/webpimg.c +@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8* Y, + codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0); + codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2); + +- vpx_img_wrap(&img, IMG_FMT_I420, ++ vpx_img_wrap(&img, VPX_IMG_FMT_I420, + y_width, y_height, 16, (uint8*)(Y)); +- img.planes[PLANE_Y] = (uint8*)(Y); +- img.planes[PLANE_U] = (uint8*)(U); +- img.planes[PLANE_V] = (uint8*)(V); +- img.stride[PLANE_Y] = y_stride; +- img.stride[PLANE_U] = uv_stride; +- img.stride[PLANE_V] = uv_stride; ++ img.planes[VPX_PLANE_Y] = (uint8*)(Y); ++ img.planes[VPX_PLANE_U] = (uint8*)(U); ++ img.planes[VPX_PLANE_V] = (uint8*)(V); ++ img.stride[VPX_PLANE_Y] = y_stride; ++ img.stride[VPX_PLANE_U] = uv_stride; ++ img.stride[VPX_PLANE_V] = uv_stride; + + res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY); + -- cgit v0.12 From da5bc04aaa40ded396de6030ebc723c4299612a8 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 10 Aug 2015 16:59:36 +0000 Subject: php: update to 5.6.12 --- abs/core/php/PKGBUILD | 55 +++++++++++++++++++++++++++----------- abs/core/php/__changelog | 2 ++ abs/core/php/php-fpm.conf.in.patch | 18 ++++++------- abs/core/php/php.ini.patch | 32 +++++++++++++--------- 4 files changed, 70 insertions(+), 37 deletions(-) diff --git a/abs/core/php/PKGBUILD b/abs/core/php/PKGBUILD index d20dc55..cccb505 100644 --- a/abs/core/php/PKGBUILD +++ b/abs/core/php/PKGBUILD @@ -11,6 +11,7 @@ pkgname=('php' 'php-pear' 'php-enchant' 'php-gd' + 'php-imap' 'php-intl' 'php-ldap' 'php-mcrypt' @@ -22,19 +23,22 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.6.3 -pkgrel=3 +pkgver=5.6.12 +pkgrel=2 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' -makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' +makedepends=('apache' 'c-client' 'postgresql-libs' 'libldap' 'postfix' 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'gd' 'icu' 'curl' 'libxslt' 'openssl' 'db' 'gmp' 'systemd') +checkdepends=('procps-ng') source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz" "http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz.asc" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') +validpgpkeys=('6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3' + '0BD78B5F97500D450838F95DFE857D9A90D90EC1') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} @@ -94,6 +98,7 @@ build() { --with-icu-dir=/usr \ --with-imap-ssl \ --with-imap=shared \ + --with-kerberos=/usr \ --with-jpeg-dir=/usr \ --with-vpx-dir=/usr \ --with-ldap=shared \ @@ -203,19 +208,28 @@ build() { make } -# check() { -# cd ${srcdir}/build-php -# export SNMP_TIMEOUT=1 -# export SNMP_RETRIES=0 -# export NO_INTERACTION=1 -# make test -# echo -# } +check() { + # tests on i686 fail + [[ $CARCH == 'i686' ]] && return + + cd ${srcdir}/build-php + + export REPORT_EXIT_STATUS=1 + export NO_INTERACTION=1 + export SKIP_ONLINE_TESTS=1 + export SKIP_SLOW_TESTS=1 + + sapi/cli/php -n \ + ${srcdir}/${pkgbase}-${pkgver}/run-tests.php -n -P \ + ${srcdir}/${pkgbase}-${pkgver}/{Zend,ext/{date,pcre,spl,standard},sapi/cli} + + echo +} package_php() { pkgdesc='An HTML-embedded scripting language' depends=('pcre' 'libxml2' 'curl' 'libzip' 'php-gd' 'php-mcrypt') - backup=('etc/php/php.ini') + #backup=('etc/php/php.ini') install='php.install' cd ${srcdir}/build-php @@ -228,9 +242,11 @@ package_php() { # remove static modules rm -f ${pkgdir}/usr/lib/php/modules/*.a # remove modules provided by sub packages - rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so + rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,imap,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so # remove empty directory rmdir ${pkgdir}/usr/include/php/include + # fix broken link + ln -sf phar.phar ${pkgdir}/usr/bin/phar } package_php-cgi() { @@ -303,6 +319,13 @@ package_php-gd() { install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so } +package_php-imap() { + pkgdesc='imap module for PHP' + depends=('php' 'c-client') + + install -D -m755 ${srcdir}/build-php/modules/imap.so ${pkgdir}/usr/lib/php/modules/imap.so +} + package_php-intl() { pkgdesc='intl module for PHP' depends=('php' 'icu') @@ -382,11 +405,11 @@ package_php-xsl() { install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so } -md5sums=('7635f344145a4edd7dff6ecec795aaea' +md5sums=('f2cc602602eb2b121779f2c4b8bacaba' 'SKIP' - 'b1088bdc55787f55019a2853e28dff84' + '943f882a55c0a6a7b3e5616c7dbbd7a8' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' - '6bc1fc4ceee039d21ff3b56aa845cc5a' + '16b5e2e4da59f15bea4c2db78a7bc8dc' '25bc67ad828e8147a817410b68d8016c' 'cc2940f5312ba42e7aa1ddfab74b84c4' 'c60343df74f8e1afb13b084d5c0e47ed') diff --git a/abs/core/php/__changelog b/abs/core/php/__changelog index 43aa7f6..69c2edd 100644 --- a/abs/core/php/__changelog +++ b/abs/core/php/__changelog @@ -1,8 +1,10 @@ PKGBUILD: package_php: add deps 'php-gd' 'php-mcrypt' since we have them in php.ini +PKGBUILD: package_php: comment out backup=('etc/php/php.ini') php.ini.patch: short_open_tags = On php.ini.patch: open_basedir commented out php.ini.patch: error_log = syslog uncommented +php.ini.patch: max_input_vars = 3000 uncomment and change to 3000 php.ini.patch: ==> check and make sure these are uncommented: ==> "extension=ftp.so" diff --git a/abs/core/php/php-fpm.conf.in.patch b/abs/core/php/php-fpm.conf.in.patch index 81eabf7..f9721a1 100644 --- a/abs/core/php/php-fpm.conf.in.patch +++ b/abs/core/php/php-fpm.conf.in.patch @@ -1,5 +1,5 @@ ---- sapi/fpm/php-fpm.conf.in 2014-04-29 10:04:30.000000000 +0200 -+++ sapi/fpm/php-fpm.conf.in 2014-05-01 07:36:14.762839158 +0200 +--- sapi/fpm/php-fpm.conf.in 2015-01-21 01:40:37.000000000 +0100 ++++ sapi/fpm/php-fpm.conf.in 2015-01-22 16:22:09.076969777 +0100 @@ -12,7 +12,7 @@ ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p argument) @@ -18,8 +18,8 @@ ; Error log file ; If it's set to "syslog", log is sent to syslogd instead of being written -@@ -156,7 +156,8 @@ - ; specific port; +@@ -161,7 +161,8 @@ + ; (IPv6 and IPv4-mapped) on a specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. -listen = 127.0.0.1:9000 @@ -28,7 +28,7 @@ ; Set listen(2) backlog. ; Default Value: 65535 (-1 on FreeBSD and OpenBSD) -@@ -167,9 +168,9 @@ +@@ -172,9 +173,9 @@ ; BSD-derived systems allow connections regardless of permissions. ; Default Values: user and group are set as the running user ; mode is set to 0660 @@ -38,10 +38,10 @@ +listen.owner = @php_fpm_user@ +listen.group = @php_fpm_group@ +listen.mode = 0660 - - ; List of ipv4 addresses of FastCGI clients which are allowed to connect. - ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -@@ -466,7 +467,7 @@ + ; When POSIX Access Control Lists are supported you can set them using + ; these options, value is a comma separated list of user/group names. + ; When set, listen.owner and listen.group are ignored +@@ -476,7 +477,7 @@ ; Chdir to this directory at the start. ; Note: relative path can be used. ; Default Value: current directory or / when chroot diff --git a/abs/core/php/php.ini.patch b/abs/core/php/php.ini.patch index 920553e..719de92 100644 --- a/abs/core/php/php.ini.patch +++ b/abs/core/php/php.ini.patch @@ -1,5 +1,5 @@ ---- php.ini-production.orig 2014-12-08 15:38:39.686053082 +0000 -+++ php.ini-production 2015-04-15 12:09:34.685705719 +0000 +--- php.ini-production.orig 2015-08-10 15:05:42.669490715 +0000 ++++ php.ini-production 2015-08-10 16:19:56.874447768 +0000 @@ -199,7 +199,7 @@ ; Development Value: Off ; Production Value: Off @@ -9,16 +9,25 @@ ; Allow ASP-style <% %> tags. ; http://php.net/asp-tags -@@ -296,7 +296,7 @@ - ; or per-virtualhost web server configuration file. This directive is - ; *NOT* affected by whether Safe Mode is turned On or Off. +@@ -295,7 +295,7 @@ + ; and below. This directive makes most sense if used in a per-directory + ; or per-virtualhost web server configuration file. ; http://php.net/open-basedir -;open_basedir = +;open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/ ; This directive allows you to disable certain functions for security reasons. - ; It receives a comma-delimited list of function names. This directive is -@@ -574,7 +574,7 @@ + ; It receives a comma-delimited list of function names. +@@ -386,7 +386,7 @@ + ;max_input_nesting_level = 64 + + ; How many GET/POST/COOKIE input variables may be accepted +-; max_input_vars = 1000 ++max_input_vars = 3000 + + ; Maximum amount of memory a script may consume (128MB) + ; http://php.net/memory-limit +@@ -571,7 +571,7 @@ ; Example: ;error_log = php_errors.log ; Log errors to syslog (Event Log on Windows). @@ -27,7 +36,7 @@ ;windows.show_crt_warning ; Default value: 0 -@@ -709,7 +709,7 @@ +@@ -708,7 +708,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -36,7 +45,7 @@ ; ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" -@@ -732,7 +732,7 @@ +@@ -731,7 +731,7 @@ ; Directory in which the loadable extensions (modules) reside. ; http://php.net/extension-dir @@ -45,7 +54,7 @@ ; On windows: ; extension_dir = "ext" -@@ -870,49 +870,48 @@ +@@ -869,48 +869,48 @@ ; If you only provide the name of the extension, PHP will look for it in its ; default extension directory. ; @@ -78,7 +87,6 @@ -;extension=php_pdo_pgsql.dll -;extension=php_pdo_sqlite.dll -;extension=php_pgsql.dll --;extension=php_pspell.dll -;extension=php_shmop.dll - -; The MIBS data available in the PHP distribution must be installed. @@ -114,7 +122,7 @@ +;extension=odbc.so +;zend_extension=opcache.so +extension=openssl.so -+extension=pdo_mysql.so ++;extension=pdo_mysql.so +;extension=pdo_odbc.so +;extension=pdo_pgsql.so +;extension=pdo_sqlite.so -- cgit v0.12 From d8620522693cbf77206b27121f2e68e55f5c6639 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 10 Aug 2015 19:01:30 +0000 Subject: dhcpcd: update to 6.9.1 --- ...et-hostname-via-proc-if-file-is-available.patch | 33 ------------ ...01-set-MTU-via-sysfs-if-file-is-available.patch | 61 ---------------------- abs/core/dhcpcd/PKGBUILD | 40 +++++++------- abs/core/dhcpcd/__changelog | 8 +-- abs/core/dhcpcd/dhcpcd.service | 4 +- abs/core/dhcpcd/dhcpcd_.service | 15 ------ abs/core/dhcpcd/remove_ifconfig.patch | 20 ------- 7 files changed, 28 insertions(+), 153 deletions(-) delete mode 100644 abs/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch delete mode 100644 abs/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch delete mode 100644 abs/core/dhcpcd/dhcpcd_.service delete mode 100644 abs/core/dhcpcd/remove_ifconfig.patch diff --git a/abs/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch b/abs/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch deleted file mode 100644 index 4420d0b..0000000 --- a/abs/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001 -From: Dan McGee -Date: Sun, 19 Jun 2011 16:04:25 -0500 -Subject: [PATCH] Set hostname via /proc if file is available - -On Linux, the hostname can be set via this file if available, precluding -the need for a `hostname` binary. - -Signed-off-by: Dan McGee ---- - dhcpcd-hooks/30-hostname | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname -index 65d1a13..af94262 100644 ---- a/dhcpcd-hooks/30-hostname -+++ b/dhcpcd-hooks/30-hostname -@@ -21,7 +21,11 @@ need_hostname() - try_hostname() - { - if valid_domainname "$1"; then -- hostname "$1" -+ if [ -w /proc/sys/kernel/hostname ]; then -+ echo "$1" > /proc/sys/kernel/hostname -+ else -+ hostname "$1" -+ fi - else - syslog err "Invalid hostname: $1" - fi --- -1.7.5.4 - diff --git a/abs/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch b/abs/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch deleted file mode 100644 index 7e78ecd..0000000 --- a/abs/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Tue, 21 Jun 2011 09:32:47 -0400 -Subject: [PATCH] set MTU via sysfs if file is available - -On Linux, a network interface's MTU can be set by writing to -/sys/class/net/$interface/mtu, which removes the dependency on ifconfig. - -Signed-off-by: Dave Reisner ---- - dhcpcd-hooks/10-mtu | 4 ++-- - dhcpcd-run-hooks.in | 11 +++++++++++ - 2 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu -index 639697c..8763930 100644 ---- a/dhcpcd-hooks/10-mtu -+++ b/dhcpcd-hooks/10-mtu -@@ -7,7 +7,7 @@ if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then - elif [ -n "$new_interface_mtu" ] && $if_up; then - # The smalled MTU dhcpcd can work with is 576 - if [ "$new_interface_mtu" -ge 576 ]; then -- if ifconfig "$interface" mtu "$new_interface_mtu"; then -+ if set_mtu "$interface" "$new_interface_mtu"; then - syslog info "$interface: MTU set to $new_interface_mtu" - # Save the MTU so we can restore it later - if [ ! -e "$mtu_dir/$interface" ]; then -@@ -21,7 +21,7 @@ elif [ -e "$mtu_dir/$interface" ]; then - # No MTU in this state, so restore the prior MTU - mtu=$(cat "$mtu_dir/$interface") - syslog info "$interface: MTU restored to $mtu" -- ifconfig "$interface" mtu "$mtu" -+ set_mtu "$interface" "$mtu" - rm "$mtu_dir/$interface" - fi - fi -diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in -index 0e60338..843f3ca 100644 ---- a/dhcpcd-run-hooks.in -+++ b/dhcpcd-run-hooks.in -@@ -215,6 +215,17 @@ service_condcommand() - service_exists $1 && service_status $1 && service_cmd $1 $2 - } - -+# Set MTU for an interface -+set_mtu() { -+ local interface=$1 mtu=$2 -+ -+ if [ -e /sys/class/net/$interface/mtu ]; then -+ echo "$mtu" > /sys/class/net/$interface/mtu -+ else -+ ifconfig "$interface" mtu "$mtu" -+ fi -+} -+ - # We source each script into this one so that scripts run earlier can - # remove variables from the environment so later scripts don't see them. - # Thus, the user can create their dhcpcd.enter/exit-hook script to configure --- -1.7.5.4 - diff --git a/abs/core/dhcpcd/PKGBUILD b/abs/core/dhcpcd/PKGBUILD index 81ea3be..ede945f 100644 --- a/abs/core/dhcpcd/PKGBUILD +++ b/abs/core/dhcpcd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 199762 2013-11-15 21:24:38Z ronald $ +# $Id$ # Maintainer: Ronald van Haren # Contributor: Tom Killian # Contributor: Judd Vinet pkgname=dhcpcd -pkgver=6.1.0 -pkgrel=4 +pkgver=6.9.1 +pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/projects/dhcpcd/" arch=('i686' 'x86_64') @@ -15,48 +15,52 @@ depends=('glibc' 'sh') provides=('dhcp-client') backup=('etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory -source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" +source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.xz" 'dhcpcd_.service' - 'dhcpcd.service' - 'dhcpcd.conf.d' ) + 'dhcpcd.service' + 'dhcpcd.conf.d') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" # configure variables - ./configure \ + ./configure \ --sbindir=/usr/bin \ --libexecdir=/usr/lib/dhcpcd \ --libdir=/usr/lib \ --dbdir=/var/lib/dhcpcd \ --rundir=/run - - # Build make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make test +} + package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install # Install Configuration File used in /etc/rc.d/network install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname # Install License - install -d $pkgdir/usr/share/licenses/$pkgname + install -d "$pkgdir/usr/share/licenses/$pkgname" sed 26q "$srcdir/$pkgname-$pkgver/control.h" \ >>"$pkgdir/usr/share/licenses/$pkgname/LICENSE" # Set Options in /etc/dhcpcd.conf - echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall + echo noipv4ll >> "${pkgdir}/etc/dhcpcd.conf" # Disable ip4vall # install systemd files - install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service - install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543 + install -Dm644 "${srcdir}/dhcpcd_.service" "${pkgdir}/usr/lib/systemd/system/dhcpcd@.service" + install -Dm644 "${srcdir}/dhcpcd.service" "${pkgdir}/usr/lib/systemd/system/dhcpcd.service" # FS#31543 } -md5sums=('6070040c57492925af9ac6aed980de2a' +md5sums=('42df0ef5f8a4b07c28faa56f42d55bab' '98cfea55077ba1680c2e902d669585b3' - '75bd063ad699609eb84f09b843f0971f' + '85056d566b3119c02017cfcff768f710' '1579b1b17306570078d2d4edfc867983') diff --git a/abs/core/dhcpcd/__changelog b/abs/core/dhcpcd/__changelog index 0004c0c..24efa35 100644 --- a/abs/core/dhcpcd/__changelog +++ b/abs/core/dhcpcd/__changelog @@ -1,4 +1,4 @@ -Added to dhcpcd.conf.d -DHCPCD_ARGS="-t 30 -h $HOSTNAME" - -Added libdir=/usr/lib because /lib conflicts with filesystem pkg +Added dhcpcd.conf.d + DHCPCD_ARGS="-t 30 -h $HOSTNAME" +PKGBUILD: add dhcpcd.conf.d +PKGBUILD: add libdir=/usr/lib because /lib conflicts with filesystem pkg diff --git a/abs/core/dhcpcd/dhcpcd.service b/abs/core/dhcpcd/dhcpcd.service index 489023d..e7dc289 100644 --- a/abs/core/dhcpcd/dhcpcd.service +++ b/abs/core/dhcpcd/dhcpcd.service @@ -6,8 +6,8 @@ Before=network.target [Service] Type=forking PIDFile=/run/dhcpcd.pid -ExecStart=/bin/dhcpcd -q -b -ExecStop=/bin/dhcpcd -x +ExecStart=/usr/bin/dhcpcd -q -b +ExecStop=/usr/bin/dhcpcd -x [Install] WantedBy=multi-user.target diff --git a/abs/core/dhcpcd/dhcpcd_.service b/abs/core/dhcpcd/dhcpcd_.service deleted file mode 100644 index e7bc5ca..0000000 --- a/abs/core/dhcpcd/dhcpcd_.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=dhcpcd on %I -Wants=network.target -Before=network.target -BindsTo=sys-subsystem-net-devices-%i.device -After=sys-subsystem-net-devices-%i.device - -[Service] -Type=forking -PIDFile=/run/dhcpcd-%I.pid -ExecStart=/usr/bin/dhcpcd -q -w %I -ExecStop=/usr/bin/dhcpcd -x %I - -[Install] -WantedBy=multi-user.target diff --git a/abs/core/dhcpcd/remove_ifconfig.patch b/abs/core/dhcpcd/remove_ifconfig.patch deleted file mode 100644 index 5bcc4a6..0000000 --- a/abs/core/dhcpcd/remove_ifconfig.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- dhcpcd-hooks/10-mtu.orig 2011-11-04 07:45:46.477712667 +0100 -+++ dhcpcd-hooks/10-mtu 2011-11-04 07:46:38.964379550 +0100 -@@ -7,7 +7,7 @@ - elif [ -n "$new_interface_mtu" ] && $if_up; then - # The smalled MTU dhcpcd can work with is 576 - if [ "$new_interface_mtu" -ge 576 ]; then -- if ifconfig "$interface" mtu "$new_interface_mtu"; then -+ if ip link set "$interface" mtu "$new_interface_mtu"; then - syslog info "$interface: MTU set to $new_interface_mtu" - # Save the MTU so we can restore it later - if [ ! -e "$mtu_dir/$interface" ]; then -@@ -21,7 +21,7 @@ - # No MTU in this state, so restore the prior MTU - mtu=$(cat "$mtu_dir/$interface") - syslog info "$interface: MTU restored to $mtu" -- ifconfig "$interface" mtu "$mtu" -+ ip link set "$interface" mtu "$new_interface_mtu" - rm "$mtu_dir/$interface" - fi - fi -- cgit v0.12 From 819ddcbc9a021bee084fc2a35ce8382b0d9c5789 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 11 Aug 2015 15:54:54 +0000 Subject: google-chrome: update to 44.0.2403.155 --- 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 ded0408..fd622e4 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=44.0.2403.130 +pkgver=44.0.2403.155 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -23,9 +23,6 @@ _channel=stable source=('eula_text.html') source_i686=("google-chrome-${_channel}_${pkgver}_i386.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_i386.deb") source_x86_64=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb") -md5sums=('b7e752f549b215ac77f284b6486794b6') -md5sums_i686=('086febf7c05720f68b76118a329b94cf') -md5sums_x86_64=('78852045747d981bafd331187fa68194') package() { msg2 "Extracting the data.tar.lzma..." @@ -60,3 +57,6 @@ package() { msg2 "Rename google-chrome-stable to google-chrome..." mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome } +md5sums=('b7e752f549b215ac77f284b6486794b6') +md5sums_i686=('f2f80fc6ab47fe11d9b55c5136726d30') +md5sums_x86_64=('177d027b1c4a0f7d574113f3d4e765c9') -- cgit v0.12 From 2cf1c8260b903c21a722d642c4d3f83db6f18ab3 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 11 Aug 2015 16:06:05 +0000 Subject: bash: update to 4.3.039 --- abs/core/bash/PKGBUILD | 34 +++++++++++---- abs/core/bash/parser-oob-4.2.patch | 85 -------------------------------------- 2 files changed, 27 insertions(+), 92 deletions(-) delete mode 100644 abs/core/bash/parser-oob-4.2.patch diff --git a/abs/core/bash/PKGBUILD b/abs/core/bash/PKGBUILD index fe5282c..ceb5e17 100644 --- a/abs/core/bash/PKGBUILD +++ b/abs/core/bash/PKGBUILD @@ -5,7 +5,7 @@ pkgname=bash _basever=4.3 -_patchlevel=027 +_patchlevel=039 pkgver=$_basever.$_patchlevel pkgrel=1 pkgdesc='The GNU Bourne Again shell' @@ -24,8 +24,8 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} dot.bash_logout system.bashrc system.bash_logout - privmode-setuid-fail.patch - parser-oob-4.2.patch) + privmode-setuid-fail.patch) +validpgpkeys=('7C0135FB088AAF6C66C650B9BB5869F064EA74AB') # Chet Ramey if [[ $((10#${_patchlevel})) -gt 0 ]]; then for (( _p=1; _p<=$((10#${_patchlevel})); _p++ )); do @@ -43,9 +43,6 @@ prepare() { # http://hmarco.org/bugs/bash_4.3-setuid-bug.html (FS#40663) patch -p0 -i ../privmode-setuid-fail.patch - - # CVE-2014-7169 patches - patch -p0 -i ../parser-oob-4.2.patch } build() { @@ -89,7 +86,6 @@ md5sums=('81348932d5da294953e15d4814c74dd1' '561949793177116b7be29a07c385ba8b' '472f536d7c9e8250dc4568ec4cfaf294' 'a577d42e38249d298d6a8d4bf2823883' - '461145288c8ffbf05c0f90554b2aa885' '1ab682b4e36afa4cf1b426aa7ac81c0d' 'SKIP' '8fc22cf50ec85da00f6af3d66f7ddc1b' @@ -143,4 +139,28 @@ md5sums=('81348932d5da294953e15d4814c74dd1' '922578e2be7ed03729454e92ee8d3f3a' 'SKIP' '8ff6948b16f2db5c29b1b9ae1085bbe7' + 'SKIP' + 'dd51fa67913b5dca45a702b672b3323f' + 'SKIP' + '0729364c977ef4271e9f8dfafadacf67' + 'SKIP' + 'efb709fdb1368945513de23ccbfae053' + 'SKIP' + '236df1ac1130a033ed0dbe2d2115f28f' + 'SKIP' + '2360f7e79cfb28526f80021025ea5909' + 'SKIP' + 'b551c4ee7b8713759e4143499d0bbd48' + 'SKIP' + 'c9a56fbe0348e05a886dff97f2872b74' + 'SKIP' + 'e564e8ab44ed1ca3a4e315a9f6cabdc9' + 'SKIP' + 'b00ff66c41a7c0f06e191200981980b0' + 'SKIP' + 'be2a7b05f6ae560313f3c9d5f7127bda' + 'SKIP' + '61e0522830b24fbe8c0d1b010f132470' + 'SKIP' + 'a4775487abe958536751c8ce53cdf6f9' 'SKIP') diff --git a/abs/core/bash/parser-oob-4.2.patch b/abs/core/bash/parser-oob-4.2.patch deleted file mode 100644 index 2ef5c48..0000000 --- a/abs/core/bash/parser-oob-4.2.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- ../bash-4.2-orig/parse.y 2014-09-25 13:07:59.218209276 +0200 -+++ parse.y 2014-09-25 15:26:52.813159810 +0200 -@@ -264,9 +264,21 @@ - - /* Variables to manage the task of reading here documents, because we need to - defer the reading until after a complete command has been collected. */ --static REDIRECT *redir_stack[10]; -+static REDIRECT **redir_stack; - int need_here_doc; - -+/* Pushes REDIR onto redir_stack, resizing it as needed. */ -+static void -+push_redir_stack (REDIRECT *redir) -+{ -+ /* Guard against oveflow. */ -+ if (need_here_doc + 1 > INT_MAX / sizeof (*redir_stack)) -+ abort (); -+ redir_stack = xrealloc (redir_stack, -+ (need_here_doc + 1) * sizeof (*redir_stack)); -+ redir_stack[need_here_doc++] = redir; -+} -+ - /* Where shell input comes from. History expansion is performed on each - line when the shell is interactive. */ - static char *shell_input_line = (char *)NULL; -@@ -519,42 +531,42 @@ - source.dest = 0; - redir.filename = $2; - $$ = make_redirection (source, r_reading_until, redir, 0); -- redir_stack[need_here_doc++] = $$; -+ push_redir_stack ($$); - } - | NUMBER LESS_LESS WORD - { - source.dest = $1; - redir.filename = $3; - $$ = make_redirection (source, r_reading_until, redir, 0); -- redir_stack[need_here_doc++] = $$; -+ push_redir_stack ($$); - } - | REDIR_WORD LESS_LESS WORD - { - source.filename = $1; - redir.filename = $3; - $$ = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN); -- redir_stack[need_here_doc++] = $$; -+ push_redir_stack ($$); - } - | LESS_LESS_MINUS WORD - { - source.dest = 0; - redir.filename = $2; - $$ = make_redirection (source, r_deblank_reading_until, redir, 0); -- redir_stack[need_here_doc++] = $$; -+ push_redir_stack ($$); - } - | NUMBER LESS_LESS_MINUS WORD - { - source.dest = $1; - redir.filename = $3; - $$ = make_redirection (source, r_deblank_reading_until, redir, 0); -- redir_stack[need_here_doc++] = $$; -+ push_redir_stack ($$); - } - | REDIR_WORD LESS_LESS_MINUS WORD - { - source.filename = $1; - redir.filename = $3; - $$ = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN); -- redir_stack[need_here_doc++] = $$; -+ push_redir_stack ($$); - } - | LESS_LESS_LESS WORD - { -@@ -4757,7 +4769,7 @@ - case CASE: - case SELECT: - case FOR: -- if (word_top < MAX_CASE_NEST) -+ if (word_top + 1 < MAX_CASE_NEST) - word_top++; - word_lineno[word_top] = line_number; - break; - - -- cgit v0.12 From d612093c2babb2bc4cfb072c67b5e66339ec9817 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 11 Aug 2015 16:29:41 +0000 Subject: coreutils: update to 8.24 --- .../0001-cp-don-t-reserve-a-device-number.patch | 77 ---------------------- abs/core/coreutils/PKGBUILD | 27 ++++---- abs/core/coreutils/__changelog | 2 + 3 files changed, 18 insertions(+), 88 deletions(-) delete mode 100644 abs/core/coreutils/0001-cp-don-t-reserve-a-device-number.patch create mode 100644 abs/core/coreutils/__changelog diff --git a/abs/core/coreutils/0001-cp-don-t-reserve-a-device-number.patch b/abs/core/coreutils/0001-cp-don-t-reserve-a-device-number.patch deleted file mode 100644 index 1f276b4..0000000 --- a/abs/core/coreutils/0001-cp-don-t-reserve-a-device-number.patch +++ /dev/null @@ -1,77 +0,0 @@ -From d0294ff3b90430750a631556277c75f1a555dd44 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Thu, 3 Apr 2014 09:48:22 -0700 -Subject: [PATCH] cp: don't reserve a device number - -* src/copy.c (copy_internal): Replace dev_t arg DEVICE with struct -stat pointer arg PARENT. All callers changed. This removes an -unwarranted assumption that dev_t values of 0 cannot occur in file -systems. See: http://bugs.gnu.org/17179 ---- - src/copy.c | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/src/copy.c b/src/copy.c -index 781cc1e..d471a77 100644 ---- a/src/copy.c -+++ b/src/copy.c -@@ -117,7 +117,7 @@ struct dir_list - #define DEST_INFO_INITIAL_CAPACITY 61 - - static bool copy_internal (char const *src_name, char const *dst_name, -- bool new_dst, dev_t device, -+ bool new_dst, struct stat const *parent, - struct dir_list *ancestors, - const struct cp_options *x, - bool command_line_arg, -@@ -621,7 +621,7 @@ copy_dir (char const *src_name_in, char const *dst_name_in, bool new_dst, - char *dst_name = file_name_concat (dst_name_in, namep, NULL); - bool first_dir_created = *first_dir_created_per_command_line_arg; - -- ok &= copy_internal (src_name, dst_name, new_dst, src_sb->st_dev, -+ ok &= copy_internal (src_name, dst_name, new_dst, src_sb, - ancestors, &non_command_line_options, false, - &first_dir_created, - &local_copy_into_self, NULL); -@@ -1725,9 +1725,8 @@ should_dereference (const struct cp_options *x, bool command_line_arg) - /* Copy the file SRC_NAME to the file DST_NAME. The files may be of - any type. NEW_DST should be true if the file DST_NAME cannot - exist because its parent directory was just created; NEW_DST should -- be false if DST_NAME might already exist. DEVICE is the device -- number of the parent directory, or 0 if the parent of this file is -- not known. ANCESTORS points to a linked, null terminated list of -+ be false if DST_NAME might already exist. A nonnull PARENT describes the -+ parent directory. ANCESTORS points to a linked, null terminated list of - devices and inodes of parent directories of SRC_NAME. COMMAND_LINE_ARG - is true iff SRC_NAME was specified on the command line. - FIRST_DIR_CREATED_PER_COMMAND_LINE_ARG is both input and output. -@@ -1737,7 +1736,7 @@ should_dereference (const struct cp_options *x, bool command_line_arg) - static bool - copy_internal (char const *src_name, char const *dst_name, - bool new_dst, -- dev_t device, -+ struct stat const *parent, - struct dir_list *ancestors, - const struct cp_options *x, - bool command_line_arg, -@@ -2434,7 +2433,7 @@ copy_internal (char const *src_name, char const *dst_name, - } - - /* Decide whether to copy the contents of the directory. */ -- if (x->one_file_system && device != 0 && device != src_sb.st_dev) -+ if (x->one_file_system && parent && parent->st_dev != src_sb.st_dev) - { - /* Here, we are crossing a file system boundary and cp's -x option - is in effect: so don't copy the contents of this directory. */ -@@ -2827,7 +2826,7 @@ copy (char const *src_name, char const *dst_name, - top_level_dst_name = dst_name; - - bool first_dir_created_per_command_line_arg = false; -- return copy_internal (src_name, dst_name, nonexistent_dst, 0, NULL, -+ return copy_internal (src_name, dst_name, nonexistent_dst, NULL, NULL, - options, true, - &first_dir_created_per_command_line_arg, - copy_into_self, rename_succeeded); --- -1.9.1 - diff --git a/abs/core/coreutils/PKGBUILD b/abs/core/coreutils/PKGBUILD index f10a12e..6762512 100644 --- a/abs/core/coreutils/PKGBUILD +++ b/abs/core/coreutils/PKGBUILD @@ -1,31 +1,36 @@ # $Id$ -# Maintainer: Sébastien "Seblu" Luttringer -# Contributor: Bartłomiej Piotrowski +# Maintainer: Sébastien "Seblu" Luttringer +# Contributor: Bartłomiej Piotrowski # Contributor: Allan McRae # Contributor: judd pkgname=coreutils -pkgver=8.23 +pkgver=8.24 pkgrel=1 pkgdesc='The basic file, shell and text manipulation utilities of the GNU operating system' arch=('i686' 'x86_64') license=('GPL3') url='http://www.gnu.org/software/coreutils' groups=('base') -depends=('glibc' 'pam' 'acl' 'gmp' 'libcap' 'openssl') +depends=('glibc' 'acl' 'attr' 'gmp' 'libcap' 'openssl') install=$pkgname.install source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) -md5sums=('abed135279f87ad6762ce57ff6d89c41' +validpgpkeys=('6C37DC12121A5006BC1DB804DF6FD971306037D9') # Pádraig Brady +md5sums=('40efdbce865d2458d8da0a9dcee7c16c' 'SKIP') -#prepare() { -# cd $pkgname-$pkgver -#} +prepare() { + local _p + for _p in *.patch; do + [[ -e $_p ]] || continue + msg2 "Applying $_p" + patch -p1 -d $pkgname-$pkgver < "$_p" + done +} build() { cd $pkgname-$pkgver - FORCE_UNSAFE_CONFIGURE=1 - export FORCE_UNSAFE_CONFIGURE + export FORCE_UNSAFE_CONFIGURE=1 ./configure \ --prefix=/usr \ --libexecdir=/usr/lib \ @@ -36,7 +41,7 @@ build() { check() { cd $pkgname-$pkgver - make RUN_EXPENSIVE_TESTS=yes check + make check } package() { diff --git a/abs/core/coreutils/__changelog b/abs/core/coreutils/__changelog new file mode 100644 index 0000000..9164f37 --- /dev/null +++ b/abs/core/coreutils/__changelog @@ -0,0 +1,2 @@ +PKGBUILD: add export FORCE_UNSAFE_CONFIGURE=1 + -- cgit v0.12 From b5429bc5fdf0f1d7f94ed75e309b5031eed55a59 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 11 Aug 2015 16:34:05 +0000 Subject: rsync: udpate to 3.1.1 --- abs/extra/rsync/PKGBUILD | 16 ++++++++-------- abs/extra/rsync/rsyncd.service | 1 + abs/extra/rsync/rsyncd@.service | 2 -- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/abs/extra/rsync/PKGBUILD b/abs/extra/rsync/PKGBUILD index ab83127..d94f712 100644 --- a/abs/extra/rsync/PKGBUILD +++ b/abs/extra/rsync/PKGBUILD @@ -1,31 +1,31 @@ # $Id$ pkgname=rsync -pkgver=3.1.0 -pkgrel=1 +pkgver=3.1.1 +pkgrel=4 pkgdesc="A file transfer program to keep remote files in sync" arch=('i686' 'x86_64') -url="http://samba.anu.edu.au/rsync/" +url="http://rsync.samba.org/" license=('GPL3') -depends=('perl' 'popt') +depends=('perl' 'popt' 'acl' 'zlib') backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync') source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz" "http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz.asc" 'rsyncd.conf' 'rsync.xinetd' 'rsyncd.service' 'rsyncd.socket' 'rsyncd@.service') -md5sums=('3be148772a33224771a8d4d2a028b132' +md5sums=('43bd6676f0b404326eee2d63be3cdcfe' 'SKIP' 'bce64d122a8e0f86872a4a21a03bc7f3' 'ea3e9277dc908bc51f9eddc0f6b935c1' - '084140868d38cf3e937a2db716d47c0f' + 'f90ba7f3717028769d6f230a2402b5aa' 'ae4c381e0c02d6132c7f6ded3f473041' - '53f94e613e0bc502d38dd61bd2cd7636') + 'ceab0b656e5e8239df594040b3b31d3c') +validpgpkeys=('0048C8B026D4C96F0E589C2F6C859FB14B96A8C5') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ --with-included-popt=no \ - --with-included-zlib=no \ --disable-debug make } diff --git a/abs/extra/rsync/rsyncd.service b/abs/extra/rsync/rsyncd.service index 8502c08..cd45687 100644 --- a/abs/extra/rsync/rsyncd.service +++ b/abs/extra/rsync/rsyncd.service @@ -1,5 +1,6 @@ [Unit] Description=A file transfer program to keep remote files in sync +After=network.target [Service] ExecStart=/usr/bin/rsync --daemon --no-detach diff --git a/abs/extra/rsync/rsyncd@.service b/abs/extra/rsync/rsyncd@.service index 33db95c..f52dc76 100644 --- a/abs/extra/rsync/rsyncd@.service +++ b/abs/extra/rsync/rsyncd@.service @@ -7,5 +7,3 @@ ExecStart=-/usr/bin/rsync --daemon StandardInput=socket StandardOutput=inherit StandardError=journal -User=nobody -Group=nobody -- cgit v0.12 From 6ce04f4fdc5d3f1acb245cc46ee8eaac8d8c66a6 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 13 Aug 2015 16:41:03 +0000 Subject: dhcpcd: back to 6.9.0 resolv.conf is sometimes empty in 6.9.1. https://bbs.archlinux.org/viewtopic.php?pid=1551490 --- abs/core/dhcpcd/PKGBUILD | 6 +++--- abs/core/dhcpcd/dhcpcd_.service | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 abs/core/dhcpcd/dhcpcd_.service diff --git a/abs/core/dhcpcd/PKGBUILD b/abs/core/dhcpcd/PKGBUILD index ede945f..e3a3708 100644 --- a/abs/core/dhcpcd/PKGBUILD +++ b/abs/core/dhcpcd/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Judd Vinet pkgname=dhcpcd -pkgver=6.9.1 +pkgver=6.9.0 pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/projects/dhcpcd/" @@ -15,7 +15,7 @@ depends=('glibc' 'sh') provides=('dhcp-client') backup=('etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory -source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.xz" +source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" 'dhcpcd_.service' 'dhcpcd.service' 'dhcpcd.conf.d') @@ -60,7 +60,7 @@ package() { install -Dm644 "${srcdir}/dhcpcd_.service" "${pkgdir}/usr/lib/systemd/system/dhcpcd@.service" install -Dm644 "${srcdir}/dhcpcd.service" "${pkgdir}/usr/lib/systemd/system/dhcpcd.service" # FS#31543 } -md5sums=('42df0ef5f8a4b07c28faa56f42d55bab' +md5sums=('374fcac1877078a2fc0ef8cd1617a869' '98cfea55077ba1680c2e902d669585b3' '85056d566b3119c02017cfcff768f710' '1579b1b17306570078d2d4edfc867983') diff --git a/abs/core/dhcpcd/dhcpcd_.service b/abs/core/dhcpcd/dhcpcd_.service new file mode 100644 index 0000000..e7bc5ca --- /dev/null +++ b/abs/core/dhcpcd/dhcpcd_.service @@ -0,0 +1,15 @@ +[Unit] +Description=dhcpcd on %I +Wants=network.target +Before=network.target +BindsTo=sys-subsystem-net-devices-%i.device +After=sys-subsystem-net-devices-%i.device + +[Service] +Type=forking +PIDFile=/run/dhcpcd-%I.pid +ExecStart=/usr/bin/dhcpcd -q -w %I +ExecStop=/usr/bin/dhcpcd -x %I + +[Install] +WantedBy=multi-user.target -- cgit v0.12 From 4f2c8e80f337636f7ff9a54a5d3e844390306210 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 13 Aug 2015 18:52:11 +0000 Subject: linux-firmware: update to 20150722 --- abs/core/linux-firmware/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/linux-firmware/PKGBUILD b/abs/core/linux-firmware/PKGBUILD index b3bef4a..5894b03 100644 --- a/abs/core/linux-firmware/PKGBUILD +++ b/abs/core/linux-firmware/PKGBUILD @@ -3,8 +3,8 @@ pkgname=linux-firmware # Commit date + git rev-parse --short origin/master -_rev=38e5405 -pkgver=20141201.${_rev} +_rev=e10097a +pkgver=20150722.${_rev} pkgrel=1 pkgdesc="Firmware files for Linux" makedepends=('git') -- cgit v0.12 From a2b92e42abf886f247b9d0d1c9969b5e6d4b5359 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 13 Aug 2015 19:06:44 +0000 Subject: dvb-firmware: add v4l-cx23885-enc.fw --- abs/core/dvb-firmware/PKGBUILD | 2 +- abs/core/dvb-firmware/dvb-fw/v4l-cx23885-enc.fw | Bin 0 -> 376836 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 abs/core/dvb-firmware/dvb-fw/v4l-cx23885-enc.fw diff --git a/abs/core/dvb-firmware/PKGBUILD b/abs/core/dvb-firmware/PKGBUILD index 244f247..ce109ae 100644 --- a/abs/core/dvb-firmware/PKGBUILD +++ b/abs/core/dvb-firmware/PKGBUILD @@ -3,7 +3,7 @@ pkgname=dvb-firmware pkgver=1 -pkgrel=22 +pkgrel=23 pkgdesc="Firmware for DVB cards" replaces=('hd3000firmware') arch=('i686' 'x86_64') diff --git a/abs/core/dvb-firmware/dvb-fw/v4l-cx23885-enc.fw b/abs/core/dvb-firmware/dvb-fw/v4l-cx23885-enc.fw new file mode 100644 index 0000000..25a2915 Binary files /dev/null and b/abs/core/dvb-firmware/dvb-fw/v4l-cx23885-enc.fw differ -- cgit v0.12 From b7d9c78187115141ea8c5c04a3ff6bde962623ec Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 20 Aug 2015 16:10:51 +0000 Subject: webmin: update to 1.760 --- abs/extra/webmin/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/extra/webmin/PKGBUILD b/abs/extra/webmin/PKGBUILD index be75967..1962157 100644 --- a/abs/extra/webmin/PKGBUILD +++ b/abs/extra/webmin/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Tobias Powalowski pkgname=webmin -pkgver=1.750 +pkgver=1.760 pkgrel=1 pkgdesc="a web-based interface for system administration" arch=(i686 x86_64) @@ -219,7 +219,7 @@ package() { # install license install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE } -md5sums=('4007c390323d840f26c2e0f43c5c81a3' +md5sums=('69ca5bd1f4ca0e1fa48afcd914bacf4a' 'b0b3e3fb231a12e60165b6b4d604dcfa' 'bfebb75bb94029b48c46b7f1ba1aa811' 'fc29ecb6a5cd8c278abe054e60381095') -- cgit v0.12 From 14cd3a87e04b5b75e586b62a63153c09e593c71e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 20 Aug 2015 18:05:14 +0000 Subject: mythtv: fix QT virtual keyboard patch --- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 9 +++-- .../stable-0.27/mythtv/fixQTvirtualkeyboard.patch | 45 ++++++++++++++++++++++ abs/core/mythtv/stable-0.27/mythtv/recordings | 22 ++++++++++- 4 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 abs/core/mythtv/stable-0.27/mythtv/fixQTvirtualkeyboard.patch diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 32acd30..1eedd22 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.5 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index ef238a4..a629cb5 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.5 -pkgrel=3 +pkgrel=4 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -21,8 +21,10 @@ install='mythtv.install' patches=('myth_settings.patch' 'videoAlwaysUseBookmark.patch' + 'fixQTvirtualkeyboard.patch' 'suggestedstarttime.patch.v1') - #http://code.mythtv.org/trac/ticket/11562 next mythfilldatabase run in mythweb + #fixQTvirtualkeyboard.patch: https://code.mythtv.org/trac/ticket/12347 + #suggestedstarttime.patch.v1: http://code.mythtv.org/trac/ticket/11562 next mythfilldatabase run in mythweb optdepends=() replaces=('mythvideo' 'myththemes') @@ -103,5 +105,6 @@ package() { md5sums=('5f3e43567e62afe17bad39f5a9b604cf' '41098e898361a5a3cde3eaae358482a8' + 'a853dff0f5c92ca58fcc1e389cd16266' '35a7fd3e3057691e3b1bf355bb9e8b16' - 'c56731fa55f1d24b7229942561c2aafe') + '928de4b070d9f3b784d55c0db415eaf3') diff --git a/abs/core/mythtv/stable-0.27/mythtv/fixQTvirtualkeyboard.patch b/abs/core/mythtv/stable-0.27/mythtv/fixQTvirtualkeyboard.patch new file mode 100644 index 0000000..1688bd6 --- /dev/null +++ b/abs/core/mythtv/stable-0.27/mythtv/fixQTvirtualkeyboard.patch @@ -0,0 +1,45 @@ +--- src/mythtv/libs/libmythui/mythmainwindow.cpp.orig 2015-08-19 21:24:59.990554429 +0000 ++++ src/mythtv/libs/libmythui/mythmainwindow.cpp 2015-08-19 21:23:33.851546588 +0000 +@@ -1380,7 +1380,7 @@ + .arg(::GetCurrentThreadId())); + #endif + if (currentWidget()) +- { ++#ifdef Q_OS_MAC + // don't disable the current widget, instead we disable all its children + // on mac, disabling the current active widget entirely prevent keyboard to + // work on the newly opened widget. +@@ -1395,8 +1395,9 @@ + d->enabledWidgets[w] = true; + } + } +- } +- ++#else ++ currentWidget()->setEnabled(false); ++#endif + d->widgetList.push_back(child); + child->winId(); + child->raise(); +@@ -1419,11 +1420,8 @@ + d->widgetList.erase(it); + QWidget *current = currentWidget(); + if (!current) +- { + current = this; +- // We're be to the main window, enable it just in case +- setEnabled(true); +- } ++#ifdef Q_OS_MAC + else + { + QList list = current->findChildren(); +@@ -1438,6 +1436,8 @@ + } + } + current->raise(); ++#endif ++ current->setEnabled(true); + current->setFocus(); + current->setMouseTracking(true); + diff --git a/abs/core/mythtv/stable-0.27/mythtv/recordings b/abs/core/mythtv/stable-0.27/mythtv/recordings index e364f3c..984fea9 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/recordings +++ b/abs/core/mythtv/stable-0.27/mythtv/recordings @@ -24,7 +24,8 @@ if [ -f /usr/share/mythtv/contrib/user_jobs/mythlink.pl ] then recdir="/data/storage/disk0/media/recordings" tmprecdir="/data/storage/disk0/media/tmp/recordings" - su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythlink.pl --format '%U/%T/%T %- S%ssE%ep %- %oY-%om-%od %- %S' --link '$tmprecdir'" + rm -r $tmprecdir + su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythlink.pl --format '%U/%T/%T %- S%ssE%ep %- %oY-%om-%od = %S' --link '$tmprecdir'" #delete Deleted recgroup and move files out of other dirs if [ -d "$tmprecdir/Deleted" ] @@ -64,6 +65,22 @@ then newlink=`echo "$link" | sed 's/ - 0000-00-00 - / - /'` mv "$link" "$newlink" done + #add dash pt suffix if filename before the subtitle is the same + #so that plex will scan and include in library + uniqs="$(ls $tmprecdir/**/* | sed 's/ = .*//' | sort | uniq -d)" + SAVEIFS=$IFS + IFS=$'\n' + for link in $uniqs + do + i=1 + for dup in `ls -v $link*` + do + newlink=`echo "$dup" | sed "s/ = /-pt$i = /"` + mv "$dup" "$newlink" + i=$((i+1)) + done + done + IFS=$SAVEIFS #change symlinks mtime to match the file it is linked to # for link in $tmprecdir/**/* @@ -83,7 +100,8 @@ then if [[ `pidof "Plex Media Server"` ]] then #get plex section and update - /usr/LH/bin/plexmediascanner.sh -l | grep -i myth | cut -d: -f1 | while read -r line ; do + /usr/LH/bin/plexmediascanner.sh -l | grep -i myth | cut -d: -f1 | while read -r line + do /usr/LH/bin/plexmediascanner.sh --scan --refresh --section $line done fi -- cgit v0.12 From e02ff97d615483c5252f8f5a422493b11ae62e42 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 20 Aug 2015 20:38:35 +0000 Subject: kodi: update to 15.1 --- abs/extra/kodi/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/extra/kodi/PKGBUILD b/abs/extra/kodi/PKGBUILD index 09b14f2..961c07a 100644 --- a/abs/extra/kodi/PKGBUILD +++ b/abs/extra/kodi/PKGBUILD @@ -13,7 +13,7 @@ _prefix=/usr pkgbase=kodi pkgname=('kodi' 'kodi-eventclients') -pkgver=15.0 +pkgver=15.1 _codename=Isengard pkgrel=1 arch=('i686' 'x86_64') @@ -134,6 +134,6 @@ package_kodi-eventclients() { make DESTDIR="$pkgdir" eventclients WII_EXTRA_OPTS=-DCWIID_OLD } -md5sums=('d3bd3dc9fd705bcf59d8c91199994537' +md5sums=('d8acb0ef061b3e2fef88146cea1f4443' 'f6adc8e06d7076143ca2ad118126b158' 'f04d1c89f5108c6aba36cf708a74cc95') -- cgit v0.12 From 50335adace53668ce9696707ee6a3790eda94aff Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 21 Aug 2015 12:47:09 +0000 Subject: xbmc & xbmc-pvr-addons: remove; replaced by kodi --- abs/extra/xbmc-pvr-addons/PKGBUILD | 31 ----- ...-don-t-try-to-stick-a-value-255-in-a-byte.patch | 41 ------ abs/extra/xbmc/0002-CEC-bump-libCEC-to-2.2.0.patch | 39 ------ ...-bus-rescan-on-a-Pi-since-the-adapter-can.patch | 26 ---- ...on-t-return-garbage-from-CEC-related-app-.patch | 112 ---------------- ...-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch | 32 ----- ...on-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch | 29 ---- abs/extra/xbmc/PKGBUILD | 147 --------------------- abs/extra/xbmc/__changelog | 4 - abs/extra/xbmc/xbmc.install | 26 ---- abs/extra/xbmc/xbmc.sh | 7 - abs/extra/xbmc/xbmc_lib.conf | 9 -- 12 files changed, 503 deletions(-) delete mode 100644 abs/extra/xbmc-pvr-addons/PKGBUILD delete mode 100644 abs/extra/xbmc/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch delete mode 100644 abs/extra/xbmc/0002-CEC-bump-libCEC-to-2.2.0.patch delete mode 100644 abs/extra/xbmc/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch delete mode 100644 abs/extra/xbmc/0004-CEC-fixed-don-t-return-garbage-from-CEC-related-app-.patch delete mode 100644 abs/extra/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch delete mode 100644 abs/extra/xbmc/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch delete mode 100644 abs/extra/xbmc/PKGBUILD delete mode 100644 abs/extra/xbmc/__changelog delete mode 100644 abs/extra/xbmc/xbmc.install delete mode 100644 abs/extra/xbmc/xbmc.sh delete mode 100644 abs/extra/xbmc/xbmc_lib.conf diff --git a/abs/extra/xbmc-pvr-addons/PKGBUILD b/abs/extra/xbmc-pvr-addons/PKGBUILD deleted file mode 100644 index 91f41f2..0000000 --- a/abs/extra/xbmc-pvr-addons/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin - -pkgname=xbmc-pvr-addons -pkgver=20140610.13.0_Gotham -_relname=${pkgver:9} -pkgrel=1 -pkgdesc="XBMC PVR add-ons for current stable xbmc" -arch=('i686' 'x86_64') -url="https://github.com/opdenkamp/xbmc-pvr-addons" -license=('GPL3') -depends=('xbmc' 'libmysqlclient') -makedepends=('git' 'libmysqlclient' 'boost') -optdepends=('tvheadend-git: tvheadend backend' 'mythtv: mythtv backend') -conflicts=('xbmc-pvr-addons-git') -source=("$pkgname-$pkgver.tar.gz::https://github.com/opdenkamp/xbmc-pvr-addons/archive/${_relname/_/-}.tar.gz") -#source=("git://github.com/opdenkamp/xbmc-pvr-addons.git") -#source=("git://github.com/fetzerch/xbmc-pvr-addons.git#branch=frodo") -md5sums=('63f5863393ca869eb6f357a62de76378') - -build() { - cd "$srcdir/$pkgname-${_relname/_/-}" - ./bootstrap - ./configure --prefix=/usr --enable-addons-with-dependencies - make -} - -package() { - cd "$srcdir/$pkgname-${_relname/_/-}" - make DESTDIR="$pkgdir/" install -} diff --git a/abs/extra/xbmc/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch b/abs/extra/xbmc/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch deleted file mode 100644 index f2fc11b..0000000 --- a/abs/extra/xbmc/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 4037c9fd07fbec1873549e71e0b1c2833a5a87db Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp -Date: Mon, 27 Oct 2014 14:42:30 +0100 -Subject: [PATCH 1/8] [CEC] fixed: don't try to stick a value > 255 in a byte - ---- - system/peripherals.xml | 2 +- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/system/peripherals.xml b/system/peripherals.xml -index 57af5d1..5fcff7c 100644 ---- a/system/peripherals.xml -+++ b/system/peripherals.xml -@@ -30,7 +30,7 @@ - - - -- -+ - - - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 9907ba2..1d068dc 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1347,8 +1347,8 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; - m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; - -- // double tap prevention timeout in ms -- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+ // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50 -+ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms") / 50; - } - - void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) --- -2.1.2 - diff --git a/abs/extra/xbmc/0002-CEC-bump-libCEC-to-2.2.0.patch b/abs/extra/xbmc/0002-CEC-bump-libCEC-to-2.2.0.patch deleted file mode 100644 index e7aecd7..0000000 --- a/abs/extra/xbmc/0002-CEC-bump-libCEC-to-2.2.0.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6cd70921650dda8864a844033e36f1bea55d034b Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp -Date: Mon, 27 Oct 2014 12:29:09 +0100 -Subject: [PATCH 2/8] [CEC] bump libCEC to 2.2.0 - ---- - project/BuildDependencies/scripts/libcec_d.txt | 2 +- - tools/depends/target/libcec/Makefile | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/project/BuildDependencies/scripts/libcec_d.txt b/project/BuildDependencies/scripts/libcec_d.txt -index a126c74..3d0265e 100644 ---- a/project/BuildDependencies/scripts/libcec_d.txt -+++ b/project/BuildDependencies/scripts/libcec_d.txt -@@ -1,3 +1,3 @@ - ; filename source of the file - --libcec-2.1.4.zip http://mirrors.xbmc.org/build-deps/win32/ -+libcec-2.2.0-win32.zip http://mirrors.xbmc.org/build-deps/win32/ -diff --git a/tools/depends/target/libcec/Makefile b/tools/depends/target/libcec/Makefile -index 16fec1b..6c72240 100644 ---- a/tools/depends/target/libcec/Makefile -+++ b/tools/depends/target/libcec/Makefile -@@ -3,9 +3,9 @@ DEPS= ../../Makefile.include Makefile - - # lib name, version - LIBNAME=libcec --VERSION=2.1.4 --SOURCE=$(LIBNAME)-$(VERSION)-2 --ARCHIVE=$(SOURCE).tar.gz -+VERSION=2.2.0 -+SOURCE=$(LIBNAME)-$(VERSION) -+ARCHIVE=$(SOURCE)-3.tar.gz - - # configuration settings - CONFIGURE=./configure --prefix=$(PREFIX) --disable-rpi \ --- -2.1.2 - diff --git a/abs/extra/xbmc/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch b/abs/extra/xbmc/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch deleted file mode 100644 index e8f5837..0000000 --- a/abs/extra/xbmc/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e59d7e028288464e6890141a830e4a83d4b9d065 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp -Date: Mon, 27 Oct 2014 15:32:36 +0100 -Subject: [PATCH 3/8] [CEC] prevent bus rescan on a Pi, since the adapter - cannot be removed - ---- - xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp -index b02535a..4941ae6 100644 ---- a/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp -+++ b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp -@@ -101,6 +101,8 @@ bool CPeripheralBusCEC::PerformDeviceScan(PeripheralScanResults &results) - break; - case ADAPTERTYPE_RPI: - result.m_mappedBusType = PERIPHERAL_BUS_RPI; -+ /** the Pi's adapter cannot be removed, no need to rescan */ -+ m_bNeedsPolling = false; - break; - default: - break; --- -2.1.2 - diff --git a/abs/extra/xbmc/0004-CEC-fixed-don-t-return-garbage-from-CEC-related-app-.patch b/abs/extra/xbmc/0004-CEC-fixed-don-t-return-garbage-from-CEC-related-app-.patch deleted file mode 100644 index d4556ae..0000000 --- a/abs/extra/xbmc/0004-CEC-fixed-don-t-return-garbage-from-CEC-related-app-.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 6544830d1a0b9810c2feb2fcb34df3f90b010d2f Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp -Date: Mon, 27 Oct 2014 21:01:00 +0100 -Subject: [PATCH 4/8] [CEC] fixed: don't return garbage from CEC related app - messenger methods see - https://github.com/xbmc/xbmc/commit/19d37944ca2a2ac2f3e71a40a94e9ea289d8f2db#commitcomment-8248480 - ---- - xbmc/Application.cpp | 14 ++++++++------ - xbmc/ApplicationMessenger.cpp | 20 +++++--------------- - xbmc/ApplicationMessenger.h | 4 ++-- - 3 files changed, 15 insertions(+), 23 deletions(-) - -diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index d5604dc..4d26183 100644 ---- a/xbmc/Application.cpp -+++ b/xbmc/Application.cpp -@@ -2351,16 +2351,18 @@ - - if (StringUtils::StartsWithNoCase(action.GetName(),"CECToggleState") || StringUtils::StartsWithNoCase(action.GetName(),"CECStandby")) - { -- bool ret = true; -- -- CLog::Log(LOGDEBUG, "%s: action %s [%d], toggling state of playing device", __FUNCTION__, action.GetName().c_str(), action.GetID()); - // do not wake up the screensaver right after switching off the playing device - if (StringUtils::StartsWithNoCase(action.GetName(),"CECToggleState")) -- ret = CApplicationMessenger::Get().CECToggleState(); -+ { -+ CLog::Log(LOGDEBUG, "%s: action %s [%d], toggling state of playing device", __FUNCTION__, action.GetName().c_str(), action.GetID()); -+ if (!CApplicationMessenger::Get().CECToggleState()) -+ return true; -+ } - else -- ret = CApplicationMessenger::Get().CECStandby(); -- if (!ret) /* display is switched off */ -+ { -+ CApplicationMessenger::Get().CECStandby(); - return true; -+ } - } - - ResetScreenSaver(); -diff --git a/xbmc/ApplicationMessenger.cpp b/xbmc/ApplicationMessenger.cpp -index 1a59c5c..d228273 100644 ---- a/xbmc/ApplicationMessenger.cpp -+++ b/xbmc/ApplicationMessenger.cpp -@@ -843,12 +843,12 @@ void CApplicationMessenger::ProcessMessage(ThreadMessage *pMsg) - } - case TMSG_CECACTIVATESOURCE: - { -- *((bool*)pMsg->lpVoid) = g_peripherals.ToggleDeviceState(STATE_ACTIVATE_SOURCE); -+ g_peripherals.ToggleDeviceState(STATE_ACTIVATE_SOURCE); - break; - } - case TMSG_CECSTANDBY: - { -- *((bool*)pMsg->lpVoid) = g_peripherals.ToggleDeviceState(STATE_STANDBY); -+ g_peripherals.ToggleDeviceState(STATE_STANDBY); - break; - } - case TMSG_START_ANDROID_ACTIVITY: -@@ -1396,29 +1396,19 @@ bool CApplicationMessenger::CECToggleState() - - ThreadMessage tMsg = {TMSG_CECTOGGLESTATE}; - tMsg.lpVoid = (void*)&result; -- SendMessage(tMsg, false); -+ SendMessage(tMsg, true); - - return result; - } - --bool CApplicationMessenger::CECActivateSource() -+void CApplicationMessenger::CECActivateSource() - { -- bool result; -- - ThreadMessage tMsg = {TMSG_CECACTIVATESOURCE}; -- tMsg.lpVoid = (void*)&result; - SendMessage(tMsg, false); -- -- return result; - } - --bool CApplicationMessenger::CECStandby() -+void CApplicationMessenger::CECStandby() - { -- bool result; -- - ThreadMessage tMsg = {TMSG_CECSTANDBY}; -- tMsg.lpVoid = (void*)&result; - SendMessage(tMsg, false); -- -- return result; - } -diff --git a/xbmc/ApplicationMessenger.h b/xbmc/ApplicationMessenger.h -index 9013567..543e065 100644 ---- a/xbmc/ApplicationMessenger.h -+++ b/xbmc/ApplicationMessenger.h -@@ -219,8 +219,8 @@ public: - - void LoadProfile(unsigned int idx); - bool CECToggleState(); -- bool CECActivateSource(); -- bool CECStandby(); -+ void CECActivateSource(); -+ void CECStandby(); - - CStdString GetResponse(); - int SetResponse(CStdString response); --- -2.1.2 - diff --git a/abs/extra/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch b/abs/extra/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch deleted file mode 100644 index 023257c..0000000 --- a/abs/extra/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9f1e45a10860dd23239de35673643e9e0e4a74f8 Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp -Date: Tue, 28 Oct 2014 14:52:16 +0100 -Subject: [PATCH 5/8] [CEC] renamed the iDoubleTapTimeoutMs in the new libCEC - for clarity. does not change binary compatibility - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index 1d068dc..ad123d9 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1347,8 +1347,13 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; - m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; - -+#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD) - // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50 -- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms") / 50; -+ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50; -+#else -+ // backwards compatibility. will be removed once the next major release of libCEC is out -+ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+#endif - } - - void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) --- -2.1.2 - diff --git a/abs/extra/xbmc/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch b/abs/extra/xbmc/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch deleted file mode 100644 index cd53396..0000000 --- a/abs/extra/xbmc/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fa01c108b60f74abb16992c1376bcca896093eac Mon Sep 17 00:00:00 2001 -From: Lars Op den Kamp -Date: Tue, 28 Oct 2014 16:08:00 +0100 -Subject: [PATCH 6/8] [CEC] fixed - don't use CEC_CLIENT_VERSION_CURRENT for - the client version, because it will lead to issues when XBMC is rebuilt after - a libCEC bump that changes something - ---- - xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -index ad123d9..015daef 100644 ---- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp -@@ -1268,8 +1268,8 @@ void CPeripheralCecAdapter::SetConfigurationFromLibCEC(const CEC::libcec_configu - - void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - { -- // use the same client version as libCEC version -- m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT; -+ // client version matches the version of libCEC that we originally used the API from -+ m_configuration.clientVersion = CEC_CLIENT_VERSION_2_2_0; - - // device name 'XBMC' - snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str()); --- -2.1.2 - diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD deleted file mode 100644 index 1737aff..0000000 --- a/abs/extra/xbmc/PKGBUILD +++ /dev/null @@ -1,147 +0,0 @@ -# vim:set ts=2 sw=2 et: -# $Id$ -# Maintainer: Sergej Pupykin -# Contributor: Brad Fanella -# Contributor: [vEX] -# Contributor: Zeqadious -# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com > -# Contributor: Bartłomiej Piotrowski -# Contributor: Maxime Gauduin - -_prefix=/usr - -pkgname=xbmc -pkgver=13.2 -_codename=Gotham -pkgrel=8 -pkgdesc="A software media player and entertainment hub for digital media" -arch=('i686' 'x86_64') -url="http://xbmc.org" -license=('GPL2') -depends=( -'avahi' 'hicolor-icon-theme' 'glu' 'lame' 'libass' 'libbluray' 'libcdio' 'libmad' -'libmicrohttpd' 'libmodplug' 'libmpeg2' 'libmysqlclient' -'libsamplerate' 'libssh' 'libva' 'libvdpau' 'libvorbis' 'libxrandr' 'libxslt' -'lzo' 'mesa' 'mesa-demos' 'python2' 'python2-pillow' 'rtmpdump' 'sdl_image' -'smbclient' 'taglib' 'tinyxml' 'unzip' 'xorg-xdpyinfo' 'yajl' -) -makedepends=( -'afpfs-ng' 'libnfs' 'libplist' 'shairplay' 'libcec' 'boost' 'cmake' 'doxygen' -'gperf' 'jasper' 'java-runtime-headless' 'nasm' 'swig' 'taglib' 'udisks' -'zip' -) -optdepends=( -'afpfs-ng: Apple File Protocol suport' -'libnfs: NFS Share support' -'libplist: AirPlay support' -'shairplay: AirPlay support' -'libcec: Pulse-Eight USB-CEC adapter support' -'polkit: power management' -'lirc: remote controller support' -'unrar: access compressed files without unpacking them' -'udisks: automount external drives' -'upower: display battery level' -) -install="${pkgname}.install" -source=( - "xbmc-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz" - '0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch' - '0002-CEC-bump-libCEC-to-2.2.0.patch' - '0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch' - '0004-CEC-fixed-don-t-return-garbage-from-CEC-related-app-.patch' - '0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch' - '0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch' - 'xbmc.sh' - 'xbmc_lib.conf' -) - -prepare() { - cd "$srcdir/xbmc-$pkgver-$_codename" - - patch -Np1 -i "$srcdir/0001-CEC-fixed-don-t-try-to-stick-a-value-255-in-a-byte.patch" - patch -Np1 -i "$srcdir/0002-CEC-bump-libCEC-to-2.2.0.patch" - patch -Np1 -i "$srcdir/0003-CEC-prevent-bus-rescan-on-a-Pi-since-the-adapter-can.patch" - patch -Np1 -i "$srcdir/0004-CEC-fixed-don-t-return-garbage-from-CEC-related-app-.patch" - patch -Np1 -i "$srcdir/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch" - patch -Np1 -i "$srcdir/0006-CEC-fixed-don-t-use-CEC_CLIENT_VERSION_CURRENT-for-t.patch" - - find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" + - sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl - sed 's/python/python2/' -i tools/Linux/xbmc.sh.in -} - -build() { - cd "$srcdir/xbmc-$pkgver-$_codename" - - # Bootstrapping XBMC - ./bootstrap - - # Configuring XBMC - export PYTHON_VERSION=2 # external python v2 - ./configure --prefix=$_prefix --exec-prefix=$_prefix \ - --disable-debug \ - --enable-optimizations \ - --enable-gl \ - --enable-sdl \ - --enable-vaapi \ - --enable-vdpau \ - --enable-xvba \ - --enable-joystick \ - --enable-xrandr \ - --enable-rsxs \ - --enable-projectm \ - --enable-x11 \ - --enable-rtmp \ - --enable-samba \ - --enable-nfs \ - --enable-afpclient \ - --enable-airplay \ - --enable-airtunes \ - --enable-ffmpeg-libvorbis \ - --enable-dvdcss \ - --disable-hal \ - --enable-avahi \ - --enable-webserver \ - --enable-optical-drive \ - --enable-libbluray \ - --enable-texturepacker \ - --enable-udev \ - --enable-libusb \ - --enable-libcec \ - --with-lirc-device=/run/lirc/lircd - - # Now (finally) build - make -} - -package() { - cd "$srcdir/xbmc-$pkgver-$_codename" - # Running make install - make DESTDIR="$pkgdir" install - - # Tools - install -D -m 0755 "$srcdir/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" \ - "${pkgdir}$_prefix/lib/xbmc/" - - # Licenses - install -dm755 "${pkgdir}$_prefix/share/licenses/$pkgname" - for licensef in LICENSE.GPL copying.txt; do - 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 -} -md5sums=('d80153b2cc78b88966458ab136e9494f' - 'd00af955c000f285a230568004209117' - '6ee855d2cd6ada08b2c72b5c15d5ae76' - '3e810f451e58d5704cdd15b83552aa53' - '693869eb72d696c3457e795722e707c6' - 'b6346f66286195189e41839e9a23ef87' - '47b765e1d4299fac32bf92f108548d06' - 'e48a3d87984669ef206e902bc8290ff9' - '71176cb0e5aaa230d7c9634c37245bfb') diff --git a/abs/extra/xbmc/__changelog b/abs/extra/xbmc/__changelog deleted file mode 100644 index a50187f..0000000 --- a/abs/extra/xbmc/__changelog +++ /dev/null @@ -1,4 +0,0 @@ -PKGBUILD - remove libpulse dep and remove --enable-pulse config option; add glu dep -PKGBUILD - Added xbmc_lib.conf, this file goes in /etc/gen_lib_xml.d/ -xbmc.install - add gen_lib_xml.py to post_install and post_remove -xbmc.install - comment out autostart message since we don't use systemd diff --git a/abs/extra/xbmc/xbmc.install b/abs/extra/xbmc/xbmc.install deleted file mode 100644 index 72d92d8..0000000 --- a/abs/extra/xbmc/xbmc.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install() { - update_icons -# update_autostart - gen_lib_xml.py -} - -post_upgrade() { - update_icons -# update_autostart -} - -post_remove() { - update_icons - update_autostart - gen_lib_xml.py -} - -update_icons() { - type -p gtk-update-icon-cache > /dev/null 2>&1 && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - type -p update-desktop-database > /dev/null 2>&1 && usr/bin/update-desktop-database -q usr/share/applications - return 0 -} - -update_autostart() { - echo "To autostart xbmc standalone read: https://wiki.archlinux.org/index.php/Xbmc#Autostarting_at_boot" -} diff --git a/abs/extra/xbmc/xbmc.sh b/abs/extra/xbmc/xbmc.sh deleted file mode 100644 index b073e5d..0000000 --- a/abs/extra/xbmc/xbmc.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -#Stop XScreensaver -stop_xss.sh & -#Launch XBMC -/usr/bin/xbmc --lircdev /var/run/lirc/lircd -#Once XBMC exits, start XSceensager again -killall stop_xss.sh diff --git a/abs/extra/xbmc/xbmc_lib.conf b/abs/extra/xbmc/xbmc_lib.conf deleted file mode 100644 index e3f4243..0000000 --- a/abs/extra/xbmc/xbmc_lib.conf +++ /dev/null @@ -1,9 +0,0 @@ - - - - -- cgit v0.12 From dd071c9810f5382efa80e84d67b83df0a03fd2ea Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 21 Aug 2015 12:53:41 +0000 Subject: kodi-platform-git: initial inclusion. dep of kodi-addon-pvr-mythtv --- abs/extra/kodi-platform-git/PKGBUILD | 41 ++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 abs/extra/kodi-platform-git/PKGBUILD diff --git a/abs/extra/kodi-platform-git/PKGBUILD b/abs/extra/kodi-platform-git/PKGBUILD new file mode 100644 index 0000000..e715ee5 --- /dev/null +++ b/abs/extra/kodi-platform-git/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: Michael Lass + +# This PKGBUILD is maintained on github: +# https://github.com/michaellass/AUR + +pkgname=kodi-platform-git +pkgver=r38.15edaf7 +pkgrel=1 +pkgdesc='Kodi platform support library' +arch=('armv7h' 'i686' 'x86_64') +url="https://github.com/xbmc/kodi-platform" +license=('GPL') +makedepends=('cmake' 'git') +depends=('kodi' 'libplatform') +provides=('kodi-platform') +conflicts=('kodi-platform') +source=("${pkgname}::git+https://github.com/xbmc/kodi-platform.git") +md5sums=('SKIP') + +pkgver() { + cd "$pkgname" + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +build() { + mkdir -p "$pkgname/build" + cd "$pkgname/build" + + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib \ + -DCMAKE_BUILD_TYPE=Release \ + .. + make +} + +package() { + cd "$pkgname/build" + make DESTDIR="$pkgdir" install +} -- cgit v0.12 From fcf3588951524fb897a69bd5d3a7440ac6861b83 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 21 Aug 2015 14:54:45 +0000 Subject: kodi-addon-pvr-mythtv: replaces kodi-pvr-addons --- abs/extra/kodi-addon-pvr-mythtv/PKGBUILD | 41 ++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 abs/extra/kodi-addon-pvr-mythtv/PKGBUILD diff --git a/abs/extra/kodi-addon-pvr-mythtv/PKGBUILD b/abs/extra/kodi-addon-pvr-mythtv/PKGBUILD new file mode 100644 index 0000000..d535338 --- /dev/null +++ b/abs/extra/kodi-addon-pvr-mythtv/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: dhead666 +# https://github.com/dhead666/archlinux-pkgbuilds +# +# package version generated with # git log -1 --date=short --format="%cd.%h" | tr -d '-' + +pkgname=kodi-addon-pvr-mythtv +_gitname=pvr.mythtv +pkgver=20150719.538e24d +_gitver=538e24d18bdfeef785b7b6d41f934bceafe3cf34 +pkgrel=2 +pkgdesc='MythTV PVR client addon for Kodi' +arch=('i686' 'x86_64') +url="https://github.com/kodi-pvr/$_gitname" +license=('GPL') +groups=('kodi-addons') +makedepends=('cmake' 'kodi-platform-git' 'libplatform') +depends=('kodi>=15.0') +provides=('kodi-pvr-addons') +replaces=('kodi-pvr-addons') +source=("https://github.com/kodi-pvr/$_gitname/archive/$_gitver.tar.gz") +md5sums=('SKIP') + +_prefix='/usr' + +build() { + msg "Starting make..." + + cd "$srcdir/$_gitname-$_gitver" + mkdir -p build && pushd build + cmake \ + -DCMAKE_INSTALL_PREFIX=$_prefix \ + -DCMAKE_BUILD_TYPE=Release \ + .. + make + popd +} + +package() { + cd "$srcdir/$_gitname-$_gitver/build" + make DESTDIR="$pkgdir" install +} -- cgit v0.12 From d64c316ccc63335ce84ee872ff5f824ba8ec2699 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 21 Aug 2015 14:55:21 +0000 Subject: kodi-pvr-addons: replaced by kodi-addon-pvr-mythtv --- abs/extra/kodi-pvr-addons/PKGBUILD | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 abs/extra/kodi-pvr-addons/PKGBUILD diff --git a/abs/extra/kodi-pvr-addons/PKGBUILD b/abs/extra/kodi-pvr-addons/PKGBUILD deleted file mode 100644 index bf9c6d0..0000000 --- a/abs/extra/kodi-pvr-addons/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin -# Contributor: BlackEagle > - -pkgname=kodi-pvr-addons -pkgver=20141212 -_relname='Helix_rc3' -pkgrel=2 -pkgdesc="PVR add-ons for current stable kodi" -arch=('i686' 'x86_64') -url="https://github.com/opdenkamp/xbmc-pvr-addons" -license=('GPL3') -groups=('kodi-addons') -depends=('kodi') -makedepends=('git') -optdepends=('tvheadend-git: tvheadend backend' 'mythtv: mythtv backend') -replaces=('xbmc-pvr-addons') -conflicts=('xbmc-pvr-addons' 'xbmc-pvr-addons-git') -source=("$pkgname-$pkgver.tar.gz::https://github.com/opdenkamp/xbmc-pvr-addons/archive/${_relname}.tar.gz") - -build() { - cd "$srcdir/xbmc-pvr-addons-${_relname}" - ./bootstrap - ./configure --prefix=/usr --enable-addons-with-dependencies - make -} - -package() { - cd "$srcdir/xbmc-pvr-addons-${_relname}" - make DESTDIR="$pkgdir/" install -} - -sha256sums=('e48de53c58245e512095d515d463f013e51e165fc617f1cb93e443cdd9f5096b') -- cgit v0.12 From a1bf8b4a0f420b230dd069fc57f752eacdc80869 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 21 Aug 2015 15:01:23 +0000 Subject: LinHES-config: mv_common.py: change kodi pvr addon name --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/mv_common.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 628516b..779da09 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.3 -pkgrel=18 +pkgrel=19 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' @@ -162,7 +162,7 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff' 'e959df98947eb0d2ea64ff616b61aab5' '2506860a416e1988934225d80d501c2c' 'c0549457750c4f8e8038d904a0f3012a' - 'a53861fa44ae41a61535f332a6c13bd6' + '936f81191e35c3a9bd202df849654b79' 'b845de3e05c1734cce4b9ac5e8f1baaf' '02b4378b17bca6bebdcc2258a80dfc6b' '8b7dce4a3a0a281fa6656aa8781a648e' diff --git a/abs/core/LinHES-config/mv_common.py b/abs/core/LinHES-config/mv_common.py index 8cf704c..1f2dec8 100755 --- a/abs/core/LinHES-config/mv_common.py +++ b/abs/core/LinHES-config/mv_common.py @@ -224,7 +224,7 @@ def pacinstall(pkg): elif pkg == "xbmc": pacinstall("xbmc-pvr-addons") elif pkg == "kodi": - pacinstall("kodi-pvr-addons") + pacinstall("kodi-addon-pvr-mythtv") elif pkg == "plexhometheater": pacinstall("plex-home-theater") elif pkg == "plexmediaserver": @@ -268,7 +268,7 @@ def pacremove(pkg): elif pkg == "xbmc": pacremove("xbmc-pvr-addons") elif pkg == "kodi": - pacremove("kodi-pvr-addons") + pacremove("kodi-addon-pvr-mythtv") elif pkg == "plexhometheater": pacremove("plex-home-theater") elif pkg == "plexmediaserver": -- cgit v0.12 From 9dfd6694e4f8f7bc4c8e969f3419c8bbd0e7fd33 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 24 Aug 2015 21:00:28 +0000 Subject: tig: update to 2.1.1 --- abs/extra/tig/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/extra/tig/PKGBUILD b/abs/extra/tig/PKGBUILD index edc023b..4db741d 100644 --- a/abs/extra/tig/PKGBUILD +++ b/abs/extra/tig/PKGBUILD @@ -1,10 +1,10 @@ -# Maintainer: Lukas Fleischer +# Maintainer: Lukas Fleischer # Contributor: Loui Chang # Contributor: Geoffroy Carrier # Contributor: Nathan Jones pkgname=tig -pkgver=2.0.1 +pkgver=2.1.1 pkgrel=1 pkgdesc='Text-mode interface for Git.' depends=('git' 'ncurses') @@ -14,7 +14,7 @@ license=('GPL') arch=('i686' 'x86_64') backup=('etc/tigrc') source=("http://jonas.nitro.dk/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('e0b3bc47b8c2c1e556ae953c0b30faab') +md5sums=('d6eb13d31319d57a3f726d8238f8ebc0') build() { cd "$srcdir/$pkgname-$pkgver" -- cgit v0.12 From c3d4612dd35fb69a7ba4273fea17d23e53032f2b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 24 Aug 2015 21:08:00 +0000 Subject: patch: update to 2.7.5 --- abs/core/patch/PKGBUILD | 25 ++++--- ...1-initialize-data-structures-early-enough.patch | 81 ---------------------- 2 files changed, 12 insertions(+), 94 deletions(-) delete mode 100644 abs/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch diff --git a/abs/core/patch/PKGBUILD b/abs/core/patch/PKGBUILD index 8171a3a..90c3b1e 100644 --- a/abs/core/patch/PKGBUILD +++ b/abs/core/patch/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: judd pkgname=patch -pkgver=2.7.1 -pkgrel=3 +pkgver=2.7.5 +pkgrel=1 pkgdesc='A utility to apply patch files to original sources' arch=('i686' 'x86_64') url='http://www.gnu.org/software/patch/patch.html' @@ -14,18 +14,17 @@ groups=('base-devel') depends=('glibc' 'attr') makedepends=('ed') optdepends=('ed: for patch -e functionality') -source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig} - 'patch-2.7.1-initialize-data-structures-early-enough.patch') -md5sums=('e9ae5393426d3ad783a300a338c09b72' - 'SKIP' - 'dc6367a7cd49933d4006c246789e98da') +validpgpkeys=('7768CE4B75E5236F1A374CEEC4C927CD5D1B36D7') # Andreas Gruenbacher +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) +md5sums=('e3da7940431633fb65a01b91d3b7a27a' + 'SKIP') -prepare() { - # Fix segfault on non-numeric strip-count - # (also segfaults on nonexistent directory passed to -d) - # http://savannah.gnu.org/bugs/?37500 - patch -Np1 -d $pkgname-$pkgver < patch-2.7.1-initialize-data-structures-early-enough.patch -} +#prepare() { +# # Fix segfault on non-numeric strip-count +# # (also segfaults on nonexistent directory passed to -d) +# # http://savannah.gnu.org/bugs/?37500 +# patch -Np1 -d $pkgname-$pkgver < patch-2.7.1-initialize-data-structures-early-enough.patch +#} build() { cd $pkgname-$pkgver diff --git a/abs/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch b/abs/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch deleted file mode 100644 index 046edc3..0000000 --- a/abs/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 291ec175812b7ba291d124e4cf2fbf9efec590c8 Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher -Date: Thu, 4 Oct 2012 12:33:09 +0200 -Subject: [PATCH] Initialize data structures early enough - -* src/patch.c (main): Initialize data structures early enough, before error -paths can access them. -* tests/bad-usage: Test bad command line usage. -* tests/Makefile.am (TESTS): Add bad-usage here. ---- - src/patch.c | 8 ++++---- - tests/Makefile.am | 1 + - tests/bad-usage | 18 ++++++++++++++++++ - 3 files changed, 23 insertions(+), 4 deletions(-) - create mode 100644 tests/bad-usage - -diff --git a/src/patch.c b/src/patch.c -index 828943b..0255fbb 100644 ---- a/src/patch.c -+++ b/src/patch.c -@@ -150,6 +150,10 @@ main (int argc, char **argv) - else if ((version_control = getenv ("VERSION_CONTROL"))) - version_control_context = "$VERSION_CONTROL"; - -+ init_backup_hash_table (); -+ init_files_to_delete (); -+ init_files_to_output (); -+ - /* parse switches */ - Argc = argc; - Argv = argv; -@@ -162,10 +166,6 @@ main (int argc, char **argv) - if (make_backups | backup_if_mismatch) - backup_type = get_version (version_control_context, version_control); - -- init_backup_hash_table (); -- init_files_to_delete (); -- init_files_to_output (); -- - init_output (&outstate); - if (outfile) - outstate.ofp = open_outfile (outfile); -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 02fc6de..5cea52d 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -20,6 +20,7 @@ TESTS = \ - asymmetric-hunks \ - backup-prefix-suffix \ - bad-filenames \ -+ bad-usage \ - concat-git-diff \ - copy-rename \ - corrupt-reject-files \ -diff --git a/tests/bad-usage b/tests/bad-usage -new file mode 100644 -index 0000000..022eeda ---- /dev/null -+++ b/tests/bad-usage -@@ -0,0 +1,18 @@ -+# Copyright (C) 2009, 2011-2012 Free Software Foundation, Inc. -+# -+# Copying and distribution of this file, with or without modification, -+# in any medium, are permitted without royalty provided the copyright -+# notice and this notice are preserved. -+ -+. $srcdir/test-lib.sh -+ -+require_cat -+use_local_patch -+use_tmpdir -+ -+# ============================================================== -+ -+check 'patch -px || echo "status: $?"' < Date: Mon, 24 Aug 2015 21:39:15 +0000 Subject: diffutils: update to 3.3 --- abs/core/diffutils/PKGBUILD | 32 ++++++++++++++++++-------------- abs/core/diffutils/__changelog | 1 - 2 files changed, 18 insertions(+), 15 deletions(-) delete mode 100644 abs/core/diffutils/__changelog diff --git a/abs/core/diffutils/PKGBUILD b/abs/core/diffutils/PKGBUILD index ca871aa..944753f 100644 --- a/abs/core/diffutils/PKGBUILD +++ b/abs/core/diffutils/PKGBUILD @@ -1,33 +1,37 @@ -# $Id: PKGBUILD 137084 2011-09-06 04:35:05Z allan $ -# Maintainer: Allan McRae +# $Id$ +# Mainainer: Sébastien Luttringer +# Contributor: Allan McRae # Contributor: Andreas Radke pkgname=diffutils -pkgver=3.2 -pkgrel=1 -pkgdesc="Utility programs used for creating patch files" +pkgver=3.3 +pkgrel=2 +pkgdesc='Utility programs used for creating patch files' arch=('i686' 'x86_64') -url="http://www.gnu.org/software/diffutils" +url='http://www.gnu.org/software/diffutils' license=('GPL3') groups=('base') -depends=('glibc' 'sh') +depends=('glibc' 'bash') install=diffutils.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz) -md5sums=('26ff64c332429c830c154be46b393382') +validpgpkeys=('155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) +md5sums=('99180208ec2a82ce71f55b0d7389f1b3' + '203a2f2101dfcc09cdac655be353fd78') build() { - cd ${srcdir}/${pkgname}-${pkgver} - sed -i '/gets is a security hole/d' lib/stdio.in.h + cd $pkgname-$pkgver ./configure --prefix=/usr make } check() { - cd ${srcdir}/${pkgname}-${pkgver} + cd $pkgname-$pkgver make check } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/diffutils/__changelog b/abs/core/diffutils/__changelog deleted file mode 100644 index f7bfd9a..0000000 --- a/abs/core/diffutils/__changelog +++ /dev/null @@ -1 +0,0 @@ -sed -i '/gets is a security hole/d' lib/stdio.in.h -- cgit v0.12 From 52944b4c8582b923b116127fa8a2c25a1fe601c4 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 1 Sep 2015 13:24:58 +0000 Subject: plex-media-server: update to 0.9.12.11.1406 --- abs/extra/plex-media-server/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/extra/plex-media-server/PKGBUILD b/abs/extra/plex-media-server/PKGBUILD index 151b927..942a5f0 100644 --- a/abs/extra/plex-media-server/PKGBUILD +++ b/abs/extra/plex-media-server/PKGBUILD @@ -7,8 +7,8 @@ # Contributor: Praekon pkgname=plex-media-server -pkgver=0.9.12.8.1362 -_pkgsum=4601e39 +pkgver=0.9.12.11.1406 +_pkgsum=8403350 pkgrel=1 pkgdesc='Plex Media Server' arch=('x86_64') @@ -58,4 +58,4 @@ md5sums=('b67fd10314ab756169ec963f710cb9e3' '34268b981e3b8c833a0e2270429232a6' 'bd703bc750b989a27edd590eb8c8e9d7' '506ec15815bba749a743780edd2323c8') -md5sums_x86_64=('b2346789c479489dc2134cf9570aa8c5') +md5sums_x86_64=('70385a3a61f43efdead53075601b5880') -- cgit v0.12 From 848e967b25b1e9baedc07d7bb5cf74b3b024b14b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 1 Sep 2015 17:13:06 +0000 Subject: LinHES-config: soundconfig.sh: add plug for dmix in mplayer --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/soundconfig.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 779da09..fb88b0a 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.3 -pkgrel=19 +pkgrel=20 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' @@ -151,7 +151,7 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff' '6e5639fff82fa2ba76113ac1ab8f2016' 'f0376c98a7986897406d393186c0365e' '157e73d0f90d7b306aba8f5921aeedd3' - '6d3340c86c5d0e3f96ea8fa26bb73fb5' + 'db9b625332493d5a7d12f3fa3ffae0ff' 'eef9b882ecb70648a8f253f85b73a274' '5f890ea9bda6aef652d2560ca19dac07' 'ab2aa42c2947148c2b1cac0ade6d1d55' diff --git a/abs/core/LinHES-config/soundconfig.sh b/abs/core/LinHES-config/soundconfig.sh index a6939a2..2f30306 100755 --- a/abs/core/LinHES-config/soundconfig.sh +++ b/abs/core/LinHES-config/soundconfig.sh @@ -89,7 +89,7 @@ function SYNCMPLAYER { then if [ "$mixAUDIODEVICE" ] then - MPLAYERDEVICE="dmixer" + MPLAYERDEVICE="plug=dmixer" else MPLAYERDEVICE=`echo $AUDIODEVICE | tr : = | tr , .` fi @@ -150,7 +150,7 @@ function write_asound { pcm.!default { type plug - slave.pcm dmixer + slave.pcm "dmixer" }' > /etc/asound.conf else echo 'pcm.!default "'"$AUDIODEVICE"'"' > /etc/asound.conf -- cgit v0.12 From 28cc8bad3efc117db88d38e19e7d9a8a75efbe75 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 2 Sep 2015 22:42:27 +0000 Subject: mythinstall: simplify default device to 1 list there are some cards that we identify wrong as analog or digital so to remove confusion just offer 1 list with all found devices --- .../MythVantage-app/mythinstall/installdialog.cpp | 4 +- .../mythinstall/installsettings.cpp | 261 +++++---------------- .../MythVantage-app/mythinstall/installsettings.h | 38 +-- abs/core/mythinstall/PKGBUILD | 2 +- 4 files changed, 67 insertions(+), 238 deletions(-) diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp index e18da49..4c7099d 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installdialog.cpp @@ -1127,8 +1127,8 @@ void WelcomeDialog::install_it(void) } } file.close(); - bool ok; - int mem = currentitem.toInt( &ok, 10 ); // dec == 0, ok == FALSE +// bool ok; +// int mem = currentitem.toInt( &ok, 10 ); // dec == 0, ok == FALSE // if ( mem >= 500000 ) diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp index adc9430..37dc7c9 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.cpp @@ -1090,26 +1090,6 @@ static HostCheckBox *Hostpluginmythweather() }; -//static HostCheckBox *HostMiro() -//{ -// HostCheckBox *gc = new HostCheckBox("HostMiro"); -// gc->setLabel(QObject::tr("Miro")); -// gc->setValue(false); -// gc->setHelpText(QObject::tr("Miro is a popular, free, and open internet TV application. It brings video channels from thousands of sources and has more free HD than any other platform.")); -// return gc; -//}; - - -// static HostCheckBox *HostXine() -// { -// HostCheckBox *gc = new HostCheckBox("HostXine"); -// gc->setLabel(QObject::tr("Xine")); -// gc->setValue(false); -// gc->setHelpText(QObject::tr("Xine is a free multimedia player")); -// return gc; -// }; - - static HostCheckBox *Hostwebmin() { HostCheckBox *gc = new HostCheckBox("Hostwebmin"); @@ -2775,31 +2755,6 @@ SoundSettings::SoundSettings(): addChild(HostAudiotype); setTrigger(HostAudiotype); -// HostsyncXine = new HostCheckBox("HostsyncXine"); -// HostsyncXine->setLabel(QObject::tr("Xine")); -// HostsyncXine->setValue(true); -// -// HostsyncMplayer = new HostCheckBox("HostsyncMplayer"); -// HostsyncMplayer->setLabel(QObject::tr("mplayer")); -// HostsyncMplayer->setValue(true); -// -// HostsyncMythMusic = new HostCheckBox("HostsyncMythMusic"); -// HostsyncMythMusic->setLabel(QObject::tr("mythmusic")); -// HostsyncMythMusic->setValue(true); -// -// HostsyncMythFrontend = new HostCheckBox("HostsyncMythFrontend"); -// HostsyncMythFrontend->setLabel(QObject::tr("mythfrontend")); -// HostsyncMythFrontend->setValue(true); - - - - -// HorizontalConfigurationGroup *syncboxes = new HorizontalConfigurationGroup(false, false, true, true); -// syncboxes->addChild(HostsyncXine); -// syncboxes->addChild(HostsyncMplayer); -// syncboxes->addChild(HostsyncMythMusic); -// syncboxes->addChild(HostsyncMythFrontend); - HorizontalConfigurationGroup *lp = new HorizontalConfigurationGroup(false, false, true, true); HorizontalConfigurationGroup *lpalsa = new HorizontalConfigurationGroup(false, false, true, true); @@ -2810,13 +2765,13 @@ SoundSettings::SoundSettings(): TransButtonSetting *TestAudiobutton = new TransButtonSetting(); TestAudiobutton->setLabel(tr("Test Device")); - TestAudiobutton->setHelpText(QObject::tr("Will play a sound using the selected default device.")); + TestAudiobutton->setHelpText(QObject::tr("Play a sound using the selected default device.")); lp->addChild(TestAudiobutton); lp->addChild(LoadOSSbutton); TransButtonSetting *TestALSAAudiobutton = new TransButtonSetting(); TestALSAAudiobutton->setLabel(tr("Test Device")); - TestALSAAudiobutton->setHelpText(QObject::tr("Will play a sound using the selected default device.")); + TestALSAAudiobutton->setHelpText(QObject::tr("Play a sound using the selected default device.")); lpalsa->addChild(TestALSAAudiobutton); lpalsa->addChild(LoadALSAbutton); @@ -2831,7 +2786,6 @@ SoundSettings::SoundSettings(): ConfigurationGroup* osssettings = new VerticalConfigurationGroup(false); osssettings->addChild(osslabel); osssettings->addChild(OSS); - // osssettings->addChild(syncboxes); osssettings->addChild(lp); connect(this, SIGNAL(oss_sig()), OSS, SLOT(soundossgathersettings())); @@ -2845,7 +2799,6 @@ SoundSettings::SoundSettings(): ConfigurationGroup* alsasettings = new VerticalConfigurationGroup(false); alsasettings->addChild(AlsaLabel); alsasettings->addChild(ALSA); -// alsasettings->addChild(syncboxes); alsasettings->addChild(lpalsa); connect(this, SIGNAL(alsa_sig()), @@ -2863,54 +2816,26 @@ SoundOSSsettings::SoundOSSsettings(): TriggeredConfigurationGroup(true,false,true,true,true,true,true,true) { SetVertical(true); - HostSoundTypeout = new HostComboBox("HostSoundTypeout"); - HostSoundTypeout->setLabel(QObject::tr("Audio Type")); - HostSoundTypeout->addSelection("Analog"); - HostSoundTypeout->addSelection("Digital"); - HostSoundTypeout->setHelpText(QObject::tr("Select the connection type, Analog or Digital.")); - - HostSoundOssAnalog = new HostComboBox("HostSoundOssAnalog"); - HostSoundOssAnalog->setLabel(QObject::tr("Default Device")); - HostSoundOssAnalog->setHelpText(QObject::tr("Select the default audio output device for the system.")); - HostSoundOssDigital = new HostComboBox("HostSoundOssDigital"); - HostSoundOssDigital->setLabel(QObject::tr("Default Device")); - HostSoundOssDigital->setHelpText(QObject::tr("Select the default audio output device for the system.")); + HostSoundOssAll = new HostComboBox("HostSoundOssAll"); + HostSoundOssAll->setLabel(QObject::tr("Default Device")); + HostSoundOssAll->setHelpText(QObject::tr("Select the default audio output device for the system.")); fillossselection(); - int findossanalog=HostSoundOssAnalog->findSelection(hostparm.OLDHostSoundOSSAnalog ); - int findossdigital=HostSoundOssDigital->findSelection(hostparm.OLDHostSoundOSSDigital ); - HostSoundOssAnalog->setValue(findossanalog); - HostSoundOssDigital->setValue(findossdigital); - addChild(HostSoundTypeout); - setTrigger(HostSoundTypeout); - addTarget("Analog", HostSoundOssAnalog); - addTarget("Digital", HostSoundOssDigital); + int findossall=HostSoundOssAll->findSelection(hostparm.OLDHostSoundOSSAll ); + HostSoundOssAll->setValue(findossall); + addTarget("All", HostSoundOssAll); }; SoundALSAsettings::SoundALSAsettings(): TriggeredConfigurationGroup(true,false,true,true,true,true,true,true) { SetVertical(true); - HostSoundALSATypeout = new HostComboBox("HostSoundALSATypeout"); - HostSoundALSATypeout->setLabel(QObject::tr("Audio Type")); - HostSoundALSATypeout->addSelection("Analog"); - HostSoundALSATypeout->addSelection("Digital"); - HostSoundALSATypeout->setHelpText(QObject::tr("Select the connection type, Analog or Digital.")); - - HostSoundALSAAnalog = new HostComboBox("HostSoundALSAAnalog"); - HostSoundALSAAnalog->setLabel(QObject::tr("Default Device")); - HostSoundALSAAnalog->setHelpText(QObject::tr("Select the default audio output device for the system. Chrome, aplay and other programs that use the default system device for audio will use this device. Mplayer will be set to use this device.")); - HostSoundALSADigital = new HostComboBox("HostSoundALSADigital"); - HostSoundALSADigital->setLabel(QObject::tr("Default Device")); - HostSoundALSADigital->setHelpText(QObject::tr("Select the default audio output device for the system. Chrome, aplay and other programs that use the default system device for audio will use this device. Mplayer will be set to use this device.")); + HostSoundALSAAll = new HostComboBox("HostSoundALSAAll"); + HostSoundALSAAll->setLabel(QObject::tr("Default Device")); + HostSoundALSAAll->setHelpText(QObject::tr("Select the default audio output device for the system. Chrome, aplay and other programs that use the default system device for audio will use this device. Mplayer will be set to use this device.")); fillALSAselection(); - int findalsaanalog=HostSoundALSAAnalog->findSelection(hostparm.OLDHostSoundALSAAnalog ); - int findalsadigital=HostSoundALSADigital->findSelection(hostparm.OLDHostSoundALSADigital ); - HostSoundALSAAnalog->setValue(findalsaanalog); - HostSoundALSADigital->setValue(findalsadigital); - addChild(HostSoundALSATypeout); - setTrigger(HostSoundALSATypeout); - addTarget("Analog", HostSoundALSAAnalog); - addTarget("Digital", HostSoundALSADigital); + int findalsaall=HostSoundALSAAll->findSelection(hostparm.OLDHostSoundALSAAll ); + HostSoundALSAAll->setValue(findalsaall); + addTarget("All", HostSoundALSAAll); }; void SoundOSSsettings::loadossdriver() @@ -2929,6 +2854,7 @@ void SoundOSSsettings::loadossdriver() MythUIBusyDialog *busyPopup = new MythUIBusyDialog(msgtext, popupStack, "ossbusy"); + int progressbar=1; MythProgressDialog *popupProgress = NULL; popupProgress = new MythProgressDialog(msgtext, 50); @@ -2966,7 +2892,6 @@ void SoundOSSsettings::loadossdriver() busyPopup = NULL; } - if (popupProgress) { popupProgress->Close(); @@ -2974,7 +2899,6 @@ void SoundOSSsettings::loadossdriver() } fillossselection(); - } void SoundALSAsettings::loadalsadriver() { @@ -2984,7 +2908,9 @@ void SoundALSAsettings::loadalsadriver() cmdtxt.append("bin/soundconfig.sh -t LOAD -i ALSA &"); system(cmdtxt); int return_code = 0; + QString msgtext = "Loading ALSA driver" ; + MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack"); MythUIBusyDialog *busyPopup = new MythUIBusyDialog(msgtext, popupStack,"installbusy"); if (busyPopup->Create()) @@ -3031,11 +2957,7 @@ void SoundALSAsettings::loadalsadriver() popupProgress->deleteLater(); } - HostSoundALSAAnalog-> clearSelections(); - HostSoundALSADigital-> clearSelections(); - fillALSAselection(); - } void SoundOSSsettings::fillossselection() { @@ -3049,9 +2971,7 @@ void SoundOSSsettings::fillossselection() QRegExp sep( "\t" ); QFile file(currentfile); QString ossfound="false"; - HostSoundOssAnalog->clearSelections(); - HostSoundOssDigital-> clearSelections(); - + HostSoundOssAll->clearSelections(); if ( file.open(QIODevice::ReadOnly | QIODevice::Text) ) { @@ -3070,18 +2990,14 @@ void SoundOSSsettings::fillossselection() simpleitem.append(" ("); simpleitem.append(legacy_device); simpleitem.append(")"); - if (line.contains("spdout") || line.contains("digital") ) - HostSoundOssDigital->addSelection(simpleitem); - else - HostSoundOssAnalog->addSelection(simpleitem); + HostSoundOssAll->addSelection(simpleitem); ossfound="true"; } } if (ossfound=="false") { - simpleitem="No cards found, try loading the OSS drivers"; - HostSoundOssAnalog->addSelection(simpleitem); - HostSoundOssDigital->addSelection(simpleitem); + simpleitem="No devices found, try loading the OSS driver"; + HostSoundOssAll->addSelection(simpleitem); } } return ; @@ -3090,9 +3006,8 @@ void SoundOSSsettings::fillossselection() void SoundALSAsettings::fillALSAselection() { - HostSoundALSAAnalog-> clearSelections(); - HostSoundALSADigital-> clearSelections(); - myth_system("aplay -l > /tmp/alsadevices"); + HostSoundALSAAll-> clearSelections(); + myth_system("aplay -l > /tmp/alsadevices 2>&1"); QString currentfile = "/tmp/alsadevices"; QString line; QString hwdevice; @@ -3101,21 +3016,21 @@ void SoundALSAsettings::fillALSAselection() QString temphwdevice; QString simpleitem; QFile file(currentfile); + if ( file.open(QIODevice::ReadOnly | QIODevice::Text) ) { Q3TextStream t( &file ); // use a text stream while ( !t.eof() ) { line = t.readLine(); + if (line.contains("no soundcards found...")) + { + simpleitem="No devices found, try loading the ALSA driver"; + HostSoundALSAAll->addSelection(simpleitem); + break; + } if (line.startsWith("card") ) { - if (line.contains("snd_ctl_card_info")) - { - simpleitem="Try loading the alsa drivers"; - HostSoundALSAAnalog->addSelection(simpleitem); - HostSoundALSADigital->addSelection(simpleitem); - break; - } //card 0: I82801DBICH4:q [Intel 82801DB-ICH4], device 0: Intel ICH [Intel 82801DB-ICH4] alsadescription=line.section( ", " , 0 ,0 ); alsadescription=alsadescription.section(": ",1,1); @@ -3133,10 +3048,7 @@ void SoundALSAsettings::fillALSAselection() hwdevice.append(","); hwdevice.append(temphwdevice); simpleitem=alsadescription + " " + alsadescription2 + "(plughw:" + alsadescription + "," + temphwdevice + ")"; - if (line.contains("IEC958") || line.contains("Digital") || line.contains("PCM") || line.contains("HDMI")) - HostSoundALSADigital->addSelection(simpleitem); - else - HostSoundALSAAnalog->addSelection(simpleitem); + HostSoundALSAAll->addSelection(simpleitem); } } } @@ -3153,7 +3065,7 @@ void SoundALSAsettings::fillALSAselection() { alsadescription=line; simpleitem=alsadescription + "(plug:iec958)"; - HostSoundALSADigital->addSelection(simpleitem); + HostSoundALSAAll->addSelection(simpleitem); break; } } @@ -3164,20 +3076,12 @@ void SoundALSAsettings::fillALSAselection() void SoundSettings::soundossgathersettings_1 (void) { hostparm.ThisHostAudiotype = HostAudiotype->getValue(); -// hostparm.ThisHostsyncXine = HostsyncXine->getValue(); -// hostparm.ThisHostsyncMplayer = HostsyncMplayer->getValue(); -// hostparm.ThisHostsyncMythMusic = HostsyncMythMusic->getValue(); -// hostparm.ThisHostsyncMythFrontend = HostsyncMythFrontend->getValue(); // emit the signal to call soundossgathersetting. emit oss_sig(); }; void SoundSettings::soundalsagathersettings_1 (void) { hostparm.ThisHostAudiotype = HostAudiotype->getValue(); -// hostparm.ThisHostsyncXine = HostsyncXine->getValue(); -// hostparm.ThisHostsyncMplayer = HostsyncMplayer->getValue(); -// hostparm.ThisHostsyncMythMusic = HostsyncMythMusic->getValue(); -// hostparm.ThisHostsyncMythFrontend = HostsyncMythFrontend->getValue(); // emit the signal to call soundALSAgathersetting. emit alsa_sig(); }; @@ -3185,18 +3089,9 @@ void SoundSettings::soundalsagathersettings_1 (void) void SoundOSSsettings::soundossgathersettings(void) { - hostparm.ThisHostSoundTypeout = HostSoundTypeout->getValue() ; - hostparm.ThisHostSoundOSSAnalog = HostSoundOssAnalog->getValue(); - hostparm.ThisHostSoundOSSDigital = HostSoundOssDigital->getValue(); + hostparm.ThisHostSoundOSSAll = HostSoundOssAll->getValue(); QString tempdevice; - if ( hostparm.ThisHostSoundTypeout == "Analog" ) - { - tempdevice = hostparm.ThisHostSoundOSSAnalog ; - } - else - { - tempdevice = hostparm.ThisHostSoundOSSDigital ; - }; + tempdevice = hostparm.ThisHostSoundOSSAll ; tempdevice = tempdevice.section( "(", 1,1 ); tempdevice = tempdevice.section( ")", 0,0 ); hostparm.ThisHostSoundDevice = "/dev/"; @@ -3204,7 +3099,7 @@ void SoundOSSsettings::soundossgathersettings(void) // Add info popup right here QString cmdtxt; cmdtxt=MV_ROOT ; - cmdtxt.append("bin/soundconfig.sh -t test -i OSS -d " + hostparm.ThisHostSoundDevice + "&"); + cmdtxt.append("bin/soundconfig.sh -t test -i OSS -d " + hostparm.ThisHostSoundDevice + "&"); system(cmdtxt); int return_code = 0; QString msgtext = "Playing Test Audio" ; @@ -3220,10 +3115,6 @@ void SoundOSSsettings::soundossgathersettings(void) popupProgress->setProgress(progressbar); } - - - - if (busyPopup->Create()) { popupStack->AddScreen(busyPopup, false); @@ -3234,9 +3125,6 @@ void SoundOSSsettings::soundossgathersettings(void) busyPopup = NULL; } - - - while ( return_code == 0 ) { progressbar++; @@ -3266,19 +3154,10 @@ void SoundOSSsettings::soundossgathersettings(void) void SoundALSAsettings::soundalsagathersettings(void) { - hostparm.ThisHostSoundALSATypeout = HostSoundALSATypeout->getValue() ; - hostparm.ThisHostSoundALSAAnalog = HostSoundALSAAnalog->getValue(); - hostparm.ThisHostSoundALSADigital = HostSoundALSADigital->getValue(); + hostparm.ThisHostSoundALSAAll = HostSoundALSAAll->getValue(); QString tempdevice; - if ( hostparm.ThisHostSoundALSATypeout == "Analog" ) - { - tempdevice = hostparm.ThisHostSoundALSAAnalog ; - } - else - { - tempdevice = hostparm.ThisHostSoundALSADigital ; - }; + tempdevice = hostparm.ThisHostSoundALSAAll ; tempdevice = tempdevice.section( "(", 1,1 ); tempdevice = tempdevice.section( ")", 0,0 ); hostparm.ThisHostSoundDevice = tempdevice; @@ -3310,7 +3189,6 @@ void SoundALSAsettings::soundalsagathersettings(void) } - while ( return_code == 0 ) { progressbar++; @@ -3336,9 +3214,6 @@ void SoundALSAsettings::soundalsagathersettings(void) popupProgress->deleteLater(); } - - - }; @@ -3928,27 +3803,15 @@ void writesettings () // AUDIO SETTINGS //****************************************************************************************** hostparm.ThisHostAudiotype = gCoreContext->GetSetting("HostAudiotype"); -// hostparm.ThisHostsyncXine = gCoreContext->GetSetting("HostsyncXine"); -// hostparm.ThisHostsyncMplayer = gCoreContext->GetSetting("HostsyncMplayer"); -// hostparm.ThisHostsyncMythMusic = gCoreContext->GetSetting("HostsyncMythMusic"); -// hostparm.ThisHostsyncMythFrontend = gCoreContext->GetSetting("HostsyncMythFrontend"); - hostparm.ThisHostSoundTypeout = gCoreContext->GetSetting("HostSoundTypeout") ; - hostparm.ThisHostSoundOSSAnalog = gCoreContext->GetSetting("HostSoundOssAnalog"); - hostparm.ThisHostSoundOSSDigital = gCoreContext->GetSetting("HostSoundOssDigital"); - hostparm.ThisHostSoundALSATypeout = gCoreContext->GetSetting("HostSoundALSATypeout") ; - hostparm.ThisHostSoundALSAAnalog = gCoreContext->GetSetting("HostSoundALSAAnalog"); - hostparm.ThisHostSoundALSADigital = gCoreContext->GetSetting("HostSoundALSADigital"); + hostparm.ThisHostSoundOSSAll = gCoreContext->GetSetting("HostSoundOssAll"); + hostparm.ThisHostSoundALSAAll = gCoreContext->GetSetting("HostSoundALSAAll"); if ( hostparm.ThisHostAudiotype == "OSS" ) { QString tempdevice; QChar tempchar ; hostparm.ThisHostSoundDevice = "/dev/dsp"; - if ( hostparm.ThisHostSoundTypeout == "Analog" ) - tempdevice = hostparm.ThisHostSoundOSSAnalog ; - - if ( hostparm.ThisHostSoundTypeout == "Digital" ) - tempdevice = hostparm.ThisHostSoundOSSDigital ; + tempdevice = hostparm.ThisHostSoundOSSAll ; int tlength=(tempdevice.length() -2 ); if ( tlength > 0 ) @@ -3962,19 +3825,12 @@ void writesettings () if ( hostparm.ThisHostAudiotype == "ALSA" ) { QString tempdevice; - hostparm.ThisHostSoundTypeout = hostparm.ThisHostSoundALSATypeout; - if ( hostparm.ThisHostSoundTypeout == "Digital" ) - tempdevice=hostparm.ThisHostSoundALSADigital; - if ( hostparm.ThisHostSoundTypeout == "Analog" ) - tempdevice=hostparm.ThisHostSoundALSAAnalog; + tempdevice=hostparm.ThisHostSoundALSAAll; tempdevice = tempdevice.section( "(", 1,1 ); tempdevice = tempdevice.section( ")", 0,0 ); hostparm.ThisHostSoundDevice = tempdevice; } -// Turn off internal audio controls is digital audio is seleced - if ( hostparm.ThisHostSoundTypeout == "Digital" ) - gCoreContext->SaveSetting("MythControlsVolume","0"); // LCD TYPE hostparm.ThisHostLCDType = gCoreContext->GetSetting("HostLCDType"); @@ -4004,11 +3860,9 @@ void writesettings () hostparm.ThisHostpluginmythvideo_dvdcss = gCoreContext->GetSetting("Hostpluginmythvideo_dvdcss"); hostparm.ThisHostpluginmythappletrailers= gCoreContext->GetSetting("Hostpluginmythappletrailers"); -// hostparm.ThisHostMiro= gCoreContext->GetSetting("HostMiro"); hostparm.ThisHostpluginmythgameMednafen= gCoreContext->GetSetting("HostpluginmythgameMednafen"); hostparm.ThisHostpluginmythgameROMDB= gCoreContext->GetSetting("HostpluginmythgameROMDB"); hostparm.ThisHostpluginmythgameMupen64= gCoreContext->GetSetting("HostpluginmythgameMupen64"); -// hostparm.ThisHostXine = gCoreContext->GetSetting("HostXine"); hostparm.ThisHostwebmin = gCoreContext->GetSetting("Hostwebmin"); hostparm.ThisHostHuluDesktop = gCoreContext->GetSetting("HostHuluDesktop"); hostparm.ThisHostwebonlinhes = gCoreContext->GetSetting("HostWebonlinhes"); @@ -4309,12 +4163,7 @@ void writesettings () myfile << systemheader ; myfile << divider ; myfile << "Audiotype=\"" + hostparm.ThisHostAudiotype + "\"\n"; - myfile << "Audiotypeout=\"" + hostparm.ThisHostSoundTypeout + "\"\n"; myfile << "SoundDevice=\"" + hostparm.ThisHostSoundDevice+ "\"\n"; -// myfile << "syncXine=\"" + hostparm.ThisHostsyncXine + "\"\n"; -// myfile << "syncMplayer=\"" + hostparm.ThisHostsyncMplayer + "\"\n"; -// myfile << "syncMythMusic=\"" + hostparm.ThisHostsyncMythMusic + "\"\n"; -// myfile << "syncMythFrontend=\"" + hostparm.ThisHostsyncMythFrontend + "\"\n"; systemheader= "\n# Software settings\n" ; @@ -4344,7 +4193,6 @@ void writesettings () myfile << "dvdcss=\"" + hostparm.ThisHostpluginmythvideo_dvdcss + "\"\n"; myfile << "mythappletrailers=\"" + hostparm.ThisHostpluginmythappletrailers + "\"\n"; -// myfile << "miro=\"" + hostparm.ThisHostMiro + "\"\n"; myfile << "webonlinhes=\"" + hostparm.ThisHostwebonlinhes + "\"\n"; myfile << "huludesktop=\"" + hostparm.ThisHostHuluDesktop + "\"\n"; myfile << "kodi=\"" + hostparm.ThisHostXBMC + "\"\n"; @@ -4353,7 +4201,6 @@ void writesettings () myfile << "foldingathome=\"" + hostparm.ThisHostfoldingathome + "\"\n"; myfile << "foldingusername=\"" + hostparm.ThisHostfoldingusername + "\"\n"; myfile << "foldingworksize=\"" + hostparm.ThisHostfoldingworksize + "\"\n"; - // myfile << "xine=\"" + hostparm.ThisHostXine + "\"\n"; myfile << "webmin=\"" + hostparm.ThisHostwebmin + "\"\n"; @@ -4668,23 +4515,33 @@ MythInstallSettings::MythInstallSettings() { //remove old sound card setting from the db. This is useful for when the saved setting is no longer valid for this machine. // Later search the list and set the value to the old setting if found in the dropdown. - hostparm.OLDHostSoundOSSAnalog = gCoreContext->GetSetting("HostSoundOssAnalog"); - hostparm.OLDHostSoundOSSDigital = gCoreContext->GetSetting("HostSoundOssDigital"); - hostparm.OLDHostSoundALSAAnalog = gCoreContext->GetSetting("HostSoundALSAAnalog"); - hostparm.OLDHostSoundALSADigital= gCoreContext->GetSetting("HostSoundALSADigital"); + hostparm.OLDHostSoundOSSAll = gCoreContext->GetSetting("HostSoundOssAll"); + hostparm.OLDHostSoundALSAAll = gCoreContext->GetSetting("HostSoundALSAAll"); MSqlQuery query(MSqlQuery::InitCon()); + query.prepare( "delete from settings where hostname=:HOSTNAME and value = 'HOSTSoundOssAll'; " ); + query.bindValue( ":HOSTNAME" , gCoreContext->GetHostName() ); + query.exec(); query.prepare( "delete from settings where hostname=:HOSTNAME and value = 'HOSTSoundOssAnalog'; " ); query.bindValue( ":HOSTNAME" , gCoreContext->GetHostName() ); query.exec(); + query.prepare( "delete from settings where hostname=:HOSTNAME and value = 'HOSTSoundOssDigital'; " ); + query.bindValue( ":HOSTNAME" , gCoreContext->GetHostName() ); + query.exec(); + query.prepare( "delete from settings where hostname=:HOSTNAME and value = 'HOSTSoundALSAAll'; " ); + query.bindValue( ":HOSTNAME" , gCoreContext->GetHostName() ); + query.exec(); query.prepare( "delete from settings where hostname=:HOSTNAME and value = 'HOSTSoundALSAAnalog'; " ); query.bindValue( ":HOSTNAME" , gCoreContext->GetHostName() ); query.exec(); query.prepare( "delete from settings where hostname=:HOSTNAME and value = 'HOSTSoundALSADigital'; " ); query.bindValue( ":HOSTNAME" , gCoreContext->GetHostName() ); query.exec(); - query.prepare( "delete from settings where hostname=:HOSTNAME and value = 'HOSTSoundOssDigital'; " ); + query.prepare( "delete from settings where hostname=:HOSTNAME and value = 'HOSTSoundALSATypeout'; " ); + query.bindValue( ":HOSTNAME" , gCoreContext->GetHostName() ); + query.exec(); + query.prepare( "delete from settings where hostname=:HOSTNAME and value = 'HOSTSoundTypeout'; " ); query.bindValue( ":HOSTNAME" , gCoreContext->GetHostName() ); query.exec(); @@ -4770,8 +4627,6 @@ MythInstallSettings::MythInstallSettings() ConfigurationGroup *GridShowPlugin4 = new GridConfigurationGroup(2,false); GridShowPlugin4->setLabel(QObject::tr("Programs (3/4)")); GridShowPlugin4->addChild(Hostpluginmythappletrailers()); - //GridShowPlugin4->addChild(HostMiro()); - //GridShowPlugin4->addChild(HostXine()); GridShowPlugin4->addChild(HostHuluDesktop()); GridShowPlugin4->addChild(HostPLEXHT()); GridShowPlugin4->addChild(HostPLEXMS()); @@ -4779,7 +4634,7 @@ MythInstallSettings::MythInstallSettings() GridShowPlugin4->addChild(Hostwebonlinhes()); GridShowPlugin4->addChild(HostXBMC()); - ConfigurationGroup *GridShowPlugin5 = new GridConfigurationGroup(2); + //ConfigurationGroup *GridShowPlugin5 = new GridConfigurationGroup(2); ConfigurationGroup *GridShowPlugin6 = new VerticalConfigurationGroup(false,true); GridShowPlugin6->setLabel(QObject::tr("Programs (4/4)")); @@ -4872,5 +4727,3 @@ MythInstallSettings::MythInstallSettings() } }; - - diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h index 62b2500..3a53048 100755 --- a/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h +++ b/abs/core/mythinstall/MythVantage-app/mythinstall/installsettings.h @@ -190,10 +190,6 @@ class SoundSettings: public TriggeredConfigurationGroup { public: SoundSettings(); HostComboBox *HostAudiotype; - HostCheckBox *HostsyncXine; - HostCheckBox *HostsyncMplayer; - HostCheckBox *HostsyncMythMusic; - HostCheckBox *HostsyncMythFrontend; signals: @@ -210,9 +206,7 @@ class SoundOSSsettings: public TriggeredConfigurationGroup { Q_OBJECT public: SoundOSSsettings(); - HostComboBox *HostSoundOssAnalog; - HostComboBox *HostSoundOssDigital; - HostComboBox *HostSoundTypeout; + HostComboBox *HostSoundOssAll; void fillossselection(); public slots: void soundossgathersettings(); @@ -223,9 +217,7 @@ class SoundALSAsettings: public TriggeredConfigurationGroup { Q_OBJECT public: SoundALSAsettings(); - HostComboBox *HostSoundALSAAnalog; - HostComboBox *HostSoundALSADigital; - HostComboBox *HostSoundALSATypeout; + HostComboBox *HostSoundALSAAll; void fillALSAselection(); public slots: void soundalsagathersettings(); @@ -483,28 +475,14 @@ struct HostParms QString ThisHostXNvidia1080i; QString ThisHostXNvidia720p; QString ThisHostXNvidia480p; - QString ThisHostAudiotype; - - QString ThisHostSoundTypeout; - QString ThisHostSoundOSSAnalog; - QString OLDHostSoundOSSAnalog; - QString ThisHostSoundOSSDigital; - QString OLDHostSoundOSSDigital; - QString ThisHostSoundDigital; + QString ThisHostAudiotype; + QString ThisHostSoundOSSAll; + QString OLDHostSoundOSSAll; QString ThisHostSoundDevice; + QString ThisHostSoundALSAAll; + QString OLDHostSoundALSAAll; - QString ThisHostSoundALSAAnalog; - QString OLDHostSoundALSAAnalog; - QString ThisHostSoundALSADigital; - QString OLDHostSoundALSADigital; - QString ThisHostSoundALSATypeout; - - - QString ThisHostsyncXine; - QString ThisHostsyncMplayer; - QString ThisHostsyncMythMusic; - QString ThisHostsyncMythFrontend; QString ThisHostLCDType; QString ThisHostRemoteBackup; QString ThisHostRemoteBackupDir; @@ -521,7 +499,6 @@ struct HostParms QString ThisHostpluginmythvideo_dvdcss; QString ThisHostpluginmythappletrailers; -// QString ThisHostMiro; QString ThisHostwebonlinhes; QString ThisHostXBMC; QString ThisHostPLEXHT; @@ -537,7 +514,6 @@ struct HostParms QString ThisHostpluginmythgameDolphin; QString ThisHostpluginmythgameXe; -// QString ThisHostXine; QString ThisHostwebmin; QString ThisHostfoldingathome; QString ThisHostfoldingusername; diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD index 54e6266..e053c0d 100644 --- a/abs/core/mythinstall/PKGBUILD +++ b/abs/core/mythinstall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jams pkgname=mythinstall pkgver=8.3 -pkgrel=10 +pkgrel=11 pkgdesc="LinHES installer/systemconfig GUI." arch=('i686' 'x86_64') depends=('mythtv>=0.27') -- cgit v0.12 From 337998c9b743c72a437951f0e3e78c40a007c195 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 3 Sep 2015 21:51:01 +0000 Subject: mythtv: fix typo in HOST_SETTINGS.xml. closes #997 --- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 1eedd22..7918744 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.5 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index a629cb5..9bc2c20 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.5 -pkgrel=4 +pkgrel=5 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.27/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml index e454959..c9ec7fa 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml +++ b/abs/core/mythtv/stable-0.27/mythtv/menu-xml/HOST_SETTINGS.xml @@ -50,7 +50,7 @@ -- cgit v0.12 From 0b9399abdb44bb7fc85da014c69b1cc540830c8e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 4 Sep 2015 15:53:07 +0000 Subject: pam: update to 1.2.1 --- abs/core/pam/PKGBUILD | 37 ++++++++++++-------- abs/core/pam/pam-1.1.8-cve-2013-7041.patch | 52 +++++++++++++++++++++++++++ abs/core/pam/pam-1.1.8-cve-2014-2583.patch | 56 ++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+), 14 deletions(-) create mode 100644 abs/core/pam/pam-1.1.8-cve-2013-7041.patch create mode 100644 abs/core/pam/pam-1.1.8-cve-2014-2583.patch diff --git a/abs/core/pam/PKGBUILD b/abs/core/pam/PKGBUILD index 965f215..9290c1e 100644 --- a/abs/core/pam/PKGBUILD +++ b/abs/core/pam/PKGBUILD @@ -1,31 +1,40 @@ -# $Id: PKGBUILD 197836 2013-10-30 11:06:23Z allan $ +# $Id$ # Maintainer: Tobias Powalowski # Contributor: judd pkgname=pam -pkgver=1.1.8 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64') license=('GPL2') -url="http://www.kernel.org/pub/linux/libs/pam/" -depends=('glibc' 'db' 'cracklib' 'libtirpc' 'pambase') +url="http://linux-pam.org" +depends=('glibc' 'cracklib' 'libtirpc' 'pambase') makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl') backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/default/passwd etc/environment) -source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2 - #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2 - ftp://ftp.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2 +source=(http://linux-pam.org/library/Linux-PAM-$pkgver.tar.bz2 + https://sources.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2 pam_unix2-glibc216.patch) +md5sums=('9dc53067556d2dd567808fd509519dd6' + 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555' + 'dac109f68e04a4df37575fda6001ea17') + options=('!emptydirs') +prepare () { + cd $srcdir/Linux-PAM-$pkgver + + # fix pam_unix2 building + cd $srcdir/pam_unix2-2.9.1 + patch -Np1 -i "${srcdir}/pam_unix2-glibc216.patch" +} + build() { cd $srcdir/Linux-PAM-$pkgver - ./configure --libdir=/usr/lib --sbindir=/usr/bin + ./configure --libdir=/usr/lib --sbindir=/usr/bin --disable-db make cd $srcdir/pam_unix2-2.9.1 - patch -Np1 -i ../pam_unix2-glibc216.patch - # modify flags to build against the pam compiled here, not a system lib. ./configure \ CFLAGS="$CFLAGS -I$srcdir/Linux-PAM-$pkgver/libpam/include/" \ @@ -63,7 +72,7 @@ _EOT # set unix_chkpwd uid chmod +s $pkgdir/usr/bin/unix_chkpwd + # remove doc which is not used anymore + # FS #40749 + rm $pkgdir/usr/share/doc/Linux-PAM/sag-pam_userdb.html } -md5sums=('35b6091af95981b1b2cd60d813b5e4ee' - 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555' - 'dac109f68e04a4df37575fda6001ea17') diff --git a/abs/core/pam/pam-1.1.8-cve-2013-7041.patch b/abs/core/pam/pam-1.1.8-cve-2013-7041.patch new file mode 100644 index 0000000..96fa916 --- /dev/null +++ b/abs/core/pam/pam-1.1.8-cve-2013-7041.patch @@ -0,0 +1,52 @@ +From 57a1e2b274d0a6376d92ada9926e5c5741e7da20 Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" +Date: Fri, 24 Jan 2014 22:18:32 +0000 +Subject: [PATCH] pam_userdb: fix password hash comparison + +Starting with commit Linux-PAM-0-77-28-g0b3e583 that introduced hashed +passwords support in pam_userdb, hashes are compared case-insensitively. +This bug leads to accepting hashes for completely different passwords in +addition to those that should be accepted. + +Additionally, commit Linux-PAM-1_1_6-13-ge2a8187 that added support for +modern password hashes with different lengths and settings, did not +update the hash comparison accordingly, which leads to accepting +computed hashes longer than stored hashes when the latter is a prefix +of the former. + +* modules/pam_userdb/pam_userdb.c (user_lookup): Reject the computed +hash whose length differs from the stored hash length. +Compare computed and stored hashes case-sensitively. +Fixes CVE-2013-7041. + +Bug-Debian: http://bugs.debian.org/731368 +--- + modules/pam_userdb/pam_userdb.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/modules/pam_userdb/pam_userdb.c b/modules/pam_userdb/pam_userdb.c +index de8b5b1..ff040e6 100644 +--- a/modules/pam_userdb/pam_userdb.c ++++ b/modules/pam_userdb/pam_userdb.c +@@ -222,12 +222,15 @@ user_lookup (pam_handle_t *pamh, const char *database, const char *cryptmode, + } else { + cryptpw = crypt (pass, data.dptr); + +- if (cryptpw) { +- compare = strncasecmp (data.dptr, cryptpw, data.dsize); ++ if (cryptpw && strlen(cryptpw) == (size_t)data.dsize) { ++ compare = memcmp(data.dptr, cryptpw, data.dsize); + } else { + compare = -2; + if (ctrl & PAM_DEBUG_ARG) { +- pam_syslog(pamh, LOG_INFO, "crypt() returned NULL"); ++ if (cryptpw) ++ pam_syslog(pamh, LOG_INFO, "lengths of computed and stored hashes differ"); ++ else ++ pam_syslog(pamh, LOG_INFO, "crypt() returned NULL"); + } + }; + +-- +1.8.3.1 + diff --git a/abs/core/pam/pam-1.1.8-cve-2014-2583.patch b/abs/core/pam/pam-1.1.8-cve-2014-2583.patch new file mode 100644 index 0000000..f2aa2de --- /dev/null +++ b/abs/core/pam/pam-1.1.8-cve-2014-2583.patch @@ -0,0 +1,56 @@ +From 9dcead87e6d7f66d34e7a56d11a30daca367dffb Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" +Date: Wed, 26 Mar 2014 22:17:23 +0000 +Subject: [PATCH] pam_timestamp: fix potential directory traversal issue + (ticket #27) + +pam_timestamp uses values of PAM_RUSER and PAM_TTY as components of +the timestamp pathname it creates, so extra care should be taken to +avoid potential directory traversal issues. + +* modules/pam_timestamp/pam_timestamp.c (check_tty): Treat +"." and ".." tty values as invalid. +(get_ruser): Treat "." and ".." ruser values, as well as any ruser +value containing '/', as invalid. + +Fixes CVE-2014-2583. + +Reported-by: Sebastian Krahmer +--- + modules/pam_timestamp/pam_timestamp.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/modules/pam_timestamp/pam_timestamp.c b/modules/pam_timestamp/pam_timestamp.c +index 5193733..b3f08b1 100644 +--- a/modules/pam_timestamp/pam_timestamp.c ++++ b/modules/pam_timestamp/pam_timestamp.c +@@ -158,7 +158,7 @@ check_tty(const char *tty) + tty = strrchr(tty, '/') + 1; + } + /* Make sure the tty wasn't actually a directory (no basename). */ +- if (strlen(tty) == 0) { ++ if (!strlen(tty) || !strcmp(tty, ".") || !strcmp(tty, "..")) { + return NULL; + } + return tty; +@@ -243,6 +243,17 @@ get_ruser(pam_handle_t *pamh, char *ruserbuf, size_t ruserbuflen) + if (pwd != NULL) { + ruser = pwd->pw_name; + } ++ } else { ++ /* ++ * This ruser is used by format_timestamp_name as a component ++ * of constructed timestamp pathname, so ".", "..", and '/' ++ * are disallowed to avoid potential path traversal issues. ++ */ ++ if (!strcmp(ruser, ".") || ++ !strcmp(ruser, "..") || ++ strchr(ruser, '/')) { ++ ruser = NULL; ++ } + } + if (ruser == NULL || strlen(ruser) >= ruserbuflen) { + *ruserbuf = '\0'; +-- +1.8.3.1 + -- cgit v0.12 From f3b046e4863c1645d3d876ea1c13caa992c71bc7 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 4 Sep 2015 15:53:47 +0000 Subject: pambase: update to 20130928 --- abs/core/pambase/PKGBUILD | 18 ++++++------------ abs/core/pambase/system-auth | 3 +-- abs/core/pambase/system-login | 5 ++--- abs/core/pambase/system-services | 2 +- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/abs/core/pambase/PKGBUILD b/abs/core/pambase/PKGBUILD index 4b52457..b595e97 100644 --- a/abs/core/pambase/PKGBUILD +++ b/abs/core/pambase/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162994 2012-07-04 21:45:33Z dreisner $ +# $Id$ # Maintainer: Dave Reisner pkgname=pambase -pkgver=20120701 +pkgver=20130928 pkgrel=1 pkgdesc="Base PAM configuration for services" arch=('any') @@ -20,22 +20,16 @@ backup=('etc/pam.d/system-auth' 'etc/pam.d/system-remote-login' 'etc/pam.d/system-services' 'etc/pam.d/other') -md5sums=('5f169a4ffe7ed69f58e106cdd2d760df' +md5sums=('6116b8e199a3dfd26a085a67a718435d' '477237985820117a0e6e1b13a86eb599' - '17c691f2da319df8fe851bc47cc1d662' + '7464f86d346b22dd07b433c341a33aab' '477237985820117a0e6e1b13a86eb599' - '30fe7d41e054ee43fab7855bf88a07e5' + '6969307eef026979703a6eba33c2e3eb' '6e6c8719e5989d976a14610f340bd33a') package() { install -dm755 "$pkgdir/etc/pam.d" - install -m644 -t "$pkgdir/etc/pam.d" \ - system-auth \ - system-local-login \ - system-login \ - system-remote-login \ - system-services \ - other + install -m644 -t "$pkgdir/etc/pam.d" "${source[@]}" } # vim:set ts=2 sw=2 et: diff --git a/abs/core/pambase/system-auth b/abs/core/pambase/system-auth index b28a7e9..2645043 100644 --- a/abs/core/pambase/system-auth +++ b/abs/core/pambase/system-auth @@ -1,8 +1,8 @@ #%PAM-1.0 -auth required pam_env.so auth required pam_unix.so try_first_pass nullok auth optional pam_permit.so +auth required pam_env.so account required pam_unix.so account optional pam_permit.so @@ -12,6 +12,5 @@ password required pam_unix.so try_first_pass nullok sha512 shadow password optional pam_permit.so session required pam_limits.so -session required pam_env.so session required pam_unix.so session optional pam_permit.so diff --git a/abs/core/pambase/system-login b/abs/core/pambase/system-login index c3bfd7c..17cfa1e 100644 --- a/abs/core/pambase/system-login +++ b/abs/core/pambase/system-login @@ -12,9 +12,8 @@ account include system-auth password include system-auth session optional pam_loginuid.so -session required pam_env.so session include system-auth session optional pam_motd.so motd=/etc/motd -session optional pam_mail.so dir=/var/spool/mail standard --session optional pam_ck_connector.so nox11 +session optional pam_mail.so dir=/var/spool/mail standard quiet -session optional pam_systemd.so +session required pam_env.so diff --git a/abs/core/pambase/system-services b/abs/core/pambase/system-services index 311c0d6..6ed9bdc 100644 --- a/abs/core/pambase/system-services +++ b/abs/core/pambase/system-services @@ -6,6 +6,6 @@ account include system-auth session optional pam_loginuid.so session required pam_limits.so -session required pam_env.so session required pam_unix.so session optional pam_permit.so +session required pam_env.so -- cgit v0.12 From 40e4eb480fe0e4087d8a44561bde82a6f6f3dbb3 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 4 Sep 2015 16:30:06 +0000 Subject: google-chrome: update to 45.0.2454.85 --- abs/extra/google-chrome/PKGBUILD | 18 ++++++++++-------- abs/extra/google-chrome/__changelog | 2 -- abs/extra/google-chrome/google-chrome.install | 3 ++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD index fd622e4..6859903 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=44.0.2403.155 +pkgver=45.0.2454.85 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -20,15 +20,23 @@ provides=('google-chrome' 'pepper-flash') options=('!emptydirs' '!strip') install=$pkgname.install _channel=stable -source=('eula_text.html') +source=('google-chrome-stable' + 'eula_text.html') source_i686=("google-chrome-${_channel}_${pkgver}_i386.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_i386.deb") source_x86_64=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb") +md5sums=('9c9bd494c7cc5c98feff767be140a853' + 'b7e752f549b215ac77f284b6486794b6') +md5sums_i686=('2fc404c0fdd90c45acb5ed4d2cf38877') +md5sums_x86_64=('25d88e62552920168e5390040cc062f5') package() { msg2 "Extracting the data.tar.lzma..." bsdtar -xf data.tar.xz -C "$pkgdir/" msg2 "Moving stuff in place..." + # Launcher + install -m755 google-chrome-$_channel "$pkgdir"/usr/bin/ + # Icons for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do install -Dm644 "$pkgdir"/opt/google/chrome/product_logo_${i/x*}.png \ @@ -47,9 +55,6 @@ package() { msg2 "Fixing permissions of documentation folder..." chmod 755 "$pkgdir"/usr/share/doc/google-chrome-$_channel/ - msg2 "Adding support for CHROMIUM_USER_FLAGS..." - sed -i 's/ "$@"/ $CHROMIUM_USER_FLAGS "$@"/' "$pkgdir"/opt/google/chrome/google-chrome - msg2 "Removing unnecessities (e.g. Debian Cron job)..." rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome/cron/ rm "$pkgdir"/opt/google/chrome/product_logo_*.png @@ -57,6 +62,3 @@ package() { msg2 "Rename google-chrome-stable to google-chrome..." mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome } -md5sums=('b7e752f549b215ac77f284b6486794b6') -md5sums_i686=('f2f80fc6ab47fe11d9b55c5136726d30') -md5sums_x86_64=('177d027b1c4a0f7d574113f3d4e765c9') diff --git a/abs/extra/google-chrome/__changelog b/abs/extra/google-chrome/__changelog index 289a6f2..672914a 100644 --- a/abs/extra/google-chrome/__changelog +++ b/abs/extra/google-chrome/__changelog @@ -1,5 +1,3 @@ Pull from ARU: https://aur.archlinux.org/packages/google-chrome/ -- 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 - PKGBUILD: Rename google-chrome-stable to google-chrome" -- PKGBUILD: Add dep libcups diff --git a/abs/extra/google-chrome/google-chrome.install b/abs/extra/google-chrome/google-chrome.install index a33da15..541b400 100644 --- a/abs/extra/google-chrome/google-chrome.install +++ b/abs/extra/google-chrome/google-chrome.install @@ -15,7 +15,7 @@ yellow="${bold}$(tput setaf 3)" _update() { msg_blue "Updating desktop MIME database..." update-desktop-database -q - + msg_blue "Updating icon cache.." xdg-icon-resource forceupdate --theme hicolor &>/dev/null } @@ -25,6 +25,7 @@ post_install() { if [ ! -e /usr/bin/chromium ]; then ln -s /usr/bin/google-chrome /usr/bin/chromium fi + note "Custom flags should be put directly in: ~/.config/chrome-flags.conf" } post_upgrade() { -- cgit v0.12 From 9083b14f317c0e240fba14f85291ad11fd0fd530 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 7 Sep 2015 18:07:33 +0000 Subject: google-chrome: add in launcher file --- abs/extra/google-chrome/google-chrome-stable | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 abs/extra/google-chrome/google-chrome-stable diff --git a/abs/extra/google-chrome/google-chrome-stable b/abs/extra/google-chrome/google-chrome-stable new file mode 100644 index 0000000..b3b1e77 --- /dev/null +++ b/abs/extra/google-chrome/google-chrome-stable @@ -0,0 +1,9 @@ +#!/bin/bash + +# Allow users to override command-line options +if [[ -f ~/.config/chrome-flags.conf ]]; then + CHROME_USER_FLAGS="$(cat ~/.config/chrome-flags.conf)" +fi + +# Launch +exec /opt/google/chrome/google-chrome $CHROME_USER_FLAGS $@ \ No newline at end of file -- cgit v0.12 From 580a1c601311034ade7cd48e6df8ca17f926dc7e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 7 Sep 2015 18:07:50 +0000 Subject: mythtv & mythplugins: update to latest --- abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index 1f27831..dce590c 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -e2a11c915058c6876a25d8188f02bc1d99fdad02 +32fd3968acea905d71d9769996487eff280233ea diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 7918744..7d5f15f 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.5 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index 9bc2c20..5ea8707 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.5 -pkgrel=5 +pkgrel=6 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12 From ff296c28a08ebd2922eb71278372159b6b75dd1b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 9 Sep 2015 20:53:48 +0000 Subject: v4l-utils: update to 1.6.3 --- abs/core/v4l-utils/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/abs/core/v4l-utils/PKGBUILD b/abs/core/v4l-utils/PKGBUILD index caa9233..7ade2db 100644 --- a/abs/core/v4l-utils/PKGBUILD +++ b/abs/core/v4l-utils/PKGBUILD @@ -1,8 +1,8 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=v4l-utils -pkgver=1.6.0 -pkgrel=2 +pkgver=1.6.3 +pkgrel=1 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64') url="http://linuxtv.org/" @@ -14,10 +14,10 @@ license=('LGPL') makedepends=('qt4') optdepends=('qt4') depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo') -source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2 - http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc) -sha256sums=('6054d3120c67a1524993e699b3b02036c817bb000b742c332682163966dc7605' +source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2{,.asc}) +sha256sums=('164abf5c1befcd27e8e6ef824a82d4015bdfb5d99ae82daa00e77d895ff9864c' 'SKIP') +validpgpkeys=('05D0169C26E41593418129DF199A64FADFB500FF') # Gregor Jasny build() { cd "${srcdir}/${pkgname}-${pkgver}" -- cgit v0.12 From 83ccffcdbdebaf747577922ea38ac1cfb0e70fc8 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 9 Sep 2015 20:56:47 +0000 Subject: LinHES-config: autocard.py: change dvb-fe-tool cmd line for new version. cleanup help a bit --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/autocard.py | 37 +++++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index fb88b0a..64ee3b3 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.3 -pkgrel=20 +pkgrel=21 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' @@ -157,7 +157,7 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff' 'ab2aa42c2947148c2b1cac0ade6d1d55' 'd429b59d3cfb37b0624c6a4a71a7c2c0' 'f6a935c35123fdc7c259c01cbc794a64' - 'b3ce302473883ca118d4a58f1b1306e2' + 'ccf7b6a8d0ccf2360a57384b45437e58' 'd3490e93f313bbbcbc6c3693c56b9c17' 'e959df98947eb0d2ea64ff616b61aab5' '2506860a416e1988934225d80d501c2c' diff --git a/abs/core/LinHES-config/autocard.py b/abs/core/LinHES-config/autocard.py index 19563a4..cb0a746 100755 --- a/abs/core/LinHES-config/autocard.py +++ b/abs/core/LinHES-config/autocard.py @@ -399,11 +399,12 @@ class dvb_tuners(): #self.staticdevice is set in create_udev_rule def find_description(self): - command = '/usr/bin/dvb-fe-tool -g -a %s' %self.dvb_number + command = '/usr/bin/dvb-fe-tool -a %s' %self.dvb_number results=os.popen(command,'r') line = results.readline().strip() - d = line.split('''(''') - return d[0] + d = line.split('''Frontend (''') + dd = d[0].split('''Device ''') + return dd[1] def find_full_udev_attribs(self): cmd = 'udevadm info -a -p $(udevadm info -q path -n %s)' %self.device @@ -974,19 +975,23 @@ def find_in_use_card_list(): def usuage(): help=''' - Autocard.py is a program that will take the guess work out of setting up tuner/capture cards. - There are 4 options: - help : This help screen - print: Will find and printout any detected capture cards, including network based tuners like the hdhomerun_config - udev : This option creates a set of static device nodes for the local capture cards. - Rules are based on pci/usb path so moving the card into a different expansion slot will nullify the udev rule - HDPVR devices use the serial number as the primary key for the udev rule_list - - insertdb : This option will insert any detected cards into the MythTV database using the static device generated by udev. - This option will also generate udev rules. Tuners that are already defined will not be readded. - - write_proxy: This will write out the config used by the service ceton_proxy - all : The same as using print udev insertdb write_proxy + autocard.py takes the guess work out of setting up tuner/capture cards. + + Options: + help: This help screen. + print: Find and printout any detected capture cards, including + network based tuners like the HDHomeRun. + udev: Creates a set of static device nodes for local capture cards. + Rules are based on pci/usb path so moving the card into a + different expansion slot will nullify the udev rule. + HDPVR devices use the serial number as the primary key for + the udev rule list. + insertdb: Insert any detected cards into the MythTV database using the + static device generated by udev. + insertdb will also generate udev rules. Tuners that are + already defined will not be readded. + write_proxy: Write out the config used by the service ceton_proxy. + all: The same as using: print udev insertdb write_proxy EX: -- cgit v0.12 From 8d24bd8ad39f4a4cb0a84628016992414ab2c1ae Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 9 Sep 2015 21:06:40 +0000 Subject: LinHES-system: balance_storage.py: script to balance mythtv storage group directories --- abs/core/LinHES-system/PKGBUILD | 5 +- abs/core/LinHES-system/balance_storage.py | 137 ++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 2 deletions(-) create mode 100755 abs/core/LinHES-system/balance_storage.py diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 6b8670c..67f0c19 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.3 -pkgrel=13 +pkgrel=14 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -17,7 +17,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py 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 + add_storage.py balance_storage.py diskspace.sh cacheclean lh_backend_control.sh create_media_dirs.sh msg_client.py msg_daemon.py mythvidexport.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 @@ -98,6 +98,7 @@ md5sums=('76842f8cff548d2c1289e0992a8b84dd' '74e17d6f7453c52d56fecaed5c3f6ad5' '47e093e8cfe4b5b96602358e1f540832' '63bbc62240f46a9997eaae4a84b09b76' + '2aa1a285161c8bf3e2ab16ca9e511b00' '2c005d95312018bef80092136f80f254' 'c8db6a83ecc089ea37ab7fcb0f7a01cf' 'ca63946920ba33de1f15abda83e74e40' diff --git a/abs/core/LinHES-system/balance_storage.py b/abs/core/LinHES-system/balance_storage.py new file mode 100755 index 0000000..a6995ca --- /dev/null +++ b/abs/core/LinHES-system/balance_storage.py @@ -0,0 +1,137 @@ +#!/usr/bin/python2 + +import argparse, glob, operator, os, random, shutil, subprocess, sys, signal +shouldQuit = False + +def getFreeSpaceForDir(dir): + stats = os.statvfs(dir) + return (stats.f_bavail * stats.f_frsize) + +def getFreePercentForDir(dir): + stats = os.statvfs(dir) + total = (stats.f_blocks) + avail = (stats.f_bavail) + return (total - avail) / float(total) + +def getFileSize(fullPath): + return os.path.getsize(fullPath) + +def sizeof_fmt(num, suffix='B'): + for unit in ['','Ki','Mi','Gi','Ti','Pi','Ei','Zi']: + if abs(num) < 1024.0: + return "%3.1f %s%s" % (num, unit, suffix) + num /= 1024.0 + return "%.1f %s%s" % (num, 'Yi', suffix) + +def signal_handler(signal, frame): + print "\nWill quit when file has been moved.\nMoving File..." + global shouldQuit + shouldQuit = True + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + parser.add_argument('-c', '--checkonly', action='store_true', help="Check only, don't move any files.") + parser.add_argument('-p', '--percent', type=int, default=7, help="The percentage difference between the most full dir and least full dir that will stop balancing.") + cmdargs = parser.parse_args() + + SGDIRS = [] + SGgrp = "Default" + + signal.signal(signal.SIGINT, signal_handler) + + print "\nBalance MythTV Storage Group Directories\nPress Ctrl+C to quit" + + # Get Storage Groups from MythDB + try: + from MythTV import MythDB + mythDB = MythDB() + records = mythDB.getStorageGroup() + except: + print "Couldn't connect to MythTV database." + sys.exit(1) + + # Get Storage Group directories + for record in records: + if record.groupname == SGgrp: + dirname = record.dirname + SGDIRS.append(dirname) + + # If there are less than 2 directories defined bail as we can't move anything + if len(SGDIRS) < 2: + print "There are less than 2 directories defined. Exiting." + sys.exit(0) + + while not shouldQuit: + SGDIRSdata = [] + print "\n------------------------------------------------" + print "'" + SGgrp + "' Storage Group Directories - Percent Used:" + # Get percent free and size free + for directory in SGDIRS: + # Check if SG path exists + if not os.path.exists(directory): + print " " + directory + " - Not Mounted" + continue + freePcent = getFreePercentForDir(directory) + freeSize = getFreeSpaceForDir(directory) + # Check if SG has any mpg or nuv files and if so add to SGDIRSdata + if len(glob.glob1(directory,"*.mpg")) or len(glob.glob1(directory,"*.nuv")): + SGDIRSdata.append([directory, freePcent, freeSize]) + print " " + directory + " - " + str(freePcent * 100) + "%" + + # Sort data on percent free + SGDIRSdata = sorted(SGDIRSdata, reverse=True, key=operator.itemgetter(1)) + #print SGDIRSdata + mostFull = SGDIRSdata[0] + leastFull = SGDIRSdata[-1] + + print "------------------------------------------------" + print "Most Used Storage Group Directory: " + print " " + str(mostFull[0]) + " - " + str(mostFull[1] * 100) + "%" + print "Least Used Storage Group Directory: " + print " " + str(leastFull[0]) + " - " + str(leastFull[1] * 100) + "%" + + # Check if mostFull and leastFull are within the percent var of each other + if mostFull[1] - (float(cmdargs.percent) / 100) < leastFull[1]: + print "\nThe most used and least used storage group directories are\nwithin " + str(cmdargs.percent) + "% used of each other. No files will be moved." + sys.exit() + + # Get random file from most used dir + fileToMove = random.choice([f for f in os.listdir(mostFull[0]) if f.endswith(".mpg") or f.endswith(".nuv")]) + fileToMove = mostFull[0] + "/" + fileToMove + + # Check that the file isn't too big for least used dir + fileSize = getFileSize(fileToMove) + if (fileSize > getFreeSpaceForDir(leastFull[0])): + # Too big to move + print fileToMove + " is too big to move to " + leastFull[0] + sys.exit() + + print "------------------------------------------------" + print "Move File:" + print " " + fileToMove + print " Size: " + sizeof_fmt(os.path.getsize(fileToMove)) + print "To:" + print " " + leastFull[0] + print " Available: " + sizeof_fmt(getFreeSpaceForDir(leastFull[0])) + + # Move file + if cmdargs.checkonly: + print "------------------------------------------------" + print"Check Only option was used. No files were moved." + shouldQuit = True + else: + print "------------------------------------------------" + print "Checking System Status..." + if subprocess.call(["/usr/bin/python2", "/usr/LH/bin/idle.py", "-s"]): + print " System is busy. The file will not be moved." + sys.exit() + print "Moving File..." + shutil.move(fileToMove, leastFull[0]) + + # Remove png files + print "------------------------------------------------" + print "Removing png Files:" + pngFiles = glob.glob(fileToMove + "*.png") + for p in pngFiles: + os.remove(p) + print " " + p -- cgit v0.12 From eec06fa9a1509cb68d4dee91220785c9ba885918 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 16 Sep 2015 16:23:18 +0000 Subject: procps-ng: update to 3.3.11 --- abs/core/procps-ng/PKGBUILD | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/abs/core/procps-ng/PKGBUILD b/abs/core/procps-ng/PKGBUILD index f30e5dc..ba2e3bd 100644 --- a/abs/core/procps-ng/PKGBUILD +++ b/abs/core/procps-ng/PKGBUILD @@ -3,15 +3,16 @@ # Contributor: Eric Bélanger pkgname=procps-ng -pkgver=3.3.10 -pkgrel=1 +pkgver=3.3.11 +pkgrel=2 pkgdesc='Utilities for monitoring your system and its processes' -url='http://sourceforge.net/projects/procps-ng/' +url='https://gitlab.com/procps-ng/procps' license=('GPL' 'LGPL') arch=('i686' 'x86_64') -depends=('ncurses' 'systemd') +makedepends=('systemd') +depends=('ncurses' 'libsystemd') source=("http://downloads.sourceforge.net/project/${pkgname}/Production/${pkgname}-${pkgver}.tar.xz") -sha1sums=('484db198d6a18a42b4011d5ecb2cb784a81b0e4f') +sha1sums=('1bdca65547df9ed019bd83649b0f8b8eaa017e25') groups=('base') -- cgit v0.12 From 0bde051b0b1f70333f75a50f1214dca0d27b75da Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 16 Sep 2015 21:52:11 +0000 Subject: shellinabox: update to 2.19 --- abs/extra/shellinabox/PKGBUILD | 41 ++++++++++-------------------- abs/extra/shellinabox/__changelog | 3 +++ abs/extra/shellinabox/shellinaboxd.conf.d | 5 ---- abs/extra/shellinabox/shellinaboxd.rc.d | 38 --------------------------- abs/extra/shellinabox/shellinaboxd.service | 17 ------------- 5 files changed, 16 insertions(+), 88 deletions(-) delete mode 100644 abs/extra/shellinabox/shellinaboxd.conf.d delete mode 100644 abs/extra/shellinabox/shellinaboxd.rc.d delete mode 100644 abs/extra/shellinabox/shellinaboxd.service diff --git a/abs/extra/shellinabox/PKGBUILD b/abs/extra/shellinabox/PKGBUILD index af3b4be..fc9a679 100644 --- a/abs/extra/shellinabox/PKGBUILD +++ b/abs/extra/shellinabox/PKGBUILD @@ -1,53 +1,38 @@ -# Contributor: Brian Moore pkgname=shellinabox -pkgver=2.14 -pkgrel=6 -pkgdesc="A web-based ssh client." +pkgver=2.19 +pkgrel=1 +_pkghash=master +pkgdesc="Implementation of a web server that can export arbitrary command line tools to a web based terminal emulator" arch=('i686' 'x86_64') url="http://shellinabox.com/" license=('GPL2') -depends=('runit-scripts>=8.0-2') -optdepends=('openssh: SSL support') -makedepends=(openssh) +depends=('runit-scripts>=8.0-2' '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" - "shellinaboxd.include" "shellinaboxd.gen_light_conf.d") - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure -} +source=("https://github.com/shellinabox/shellinabox/archive/${_pkghash}.tar.gz" + "shellinaboxd.include" + "shellinaboxd.gen_light_conf.d") build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-${_pkghash}" #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 + autoreconf -i + export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/}" ./configure --prefix=/usr - make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-${_pkghash}" 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 - #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' +md5sums=('7b7d178a2ec5b63f2b31b2869aa7b755' 'dd46ab61bfafdb56ea705a876963550e' 'aadd1edf4110aca2d16d806791e90019') diff --git a/abs/extra/shellinabox/__changelog b/abs/extra/shellinabox/__changelog index d0d35bb..9022771 100644 --- a/abs/extra/shellinabox/__changelog +++ b/abs/extra/shellinabox/__changelog @@ -1,3 +1,6 @@ +9/16/2015 +PKGBUILD: AUR changed so this no longer is similar + #8/13/2013 initial inclusion from AUR v2.14-3 add dep of runit-scripts to PKGBUILD diff --git a/abs/extra/shellinabox/shellinaboxd.conf.d b/abs/extra/shellinabox/shellinaboxd.conf.d deleted file mode 100644 index 646bab7..0000000 --- a/abs/extra/shellinabox/shellinaboxd.conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# -# Parameters to be passed to shellinaboxd -# -SHELLINABOXD_ARGS="-t -b" - diff --git a/abs/extra/shellinabox/shellinaboxd.rc.d b/abs/extra/shellinabox/shellinaboxd.rc.d deleted file mode 100644 index 3399945..0000000 --- a/abs/extra/shellinabox/shellinaboxd.rc.d +++ /dev/null @@ -1,38 +0,0 @@ -#!/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 deleted file mode 100644 index d92065b..0000000 --- a/abs/extra/shellinabox/shellinaboxd.service +++ /dev/null @@ -1,17 +0,0 @@ -[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 cf309ccb9e436f2b5e8ba8bb9e36df9307c1aa39 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 17 Sep 2015 22:03:09 +0000 Subject: lighttpd: update to 1.4.37 --- abs/core/lighttpd/PKGBUILD | 35 ++++++++++++++++--------------- abs/core/lighttpd/lighttpd.install | 10 +++++---- abs/core/lighttpd/lighttpd.logrotate.d | 3 +++ abs/core/lighttpd/lighttpd.rc.d | 38 ---------------------------------- abs/core/lighttpd/lighttpd.tmpfiles | 2 ++ 5 files changed, 29 insertions(+), 59 deletions(-) delete mode 100644 abs/core/lighttpd/lighttpd.rc.d create mode 100644 abs/core/lighttpd/lighttpd.tmpfiles diff --git a/abs/core/lighttpd/PKGBUILD b/abs/core/lighttpd/PKGBUILD index 8ae5054..6d9c699 100644 --- a/abs/core/lighttpd/PKGBUILD +++ b/abs/core/lighttpd/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Pierre Schmitz pkgname=lighttpd -pkgver=1.4.35 -pkgrel=2 +pkgver=1.4.37 +pkgrel=1 pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') @@ -17,9 +17,10 @@ optdepends=('libxml2: mod_webdav' \ 'gdbm: mod_trigger_b4_dl') backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd' 'etc/lighttpd/auth-inc.conf' 'etc/lighttpd/conf.include' 'etc/lighttpd/html.include') options=('!libtool' 'emptydirs') -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' +source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.gz" + 'lighttpd.logrotate.d' 'lighttpd.conf' 'auth-inc.conf' 'ssl-inc.conf' + 'lighttpd.tmpfiles') +install='lighttpd.install' build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -49,21 +50,21 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install || return 1 - install -D -m755 ../lighttpd.rc.d ${pkgdir}/etc/rc.d/lighttpd - install -D -m644 ../lighttpd.logrotate.d ${pkgdir}/etc/logrotate.d/lighttpd - install -d -m755 -o http -g http ${pkgdir}/var/run/lighttpd/ - install -d -m755 -o http -g http ${pkgdir}/var/log/lighttpd/ + install -d -m700 -o http -g http ${pkgdir}/run/lighttpd/ + install -d -m700 -o http -g http ${pkgdir}/var/{log,cache}/lighttpd/ - install -D -m644 ../lighttpd.conf ${pkgdir}/etc/lighttpd/lighttpd.conf - install -D -m644 ../auth-inc.conf ${pkgdir}/etc/lighttpd/auth-inc.conf - install -D -m644 ../ssl-inc.conf ${pkgdir}/etc/lighttpd/ssl-inc.conf + install -D -m644 ${srcdir}/lighttpd.logrotate.d ${pkgdir}/etc/logrotate.d/lighttpd + install -D -m644 ${srcdir}/lighttpd.conf ${pkgdir}/etc/lighttpd/lighttpd.conf + install -D -m644 ${srcdir}/auth-inc.conf ${pkgdir}/etc/lighttpd/auth-inc.conf + install -D -m644 ${srcdir}/ssl-inc.conf ${pkgdir}/etc/lighttpd/ssl-inc.conf + install -D -m644 ${srcdir}/lighttpd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/lighttpd.conf # set sane defaults sed -e 's|/srv/www/htdocs/|/srv/http/|' \ -e 's|/srv/www/|/srv/http/|' \ -e 's|#server.username = "wwwrun"|server.username = "http"|' \ -e 's|#server.groupname = "wwwrun"|server.groupname = "http"|' \ - -e 's|#server.pid-file = "/var/run/lighttpd.pid"|server.pid-file = "/var/run/lighttpd/lighttpd.pid"|' \ + -e 's|#server.pid-file = "/run/lighttpd.pid"|server.pid-file = "/run/lighttpd/lighttpd.pid"|' \ -e 's|/usr/local/bin/php-cgi|/usr/bin/php-cgi|' \ -e 's|"^/mythweb|"^/{1,2}mythweb|' \ -e 's|# "mod_proxy",| "mod_proxy",|' \ @@ -77,9 +78,9 @@ package() { install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } -md5sums=('f7a88130ee9984b421ad8aa80629750a' - 'bd690eee0d9e51857448770a151023b0' - 'e17a29ebcdac82a853389c3df468c980' +md5sums=('f2b33c161df9be9b12b6a13b33a66ea5' + '42d106b101d21ffd76ed9f3f1621e164' '7945bd60801295010e9e2cac1dba78b7' '62779511e3f1127c3cc9b94c49f99c29' - 'ef64c496602b182a551416a8ba6b3d43') + 'ef64c496602b182a551416a8ba6b3d43' + '1aeda5526e2cf1ca99d6e1571a6d9cf5') diff --git a/abs/core/lighttpd/lighttpd.install b/abs/core/lighttpd/lighttpd.install index a921b0f..55915f9 100755 --- a/abs/core/lighttpd/lighttpd.install +++ b/abs/core/lighttpd/lighttpd.install @@ -1,7 +1,9 @@ -pre_upgrade() { - mv /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.old +post_install() { + if [[ ! -d run/lighttpd ]]; then + usr/bin/systemd-tmpfiles --create lighttpd.conf + fi } + post_upgrade() { - sed -i 's|"^/mythweb|"^/{1,2}mythweb|g' /etc/lighttpd/lighttpd.conf - touch /etc/lighttpd/lighttpd.user + post_install } diff --git a/abs/core/lighttpd/lighttpd.logrotate.d b/abs/core/lighttpd/lighttpd.logrotate.d index 71c5191..068f252 100644 --- a/abs/core/lighttpd/lighttpd.logrotate.d +++ b/abs/core/lighttpd/lighttpd.logrotate.d @@ -1,5 +1,8 @@ /var/log/lighttpd/*log { missingok + copytruncate + notifempty + sharedscripts postrotate /bin/kill -HUP `cat /var/run/lighttpd/lighttpd.pid 2>/dev/null` 2> /dev/null || true endscript diff --git a/abs/core/lighttpd/lighttpd.rc.d b/abs/core/lighttpd/lighttpd.rc.d deleted file mode 100644 index 97c315f..0000000 --- a/abs/core/lighttpd/lighttpd.rc.d +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/lighttpd` - -case "$1" in - start) - stat_busy "Starting lighttpd Daemon" - [ -z "$PID" ] && /usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon lighttpd - stat_done - fi - ;; - stop) - stat_busy "Stopping lighttpd Daemon" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon lighttpd - rm -f /var/run/lighttpd/lighttpd.pid - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/abs/core/lighttpd/lighttpd.tmpfiles b/abs/core/lighttpd/lighttpd.tmpfiles new file mode 100644 index 0000000..e39cd42 --- /dev/null +++ b/abs/core/lighttpd/lighttpd.tmpfiles @@ -0,0 +1,2 @@ +d /run/lighttpd 755 http http - +d /var/cache/lighttpd 755 http http 10d -- cgit v0.12 From ceb6d3594fbd672587a1f15618427be552654241 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 21 Sep 2015 13:37:07 +0000 Subject: kodi: fix hdhr uPnP issue. closes #998 --- abs/extra/kodi/PKGBUILD | 7 +++++-- abs/extra/kodi/__changelog | 1 + abs/extra/kodi/hdhr_uPnP.diff | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 abs/extra/kodi/hdhr_uPnP.diff diff --git a/abs/extra/kodi/PKGBUILD b/abs/extra/kodi/PKGBUILD index 961c07a..2898d21 100644 --- a/abs/extra/kodi/PKGBUILD +++ b/abs/extra/kodi/PKGBUILD @@ -15,7 +15,7 @@ pkgbase=kodi pkgname=('kodi' 'kodi-eventclients') pkgver=15.1 _codename=Isengard -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://kodi.tv" license=('GPL2') @@ -33,6 +33,7 @@ source=( "$pkgname-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz" 'kodi.sh' 'kodi_lib.conf' + 'hdhr_uPnP.diff' ) prepare() { @@ -42,6 +43,7 @@ prepare() { sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl sed 's/python/python2/' -i tools/Linux/kodi.sh.in sed 's/shell python/shell python2/' -i tools/EventClients/Makefile.in + patch -Np1 -i ${srcdir}/hdhr_uPnP.diff } build() { @@ -136,4 +138,5 @@ package_kodi-eventclients() { md5sums=('d8acb0ef061b3e2fef88146cea1f4443' 'f6adc8e06d7076143ca2ad118126b158' - 'f04d1c89f5108c6aba36cf708a74cc95') + 'f04d1c89f5108c6aba36cf708a74cc95' + 'c09cc882da2ad0c1f042fb86a5b47d20') diff --git a/abs/extra/kodi/__changelog b/abs/extra/kodi/__changelog index 8015995..53d67ec 100644 --- a/abs/extra/kodi/__changelog +++ b/abs/extra/kodi/__changelog @@ -2,3 +2,4 @@ PKGBUILD - remove libpulse dep and remove --enable-pulse config option PKGBUILD - Add /usr/LH/bin/kodi.sh PKGBUILD - Add /etc/gen_lib_xml.d/kodi_lib.conf kodi.install - add gen_lib_xml.py to post_install and post_remove +PKGBUILD - Add hdhr_uPnP.diff diff --git a/abs/extra/kodi/hdhr_uPnP.diff b/abs/extra/kodi/hdhr_uPnP.diff new file mode 100644 index 0000000..7ad89e1 --- /dev/null +++ b/abs/extra/kodi/hdhr_uPnP.diff @@ -0,0 +1,16 @@ +diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp +index c308649..25af47e 100644 +--- a/xbmc/filesystem/CurlFile.cpp ++++ b/xbmc/filesystem/CurlFile.cpp +@@ -1528,8 +1528,9 @@ bool CCurlFile::CReadState::FillBuffer(unsigned int want) + msg->data.result == CURLE_RECV_ERROR) && + !m_bFirstLoop) + CURLresult = msg->data.result; +- else if ( (msg->data.result == CURLE_HTTP_RANGE_ERROR || +- httpCode == 416 /* = Requested Range Not Satisfiable */) && ++ else if ( (msg->data.result == CURLE_HTTP_RANGE_ERROR || ++ httpCode == 416 /* = Requested Range Not Satisfiable */ || ++ httpCode == 406 /* = Not Acceptable (fixes issues with non compliant HDHomerun servers */) && + m_bFirstLoop && + m_filePos == 0 && + m_sendRange) -- cgit v0.12 From a539e75c078ac28e99b25b257a0700caaae60770 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 21 Sep 2015 13:38:23 +0000 Subject: ca-certificates: update to 20150402 --- abs/core/ca-certificates/PKGBUILD | 49 ++-- .../ca-certificates/ca-certificates-utils.install | 43 ++-- abs/core/ca-certificates/update-ca-trust | 27 +++ abs/core/ca-certificates/update-ca-trust.8.txt | 265 +++++++++++++++++++++ 4 files changed, 342 insertions(+), 42 deletions(-) create mode 100644 abs/core/ca-certificates/update-ca-trust create mode 100644 abs/core/ca-certificates/update-ca-trust.8.txt diff --git a/abs/core/ca-certificates/PKGBUILD b/abs/core/ca-certificates/PKGBUILD index a5edf22..f377a79 100644 --- a/abs/core/ca-certificates/PKGBUILD +++ b/abs/core/ca-certificates/PKGBUILD @@ -1,52 +1,45 @@ # $Id$ -# Maintainer: Pierre Schmitz +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Pierre Schmitz pkgbase=ca-certificates pkgname=(ca-certificates-utils ca-certificates) -pkgver=20140923 -pkgrel=2 +pkgver=20150402 +pkgrel=1 pkgdesc='Common CA certificates' arch=('any') url='http://pkgs.fedoraproject.org/cgit/ca-certificates.git' license=('GPL2') -depends=('sh' 'p11-kit') -makedepends=('asciidoc') -_commit=f81c301 -source=("update-ca-trust::$url/plain/update-ca-trust?id=$_commit" - "update-ca-trust.8.txt::$url/plain/update-ca-trust.8.txt?id=$_commit") -sha256sums=('75ef2f4b0fddd2ca3c69b234a6abb66fd732e4af96814b65dcedb0dd52018381' - 'd31ac2bb5f1941aea0ac1e51861af7be224b6bb85820e30bb30793112aa785ba') - -_confdir=/etc/$pkgbase -_datadir=/usr/share/$pkgbase - -prepare() { - sed -i "s:/etc/pki/ca-trust:${_confdir}:g" update-ca-trust +makedepends=('asciidoc' 'p11-kit') +source=(update-ca-trust update-ca-trust.8.txt) +sha256sums=('746d2cce8ec107fa3b7aaa246d69a7e238c3d2ac5cd82c5aeed996fe9cb0a874' + '38c10446738c1e99bc95e42fe844a9e95ea106795059fa769f3b4ba82b395929') + +build() { + asciidoc.py -v -d manpage -b docbook update-ca-trust.8.txt + xsltproc --nonet -o update-ca-trust.8 /etc/asciidoc/docbook-xsl/manpage.xsl update-ca-trust.8.xml } package_ca-certificates-utils() { pkgdesc+=" (utilities)" + depends=('bash' 'coreutils' 'findutils' 'p11-kit>=0.23.1') install=ca-certificates-utils.install provides=(ca-certificates ca-certificates-java) conflicts=(ca-certificates-java) replaces=(ca-certificates-java) - asciidoc.py -v -d manpage -b docbook update-ca-trust.8.txt - xsltproc --nonet -o update-ca-trust.8 /etc/asciidoc/docbook-xsl/manpage.xsl update-ca-trust.8.xml - install -D update-ca-trust "${pkgdir}/usr/bin/update-ca-trust" install -Dm644 update-ca-trust.8 "${pkgdir}/usr/share/man/man8/update-ca-trust.8" - install -d "${pkgdir}"{${_confdir},${_datadir}}/trust-source/{anchors,blacklist} + # Trust source directories + install -d "${pkgdir}"/{etc,usr/share}/${pkgbase}/trust-source/{anchors,blacklist} - _extractdir="${pkgdir}${_confdir}/extracted" - _ssldir="${pkgdir}/etc/ssl" + # Directories used by update-ca-trust (aka "trust extract-compat") + install -d "${pkgdir}"/etc/{ssl/certs/java,${pkgbase}/extracted} - install -d "${_ssldir}/certs/java" "${_extractdir}"/{openssl,pem,java} - ln -sr "${_extractdir}/openssl/ca-bundle.trust.crt" "${_ssldir}/certs/ca-bundle.trust.crt" - ln -sr "${_extractdir}/pem/tls-ca-bundle.pem" "${_ssldir}/certs/ca-bundle.crt" - ln -sr "${_extractdir}/pem/tls-ca-bundle.pem" "${_ssldir}/cert.pem" - ln -sr "${_extractdir}/java/cacerts" "${_ssldir}/certs/java/cacerts" + # Compatibility link for OpenSSL using /etc/ssl as CAdir + # Used in preference to the individual links in /etc/ssl/certs + ln -s ../${pkgbase}/extracted/tls-ca-bundle.pem "${pkgdir}/etc/ssl/cert.pem" } package_ca-certificates() { @@ -54,4 +47,4 @@ package_ca-certificates() { depends=(ca-certificates-{mozilla,cacert}) } -# vim:set noet ts=8 sw=8: +# vim:set noet ts=8 sw=8 sts=0: diff --git a/abs/core/ca-certificates/ca-certificates-utils.install b/abs/core/ca-certificates/ca-certificates-utils.install index bf18c7f..8120878 100644 --- a/abs/core/ca-certificates/ca-certificates-utils.install +++ b/abs/core/ca-certificates/ca-certificates-utils.install @@ -2,28 +2,43 @@ export LC_ALL=C post_install() { usr/bin/update-ca-trust -} -pre_upgrade() { - if (( $(vercmp $2 20140923-2) < 0 )); then - find /etc/ssl/certs -type l -print | while read symlink; do - case $(readlink $symlink) in - /usr/share/ca-certificates*) rm -f $symlink;; - esac - done - find /etc/ssl/certs -type l -print | while read symlink; do - test -f $symlink || rm -f $symlink - done - rm -f /etc/ssl/certs/ca-certificates.crt - fi + # This should be a normally packaged file, but that would + # require user intervention at upgrade + ln -srf etc/ca-certificates/extracted/tls-ca-bundle.pem \ + etc/ssl/certs/ca-certificates.crt } post_upgrade() { usr/bin/update-ca-trust + + if (( $(vercmp $2 20140923-7.1) < 0 )); then + cat <>. + +In addition, the classic PKCS#11 module +is replaced with a new PKCS#11 module (p11-kit-trust.so) that dynamically +reads the same source configuration. + + +[[sourceconf]] +SOURCE CONFIGURATION +-------------------- +The dynamic configuration feature uses several source directories that +will be scanned for any number of source files. *It is important to select +the correct subdirectory for adding files, as the subdirectory defines how +contained certificates will be trusted or distrusted, and which file formats are read.* + +Files in subdirectories below the directory hierarchy /usr/share/ca-certificates/trust-source/ contain CA certificates and +trust settings in the PEM file format. The trust settings found here will be +interpreted with a *low priority*. + +Files in subdirectories below the directory hierarchy /etc/ca-certificates/trust-source/ contain CA certificates and +trust settings in the PEM file format. The trust settings found here will be +interpreted with a *high priority*. + +.You may use the following rules of thumb to decide, whether your configuration files should be added to the /etc or rather to the /usr directory hierarchy: +* If you are manually adding a configuration file to a system, you probably +want it to override any other default configuration, and you most likely should +add it to the respective subdirectory in the /etc hierarchy. +* If you are creating a package that provides additional root CA certificates, +that is intended for distribution to several computer systems, but you still +want to allow the administrator to override your list, then your package should +add your files to the respective subdirectory in the /usr hierarchy. +* If you are creating a package that is supposed to override the default system +trust settings, that is intended for distribution to several computer systems, then your package should install the files to the respective +subdirectory in the /etc hierarchy. + +.*QUICK HELP 1*: To add a certificate in the simple PEM or DER file formats to the list of CAs trusted on the system: +* add it as a new file to directory /etc/ca-certificates/trust-source/anchors/ +* run 'update-ca-trust extract' + +.*QUICK HELP 2*: If your certificate is in the extended BEGIN TRUSTED file format (which may contain distrust/blacklist trust flags, or trust flags for usages other than TLS) then: +* add it as a new file to directory /etc/ca-certificates/trust-source/ +* run 'update-ca-trust extract' + +.In order to offer simplicity and flexibility, the way certificate files are treated depends on the subdirectory they are installed to. +* simple trust anchors subdirectory: /usr/share/ca-certificates/trust-source/anchors/ or /etc/ca-certificates/trust-source/anchors/ +* simple blacklist (distrust) subdirectory: /usr/share/ca-certificates/trust-source/blacklist/ or /etc/ca-certificates/trust-source/blacklist/ +* extended format directory: /usr/share/ca-certificates/trust-source/ or /etc/ca-certificates/trust-source/ + +.In the main directories /usr/share/ca-certificates/trust-source/ or /etc/ca-certificates/trust-source/ you may install one or multiple files in the following file formats: +* certificate files that include trust flags, + in the BEGIN/END TRUSTED CERTIFICATE file format + (any file name), which have been created using the openssl x509 tool + and the -addreject -addtrust options. + Bundle files with multiple certificates are supported. +* files in the p11-kit file format using the .p11-kit file name + extension, which can (e.g.) be used to distrust certificates + based on serial number and issuer name, without having the + full certificate available. + (This is currently an undocumented format, to be extended later. + For examples of the supported formats, see the files + shipped with the ca-certificates-mozilla package.) +* certificate files without trust flags in either the DER file format or in + the PEM (BEGIN/END CERTIFICATE) file format (any file name). Such files + will be added with neutral trust, neither trusted nor distrusted. + They will simply be known to the system, which might be helpful to + assist cryptographic software in constructing chains of certificates. + (If you want a CA certificate in these file formats to be trusted, you + should remove it from this directory and move it to the + ./anchors subdirectory instead.) + +In the anchors subdirectories /usr/share/ca-certificates/trust-source/anchors/ or /etc/ca-certificates/trust-source/anchors/ +you may install one or multiple certificates in either the DER file +format or in the PEM (BEGIN/END CERTIFICATE) file format. +Each certificate will be treated as *trusted* for all purposes. + +In the blacklist subdirectories /usr/share/ca-certificates/trust-source/blacklist/ or /etc/ca-certificates/trust-source/blacklist/ +you may install one or multiple certificates in either the DER file +format or in the PEM (BEGIN/END CERTIFICATE) file format. +Each certificate will be treated as *distrusted* for all purposes. + +Please refer to the x509(1) manual page for the documentation of the +BEGIN/END CERTIFICATE and BEGIN/END TRUSTED CERTIFICATE file formats. + +Applications that rely on a static file for a list of trusted CAs +may load one of the files found in the /etc/ssl/certs or /etc/ca-certificates/extracted +directory. After modifying any file in the +/usr/share/ca-certificates/trust-source/ or /etc/ca-certificates/trust-source/ +directories or in any of their subdirectories, or after adding a file, +it is necessary to run the 'update-ca-trust extract' command, +in order to update the consolidated files in /etc/ssl/certs or /etc/ca-certificates/extracted/ . + +Applications that load the classic PKCS#11 module using filename libnssckbi.so +(which has been converted into a symbolic link pointing to the new module) +and any application capable of +loading PKCS#11 modules and loading p11-kit-trust.so, will benefit from +the dynamically merged set of certificates and trust information stored in the +/usr/share/ca-certificates/trust-source/ and /etc/ca-certificates/trust-source/ directories. + + +[[extractconf]] +EXTRACTED CONFIGURATION +----------------------- +The directories /etc/ssl/certs and /etc/ca-certificates/extracted/ contains generated CA certificate +bundle files which are created and updated, based on the <> +by running the 'update-ca-trust extract' command. + +If your application isn't able to load the PKCS#11 module p11-kit-trust.so, +then you can use these files in your application to load a list of global +root CA certificates. + +Please never manually edit the files stored in these directories, +because your changes will be lost and the files automatically overwritten, +each time the 'update-ca-trust extract' command gets executed. + +In order to install new trusted or distrusted certificates, +please rather install them in the respective subdirectory below the +/usr/share/ca-certificates/trust-source/ or /etc/ca-certificates/trust-source/ +directories, as described in the <> section. + +The directory /etc/ssl/certs contains a OpenSSL-cadir-style hash farm. +Distrust information cannot be represented in this format, +and distrusted certificates are missing from these files. + +The directory /etc/ssl/certs/java contains +a CA certificate bundle in the java keystore file format. +Distrust information cannot be represented in this file format, +and distrusted certificates are missing from these files. +File cacerts contains CA certificates trusted for TLS server authentication. + +The directory /etc/ca-certificates/extracted contains +CA certificate bundle files in the simple BEGIN/END CERTIFICATE file format, +as decribed in the x509(1) manual page. +Distrust information cannot be represented in this file format, +and distrusted certificates are missing from these files. +File tls-ca-bundle.pem contains CA certificates +trusted for TLS server authentication. +File email-ca-bundle.pem contains CA certificates +trusted for E-Mail protection. +File objsign-ca-bundle.pem contains CA certificates +trusted for code signing. +File ca-bundle.trust.crt contains certificates in the extended +BEGIN/END TRUSTED CERTIFICATE file format, as described in the x509(1) manual page. +This bundle contains the full set of all trusted +and distrusted certificates, including the associated trust flags. + + +COMMANDS +-------- +(absent/empty command):: + Same as the *extract* command described below. (However, the command may + print fewer warnings, as this command is being run during package + installation, where non-fatal status output is undesired.) + +*extract*:: + Instruct update-ca-trust to scan the <> and produce + updated versions of the consolidated configuration files stored below + the /etc/ssl/certs and /etc/ca-certificates/extracted directory + hierarchies. + +FILES +----- +/usr/share/ca-certificates/trust-source:: + Contains multiple, low priority source configuration files as explained in section <>. Please pay attention to the specific meanings of the respective subdirectories. + +/etc/ca-certificates/trust-source:: + Contains multiple, high priority source configuration files as explained in section <>. Please pay attention to the specific meanings of the respective subdirectories. + +/etc/ca-certificates/extracted:: + Contains consolidated and automatically generated configuration files for consumption by applications, + which are created using the 'update-ca-trust extract' command. Don't edit files in this directory, because they will be overwritten. + See section <> for additional details. + +/etc/ca-certificates/extracted/tls-ca-bundle.pem:: + Contains a list of CA certificates trusted for TLS server authentication, in the simple BEGIN/END CERTIFICATE file format, without distrust information. + +/etc/ca-certificates/extracted/email-ca-bundle.pem:: + Contains a list of CA certificates trusted for E-Mail protection, in the simple BEGIN/END CERTIFICATE file format, without distrust information. + +/etc/ca-certificates/extracted/objsign-ca-bundle.pem:: + Contains a list of CA certificates trusted for code signing, in the simple BEGIN/END CERTIFICATE file format, without distrust information. + +/etc/ca-certificates/extracted/ca-bundle.trust.crt:: + Contains a list of CA certificates in the extended BEGIN/END TRUSTED CERTIFICATE file format, which includes trust (and/or distrust) flags specific to certificate usage. + +/etc/ca-certificates/extracted/cadir:: + Contains individual CA certificates trusted for TLS server authentication usage, in the simple BEGIN/END CERTIFICATE file format, without distrust information. + Also includes the necessary hash symlinks expected by OpenSSL. + +/etc/ssl/certs:: + Classic directory, contains symlinks into /etc/ca-certificates/extracted/cadir which are maintained by the update-ca-trust command. + +/etc/ssl/certs/ca-certificates.crt:: + Classic filename, a symlink to /etc/ca-certificates/extracted/tls-ca-bundle.pem. + +/etc/ssl/cert.pem:: + Classic filename, a symlink to /etc/ca-certificates/extracted/tls-ca-bundle.pem. + +/etc/ssl/java/cacerts:: + Classic filename, contains a list of CA certificates trusted for TLS server authentication usage, in the Java keystore file format, without distrust information. + This file is consolidated output created by the update-ca-trust command. + +AUTHOR +------ +Written by Kai Engert and Stef Walter. -- cgit v0.12 From dddc77b44edb6db476b6e2cda1dda4fa5827bd93 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 21 Sep 2015 13:54:18 +0000 Subject: sudo: update to 1.8.14.p3 --- abs/core/sudo/PKGBUILD | 24 ++++++++++++++++++------ abs/core/sudo/sudo.install | 19 +++++++++++++++++++ abs/core/sudo/sudo.pam | 5 +++-- 3 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 abs/core/sudo/sudo.install diff --git a/abs/core/sudo/PKGBUILD b/abs/core/sudo/PKGBUILD index 8adcf75..14f21ec 100644 --- a/abs/core/sudo/PKGBUILD +++ b/abs/core/sudo/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 197841 2013-10-30 11:07:01Z allan $ +# $Id$ # Maintainer: Evangelos Foutras # Contributor: Allan McRae # Contributor: Tom Newsom pkgname=sudo -_sudover=1.8.8 +_sudover=1.8.14p3 pkgver=${_sudover/p/.p} -pkgrel=1 +pkgrel=2 pkgdesc="Give certain users the ability to run some commands as root" arch=('i686' 'x86_64') url="http://www.sudo.ws/sudo/" license=('custom') groups=('base-devel') -depends=('glibc' 'pam') +depends=('glibc' 'pam' 'libldap') backup=('etc/sudoers' 'etc/pam.d/sudo') +install=$pkgname.install source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig} sudo.pam) -sha256sums=('9f911c1e9297fb8006deb52fa81197a8d06b9d54e70672f723c467ecae992fc9' +sha256sums=('a8a697cbb113859058944850d098464618254804cf97961dee926429f00a1237' 'SKIP' - 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae') + 'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2') +validpgpkeys=('CCB24BE9E9481B15D34159535A89DFA27EE470C4') build() { cd "$srcdir/$pkgname-$_sudover" @@ -27,8 +29,14 @@ build() { --prefix=/usr \ --sbindir=/usr/bin \ --libexecdir=/usr/lib \ + --with-rundir=/run/sudo \ + --with-vardir=/var/db/sudo \ --with-logfac=auth \ + --enable-tmpfiles.d \ --with-pam \ + --with-sssd \ + --with-ldap \ + --with-ldap-conf-file=/etc/openldap/ldap.conf \ --with-env-editor \ --with-passprompt="[sudo] password for %p: " \ --with-all-insults @@ -44,6 +52,10 @@ package() { cd "$srcdir/$pkgname-$_sudover" make DESTDIR="$pkgdir" install + # Remove /run/sudo directory from the package; we create it using tmpfiles.d + rmdir "$pkgdir/run/sudo" + rmdir "$pkgdir/run" + install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" diff --git a/abs/core/sudo/sudo.install b/abs/core/sudo/sudo.install new file mode 100644 index 0000000..1369cc1 --- /dev/null +++ b/abs/core/sudo/sudo.install @@ -0,0 +1,19 @@ +post_install() { + if type -P systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create sudo.conf + fi +} + +pre_upgrade() { + # Permissions of /var/db/sudo were changed from 0700 to 0711 in sudo 1.8.10 + # http://www.sudo.ws/repos/sudo/rev/5c38d77a2d0c + if (($(vercmp $2 1.8.10-1) < 0)); then + chmod 0711 var/db/sudo + fi +} + +post_upgrade() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/sudo/sudo.pam b/abs/core/sudo/sudo.pam index 4e586cd..ab053c5 100644 --- a/abs/core/sudo/sudo.pam +++ b/abs/core/sudo/sudo.pam @@ -1,3 +1,4 @@ #%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so +auth include system-auth +account include system-auth +session include system-auth -- cgit v0.12 From ad69b6f0c4484e3ec67a670faaa1000bca493d09 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 21 Sep 2015 14:03:22 +0000 Subject: p11-kit: update to 0.23.1 --- abs/core/p11-kit/PKGBUILD | 25 +++++++++++--- abs/core/p11-kit/libnssckbi-compat.patch | 57 ++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 abs/core/p11-kit/libnssckbi-compat.patch diff --git a/abs/core/p11-kit/PKGBUILD b/abs/core/p11-kit/PKGBUILD index 6c74929..a0d282b 100644 --- a/abs/core/p11-kit/PKGBUILD +++ b/abs/core/p11-kit/PKGBUILD @@ -2,16 +2,31 @@ # Maintainer: Ionut Biru pkgname=p11-kit -pkgver=0.20.7 +pkgver=0.23.1 pkgrel=2 pkgdesc="Library to work with PKCS#11 modules" arch=(i686 x86_64) url="http://p11-glue.freedesktop.org" license=('BSD') depends=('glibc' 'libtasn1' 'libffi') -source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('6648cad01a3080b685b8b3bf7372c91a' - 'SKIP') +source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig} + libnssckbi-compat.patch) +md5sums=('96f073270c489c9a594e1c9413f42db8' + 'SKIP' + '8c3f119005908cf4a3e0ef0a0a310f14') +validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF') + +prepare() { + cd $pkgname-$pkgver + + # Build and install an additional library (libnssckbi-p11-kit.so) which + # is a copy of p11-kit-trust.so but uses the same label for root certs as + # libnssckbi.so ("Builtin Object Token" instead of "Default Trust") + # https://bugs.freedesktop.org/show_bug.cgi?id=66161 + patch -Np1 -i ../libnssckbi-compat.patch + + autoreconf -vi +} build() { cd $pkgname-$pkgver @@ -30,6 +45,8 @@ package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + + ln -srf "$pkgdir/usr/bin/update-ca-trust" "$pkgdir/usr/lib/p11-kit/trust-extract-compat" } # vim:set ts=2 sw=2 et: diff --git a/abs/core/p11-kit/libnssckbi-compat.patch b/abs/core/p11-kit/libnssckbi-compat.patch new file mode 100644 index 0000000..d1b70a3 --- /dev/null +++ b/abs/core/p11-kit/libnssckbi-compat.patch @@ -0,0 +1,57 @@ +diff -upr p11-kit-0.23.1.orig/trust/Makefile.am p11-kit-0.23.1/trust/Makefile.am +--- p11-kit-0.23.1.orig/trust/Makefile.am 2014-11-12 12:58:50.000000000 +0200 ++++ p11-kit-0.23.1/trust/Makefile.am 2015-03-30 16:43:35.275993032 +0300 +@@ -61,6 +61,20 @@ p11_kit_trust_la_LDFLAGS = \ + + p11_kit_trust_la_SOURCES = $(TRUST_SRCS) + ++libnssckbi_compatdir = $(libdir) ++libnssckbi_compat_LTLIBRARIES = \ ++ libnssckbi-p11-kit.la ++ ++libnssckbi_p11_kit_la_CFLAGS = \ ++ -DLIBNSSCKBI_COMPAT \ ++ $(p11_kit_trust_la_CFLAGS) ++ ++libnssckbi_p11_kit_la_LIBADD = $(p11_kit_trust_la_LIBADD) ++ ++libnssckbi_p11_kit_la_LDFLAGS = $(p11_kit_trust_la_LDFLAGS) ++ ++libnssckbi_p11_kit_la_SOURCES = $(p11_kit_trust_la_SOURCES) ++ + libtrust_testable_la_LDFLAGS = \ + -no-undefined + +diff -upr p11-kit-0.23.1.orig/trust/module.c p11-kit-0.23.1/trust/module.c +--- p11-kit-0.23.1.orig/trust/module.c 2014-12-16 12:24:01.000000000 +0200 ++++ p11-kit-0.23.1/trust/module.c 2015-03-30 16:48:41.370360130 +0300 +@@ -196,7 +196,11 @@ create_tokens_inlock (p11_array *tokens, + const char *label; + } labels[] = { + { "~/", "User Trust" }, ++#ifdef LIBNSSCKBI_COMPAT ++ { DATA_DIR, "Builtin Object Token" }, ++#else + { DATA_DIR, "Default Trust" }, ++#endif + { SYSCONFDIR, "System Trust" }, + { NULL }, + }; +@@ -521,9 +525,15 @@ sys_C_GetSlotInfo (CK_SLOT_ID id, + info->flags = CKF_TOKEN_PRESENT; + strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32); + +- /* If too long, copy the first 64 characters into buffer */ +- path = p11_token_get_path (token); ++#ifdef LIBNSSCKBI_COMPAT ++ /* Change description to match libnssckbi so HPKP works in Chromium */ ++ if (strcmp (p11_token_get_label (token), "Builtin Object Token" ) == 0) ++ path = "NSS Builtin Objects"; ++ else ++#endif ++ path = p11_token_get_path (token); + length = strlen (path); ++ /* If too long, copy the first 64 characters into buffer */ + if (length > sizeof (info->slotDescription)) + length = sizeof (info->slotDescription); + memset (info->slotDescription, ' ', sizeof (info->slotDescription)); -- cgit v0.12 From 0ae29e49212d84846aaae0e38420c8225e6a5b61 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 21 Sep 2015 16:28:56 +0000 Subject: nspr: update to 4.10.9 --- abs/extra/nspr/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/abs/extra/nspr/PKGBUILD b/abs/extra/nspr/PKGBUILD index 19538ba..e60f6ab 100644 --- a/abs/extra/nspr/PKGBUILD +++ b/abs/extra/nspr/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Alexander Baldeck pkgname=nspr -pkgver=4.10.7 +pkgver=4.10.9 pkgrel=1 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64) @@ -12,9 +12,9 @@ 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) -md5sums=('6e06919e4b56efed501e05d8b45ec10e') -sha1sums=('f62972d7c66d4621d6262c5bd9b5723fa67b6bff') +source=(http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz) +sha1sums=('405e5ad45111ddf95a5d39d647d41d27456c9443') +sha256sums=('4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881') build() { cd $pkgname-$pkgver -- cgit v0.12 From b927a8f31804f4bc280dbd254392ba2c5a5b6327 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 21 Sep 2015 16:41:37 +0000 Subject: nss: update to 3.20 --- abs/extra/nss/PKGBUILD | 30 ++++++++++++------------ abs/extra/nss/certdata2pem.py | 1 + abs/extra/nss/legacy-certs.patch | 26 ++++++++++++++++++++ abs/extra/nss/nss.install | 13 ++++++++++ abs/extra/nss/ssl-renegotiate-transitional.patch | 21 ----------------- 5 files changed, 55 insertions(+), 36 deletions(-) create mode 100644 abs/extra/nss/legacy-certs.patch create mode 100644 abs/extra/nss/nss.install delete mode 100644 abs/extra/nss/ssl-renegotiate-transitional.patch diff --git a/abs/extra/nss/PKGBUILD b/abs/extra/nss/PKGBUILD index 7a06cec..4bf9a60 100644 --- a/abs/extra/nss/PKGBUILD +++ b/abs/extra/nss/PKGBUILD @@ -3,36 +3,34 @@ pkgbase=nss pkgname=(nss ca-certificates-mozilla) -pkgver=3.17 -pkgrel=4 +pkgver=3.20 +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.10.7 +_nsprver=4.10.8 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh' 'p11-kit') makedepends=('perl' 'python2') options=('!strip' '!makeflags' 'staticlibs') -source=("ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz" - certdata2pem.py - bundle.sh - nss.pc.in - nss-config.in - ssl-renegotiate-transitional.patch) -sha256sums=('3b1abcd8f89211dda2cc739bfa76552d080f7ea80482ef2727b006548a7f0c81' - 'af13c30801a8a27623948206458432a4cf98061b75ff6e5b5e03912f93c034ee' +source=("https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz" + certdata2pem.py bundle.sh nss.pc.in nss-config.in legacy-certs.patch) +sha256sums=('5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c' + '2a2ff9131c21fa3b23ad7c7a2f069eabc783e56c6eb05419ac5f365f48dea0fc' '045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180' 'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd' 'e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9' - '12df04bccbf674db1eef7a519a28987927b5e9c107b1dc386686f05e64f49a97') + '22330fcde2dac5fa4733f7d77bffbbd31d91cbaa338738afdc2a8ebfccb61184') prepare() { mkdir certs cd nss-$pkgver - # Adds transitional SSL renegotiate support - patch from Debian - patch -Np3 -i ../ssl-renegotiate-transitional.patch + # FS#45479: Reenable two weak Verisign certificates used by login.live.com + # Otherwise, accessing this site via Epiphany (GnuTLS) or Skype (OpenSSL) fails + # Also see https://gist.github.com/grawity/15eabf67191e17080241 + patch nss/lib/ckfw/builtins/certdata.txt ../legacy-certs.patch # Respect LDFLAGS sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \ @@ -66,6 +64,8 @@ build() { } package_nss() { + install=nss.install + cd nss-$pkgver install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig} @@ -105,7 +105,7 @@ package_nss() { install -t "$pkgdir/usr/include/nss" -m644 *.h rm "$pkgdir/usr/lib/libnssckbi.so" - ln -s pkcs11/p11-kit-trust.so "$pkgdir/usr/lib/libnssckbi.so" + ln -s libnssckbi-p11-kit.so "$pkgdir/usr/lib/libnssckbi.so" } package_ca-certificates-mozilla() { diff --git a/abs/extra/nss/certdata2pem.py b/abs/extra/nss/certdata2pem.py index 175de1a..021772a 100644 --- a/abs/extra/nss/certdata2pem.py +++ b/abs/extra/nss/certdata2pem.py @@ -196,4 +196,5 @@ for tobj in objects: if (tobj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_NOT_TRUSTED') or (tobj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_NOT_TRUSTED') or (tobj['CKA_TRUST_CODE_SIGNING'] == 'CKT_NSS_NOT_TRUSTED'): f.write("x-distrusted: true\n") f.write("\n\n") + f.close() print " -> written as '%s', trust = %s, openssl-trust = %s, distrust = %s, openssl-distrust = %s" % (fname, trustbits, openssl_trustflags, distrustbits, openssl_distrustflags) diff --git a/abs/extra/nss/legacy-certs.patch b/abs/extra/nss/legacy-certs.patch new file mode 100644 index 0000000..863cef9 --- /dev/null +++ b/abs/extra/nss/legacy-certs.patch @@ -0,0 +1,26 @@ +--- certdata.txt 2015-06-27 23:31:01.419795911 +0200 ++++ certdata-legacy-less.txt 2015-06-27 23:57:47.106199639 +0200 +@@ -577,9 +577,9 @@ + \002\020\160\272\344\035\020\331\051\064\266\070\312\173\003\314 + \272\277 + END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST ++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_MUST_VERIFY_TRUST ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +@@ -17186,9 +17186,9 @@ + \002\020\074\221\061\313\037\366\320\033\016\232\270\320\104\277 + \022\276 + END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_MUST_VERIFY_TRUST ++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_MUST_VERIFY_TRUST ++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.install b/abs/extra/nss/nss.install new file mode 100644 index 0000000..24f9ec6 --- /dev/null +++ b/abs/extra/nss/nss.install @@ -0,0 +1,13 @@ +post_upgrade() { + if (($(vercmp $2 3.18-3) < 0)); then + # This symlink was created by ldconfig because we linked to + # pkcs11/p11-kit-trust.so from libnssckbi.so; the chain was: + # p11-kit-trust.so -> libnssckbi.so -> pkcs11/p11-kit-trust.so + # Now we have: + # libnssckbi.so -> libnssckbi-p11-kit.so + # which no longer creates an incorrect p11-kit-trust.so symlink + if [[ $(readlink usr/lib/p11-kit-trust.so) == libnssckbi.so ]]; then + rm usr/lib/p11-kit-trust.so + fi + fi +} diff --git a/abs/extra/nss/ssl-renegotiate-transitional.patch b/abs/extra/nss/ssl-renegotiate-transitional.patch deleted file mode 100644 index f457c55..0000000 --- a/abs/extra/nss/ssl-renegotiate-transitional.patch +++ /dev/null @@ -1,21 +0,0 @@ -Enable transitional scheme for ssl renegotiation: - -(from mozilla/security/nss/lib/ssl/ssl.h) -Disallow unsafe renegotiation in server sockets only, but allow clients -to continue to renegotiate with vulnerable servers. -This value should only be used during the transition period when few -servers have been upgraded. - -diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c -index f1d1921..c074360 100644 ---- a/mozilla/security/nss/lib/ssl/sslsock.c -+++ b/mozilla/security/nss/lib/ssl/sslsock.c -@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = { - PR_FALSE, /* noLocks */ - PR_FALSE, /* enableSessionTickets */ - PR_FALSE, /* enableDeflate */ -- 2, /* enableRenegotiation (default: requires extension) */ -+ 3, /* enableRenegotiation (default: transitional) */ - PR_FALSE, /* requireSafeNegotiation */ - }; - -- cgit v0.12 From 59386a777a8fc6edcb252ac24f74d1e680647db5 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 21 Sep 2015 20:37:19 +0000 Subject: git: update to 2.5.3 --- abs/extra/git/ChangeLog | 57 --------------------- abs/extra/git/PKGBUILD | 104 ++++++++++++++++++++------------------ abs/extra/git/git-daemon | 70 ------------------------- abs/extra/git/git-daemon.conf | 5 -- abs/extra/git/git-daemon.socket | 9 ++++ abs/extra/git/git-daemon@.service | 10 ++++ abs/extra/git/git.install | 12 +++++ 7 files changed, 87 insertions(+), 180 deletions(-) delete mode 100644 abs/extra/git/ChangeLog delete mode 100644 abs/extra/git/git-daemon delete mode 100644 abs/extra/git/git-daemon.conf create mode 100644 abs/extra/git/git-daemon.socket create mode 100644 abs/extra/git/git-daemon@.service create mode 100644 abs/extra/git/git.install diff --git a/abs/extra/git/ChangeLog b/abs/extra/git/ChangeLog deleted file mode 100644 index f0c1523..0000000 --- a/abs/extra/git/ChangeLog +++ /dev/null @@ -1,57 +0,0 @@ -Simple version bumps are omitted from the following ChangeLog. - -2011-08-16 Dan McGee - Version 1.7.6.1-1 - * Enable USE_LIBPCRE for `git grep -P` usage - -2011-05-05 Dan McGee - Version 1.7.5.1-1 - * Byte compile emacs files (FS#20874) - * Respect CFLAGS/LDFLAGS (FS#23963) - -2011-04-27 Dan McGee - Version 1.7.5-1 - * Add missing optdepends for git send-email (FS#20923) - -2011-01-05 Dan McGee - Version 1.7.3.5-1 - * More flexible git-daemon RC scripts (FS#20575) - -2010-10-01 Allan McRae - Version 1.7.3.1-2 - * Python 2/3 rebuild - -2010-06-29 Dan McGee - Version 1.7.1.1-1 - * Add emacs completion files (FS#17968) - * Add git-daemon RC scripts (FS#19291) - -2009-06-05 Dan McGee - Version 1.6.3.2-1 - * Remove gitweb from /usr/share; it needs customization to be helpful - * Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683) - -2008-09-14 Dan McGee - Version 1.6.0.2-1 - * Moved optional depends from install file to optdepends array - -2008-06-15 Dan McGee - Version 1.5.6-1 - * Removed 'cpio' dependency, clone is now a builtin and no longer needs it - -2008-02-02 Dan McGee - Version 1.5.4-1 - * Upstream version 1.5.4 - * Enable pthreads support in pack-objects. To use, set the pack.threads - git config option. Read manpages of pack-objects and config for more - details. - * Changelog added (with entries going back a bit). - -2008-01-28 Kevin Piche - Version 1.5.3.7-2 - * Updated for new perl policy (vendor dirs) - * Change license to GPL2 - -2007-11-01 Eric Belanger - Version 1.5.3.5-2 - * Fix Perl module location diff --git a/abs/extra/git/PKGBUILD b/abs/extra/git/PKGBUILD index 75be079..c762f95 100644 --- a/abs/extra/git/PKGBUILD +++ b/abs/extra/git/PKGBUILD @@ -1,13 +1,15 @@ +# $Id$ +# Maintainer: Dan McGee pkgname=git -pkgver=1.7.11.4 +pkgver=2.5.3 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) url="http://git-scm.com/" license=('GPL2') depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre') -makedepends=('python2' 'emacs') +makedepends=('python2' 'emacs' 'libgnome-keyring' 'xmlto' 'asciidoc') optdepends=('tk: gitk and git gui' 'perl-libwww: git svn' 'perl-term-readkey: git svn' @@ -16,15 +18,24 @@ optdepends=('tk: gitk and git gui' 'perl-authen-sasl: git send-email TLS support' 'python2: various helper scripts' 'subversion: git svn' - 'cvsps: git cvsimport') + 'cvsps2: git cvsimport' + 'gnome-keyring: GNOME keyring credential helper') replaces=('git-core') provides=('git-core') -backup=('etc/conf.d/git-daemon.conf') -source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" - "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" - git-daemon - git-daemon.conf) -changelog=ChangeLog +install=git.install +source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz" + "https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.sign" + git-daemon@.service + git-daemon.socket) +md5sums=('e69b41f2d0a93f3d3dc5eb19196e4e5c' + 'SKIP' + '042524f942785772d7bd52a1f02fe5ae' + 'f67869315c2cc112e076f0c73f248002') +validpgpkeys=('96E07AF25771955980DAD10020D04E5A713660A7') # Junio C Hamano + +prepare() { + cd "$srcdir/$pkgname-$pkgver" +} build() { export PYTHON_PATH='/usr/bin/python2' @@ -33,30 +44,32 @@ build() { CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE=1 \ NO_CROSS_DIRECTORY_HARDLINKS=1 \ - all + MAN_BOLD_LITERAL=1 \ + all doc - cd contrib/emacs - make prefix=/usr + make -C contrib/emacs prefix=/usr + make -C contrib/credential/gnome-keyring + make -C contrib/subtree prefix=/usr gitexecdir=/usr/lib/git-core all doc } check() { export PYTHON_PATH='/usr/bin/python2' cd "$srcdir/$pkgname-$pkgver" local jobs - jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*') + jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*') || true + mkdir -p /dev/shm/git-test make prefix=/usr gitexecdir=/usr/lib/git-core \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE=1 \ NO_CROSS_DIRECTORY_HARDLINKS=1 \ + MAN_BOLD_LITERAL=1 \ NO_SVN_TESTS=y \ DEFAULT_TEST_TARGET=prove \ GIT_PROVE_OPTS="$jobs -Q" \ - GIT_TEST_OPTS="--root=/dev/shm/" \ + GIT_TEST_OPTS="--root=/dev/shm/git-test" \ test } - - package() { export PYTHON_PATH='/usr/bin/python2' cd "$srcdir/$pkgname-$pkgver" @@ -64,44 +77,39 @@ package() { CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE=1 \ NO_CROSS_DIRECTORY_HARDLINKS=1 \ - INSTALLDIRS=vendor DESTDIR="$pkgdir" install + MAN_BOLD_LITERAL=1 \ + INSTALLDIRS=vendor DESTDIR="$pkgdir" install install-doc # bash completion - # until this is fixed, no point in loading it dynamically: - # http://git.661346.n2.nabble.com/bash-completion-now-loads-completions-dynamically-so-git-ps1-is-not-defined-when-you-open-a-shell-td7415323.html - #mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ - #install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git - mkdir -p "$pkgdir"/etc/bash_completion.d/ - install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git - # more contrib stuff - cp -a ./contrib $pkgdir/usr/share/git/ + mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ + install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git + # fancy git prompt + mkdir -p "$pkgdir"/usr/share/git/ + install -m644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh + # emacs + make -C contrib/emacs prefix=/usr DESTDIR="$pkgdir" install + # gnome credentials helper + install -m755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \ + "$pkgdir"/usr/lib/git-core/git-credential-gnome-keyring + make -C contrib/credential/gnome-keyring clean + # subtree installation + make -C contrib/subtree prefix=/usr gitexecdir=/usr/lib/git-core DESTDIR="$pkgdir" install install-doc + # the rest of the contrib stuff + cp -a ./contrib/* $pkgdir/usr/share/git/ + # scripts are for python 2.x - sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ + sed -i 's|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|' \ $(find "$pkgdir" -name '*.py') \ - "$pkgdir"/usr/lib/git-core/git-p4 \ - "$pkgdir"/usr/share/git/gitview/gitview - - # emacs interface - cd contrib/emacs - make prefix=/usr DESTDIR="$pkgdir" install - - # how 'bout some manpages? - for mansect in man1 man5 man7; do - for manpage in "$srcdir"/$mansect/*; do - install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage) - done - done + "$pkgdir"/usr/share/git/gitview/gitview \ + "$pkgdir"/usr/share/git/remote-helpers/git-remote-bzr \ + "$pkgdir"/usr/share/git/remote-helpers/git-remote-hg + sed -i 's|#![ ]*/usr/bin/python$|#!/usr/bin/python2|' \ + "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py # remove perllocal.pod, .packlist, and empty directories. rm -rf "$pkgdir"/usr/lib/perl5 - # git daemon script - install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon - install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf + # git-daemon via systemd socket activation + install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service + install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } - -md5sums=('21c7100cddee8579233a924111e829ab' - '397af842126a5099968238ab946580a5' - '8e2648910fd5dd4f1c41d3c7fa9e9156' - '2e42bf97779a1c6411d89043334c9e78') - diff --git a/abs/extra/git/git-daemon b/abs/extra/git/git-daemon deleted file mode 100644 index 21ba73e..0000000 --- a/abs/extra/git/git-daemon +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash - -daemon_bin="/usr/lib/git-core/git-daemon" -daemon_name=$(basename $daemon_bin) -PIDF="/var/run/$daemon_name.pid" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f $PIDF ] && rm -f $PIDF - # RUN - $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > $PIDF - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f $PIDF &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/abs/extra/git/git-daemon.conf b/abs/extra/git/git-daemon.conf deleted file mode 100644 index 3f9a120..0000000 --- a/abs/extra/git/git-daemon.conf +++ /dev/null @@ -1,5 +0,0 @@ -# path to git repositories served -GIT_REPO="/srv/git/" -# see `man git-daemon` for all available options -# $GIT_REPO will be present twice in most configs -GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO" diff --git a/abs/extra/git/git-daemon.socket b/abs/extra/git/git-daemon.socket new file mode 100644 index 0000000..58ed2f1 --- /dev/null +++ b/abs/extra/git/git-daemon.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Git Daemon Socket + +[Socket] +ListenStream=9418 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/abs/extra/git/git-daemon@.service b/abs/extra/git/git-daemon@.service new file mode 100644 index 0000000..55ca714 --- /dev/null +++ b/abs/extra/git/git-daemon@.service @@ -0,0 +1,10 @@ +[Unit] +Description=Git Daemon Instance + +[Service] +User=git +# The '-' is to ignore non-zero exit statuses +ExecStart=-/usr/lib/git-core/git-daemon --inetd --export-all --base-path=/srv/git +StandardInput=socket +StandardOutput=inherit +StandardError=journal diff --git a/abs/extra/git/git.install b/abs/extra/git/git.install new file mode 100644 index 0000000..064eda0 --- /dev/null +++ b/abs/extra/git/git.install @@ -0,0 +1,12 @@ +post_install() { + if ! getent group git >/dev/null; then + groupadd --system git + fi + if ! getent passwd git >/dev/null; then + useradd --system -c 'git daemon user' -g git -d / -s /bin/bash git + fi +} + +post_upgrade() { + post_install $1 +} -- cgit v0.12 From 03607bd761e8abde27a777dbe1517c1acb43b551 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 21 Sep 2015 20:57:11 +0000 Subject: google-chrome: update to 45.0.2454.99 --- abs/extra/google-chrome/PKGBUILD | 10 +++++----- abs/extra/google-chrome/google-chrome-stable | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD index 6859903..90c1136 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=45.0.2454.85 +pkgver=45.0.2454.99 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -24,10 +24,10 @@ source=('google-chrome-stable' 'eula_text.html') source_i686=("google-chrome-${_channel}_${pkgver}_i386.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_i386.deb") source_x86_64=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb") -md5sums=('9c9bd494c7cc5c98feff767be140a853' +md5sums=('99fa93d5e7fb5d622cef0f9621f3ffa3' 'b7e752f549b215ac77f284b6486794b6') -md5sums_i686=('2fc404c0fdd90c45acb5ed4d2cf38877') -md5sums_x86_64=('25d88e62552920168e5390040cc062f5') +md5sums_i686=('448666013ff876b49b2df6eff958afb8') +md5sums_x86_64=('4954ec432d2e15237eee69b361c7ade0') package() { msg2 "Extracting the data.tar.lzma..." @@ -50,7 +50,7 @@ package() { install -Dm644 eula_text.html "$pkgdir"/usr/share/licenses/google-chrome/eula_text.html msg2 "Fixing Chrome icon resolution..." - sed -i "/Exec=/i\StartupWMClass=Google-chrome-$_channel" "$pkgdir"/usr/share/applications/google-chrome.desktop + sed -i "/Exec=/i\StartupWMClass=Google-chrome" "$pkgdir"/usr/share/applications/google-chrome.desktop msg2 "Fixing permissions of documentation folder..." chmod 755 "$pkgdir"/usr/share/doc/google-chrome-$_channel/ diff --git a/abs/extra/google-chrome/google-chrome-stable b/abs/extra/google-chrome/google-chrome-stable index b3b1e77..e55c822 100644 --- a/abs/extra/google-chrome/google-chrome-stable +++ b/abs/extra/google-chrome/google-chrome-stable @@ -6,4 +6,4 @@ if [[ -f ~/.config/chrome-flags.conf ]]; then fi # Launch -exec /opt/google/chrome/google-chrome $CHROME_USER_FLAGS $@ \ No newline at end of file +exec /opt/google/chrome/google-chrome $CHROME_USER_FLAGS "$@" \ No newline at end of file -- cgit v0.12 From 70481ff5f43678e06b12f2c611042e5c8f35d637 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 29 Sep 2015 19:09:06 +0000 Subject: mythtv & plugins: update to latest -fixes add patch for tmdb3.py error 25 --- abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 7 ++- .../mythtv/stable-0.27/mythtv/tmdb_error25.patch | 55 ++++++++++++++++++++++ 4 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 abs/core/mythtv/stable-0.27/mythtv/tmdb_error25.patch diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index dce590c..7f1827c 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -32fd3968acea905d71d9769996487eff280233ea +2ad315894af9a7770b29dbec5d0ca56a84534f49 diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 7d5f15f..9f3145d 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.5 -pkgrel=6 +pkgrel=8 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index 5ea8707..4d9cee6 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.5 -pkgrel=6 +pkgrel=8 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -22,9 +22,11 @@ install='mythtv.install' patches=('myth_settings.patch' 'videoAlwaysUseBookmark.patch' 'fixQTvirtualkeyboard.patch' - 'suggestedstarttime.patch.v1') + 'suggestedstarttime.patch.v1' + 'tmdb_error25.patch') #fixQTvirtualkeyboard.patch: https://code.mythtv.org/trac/ticket/12347 #suggestedstarttime.patch.v1: http://code.mythtv.org/trac/ticket/11562 next mythfilldatabase run in mythweb + #tmdb_error25.patch: https://code.mythtv.org/trac/ticket/12455 optdepends=() replaces=('mythvideo' 'myththemes') @@ -107,4 +109,5 @@ md5sums=('5f3e43567e62afe17bad39f5a9b604cf' '41098e898361a5a3cde3eaae358482a8' 'a853dff0f5c92ca58fcc1e389cd16266' '35a7fd3e3057691e3b1bf355bb9e8b16' + '5e645c3d0df38143c45f3e8fe24f1b6f' '928de4b070d9f3b784d55c0db415eaf3') diff --git a/abs/core/mythtv/stable-0.27/mythtv/tmdb_error25.patch b/abs/core/mythtv/stable-0.27/mythtv/tmdb_error25.patch new file mode 100644 index 0000000..fc1a2fe --- /dev/null +++ b/abs/core/mythtv/stable-0.27/mythtv/tmdb_error25.patch @@ -0,0 +1,55 @@ +--- src/mythtv/bindings/python/tmdb3/tmdb3/request.py.orig 2015-09-29 16:11:52.436024705 +0000 ++++ src/mythtv/bindings/python/tmdb3/tmdb3/request.py 2015-09-29 16:13:24.297824407 +0000 +@@ -16,6 +16,7 @@ + import urllib2 + import json + import os ++import time + + DEBUG = False + cache = Cache(filename='pytmdb3.cache') +@@ -113,21 +114,29 @@ + def readJSON(self): + """Parse result from specified URL as JSON data.""" + url = self.get_full_url() +- try: +- # catch HTTP error from open() +- data = json.load(self.open()) +- except TMDBHTTPError, e: +- try: +- # try to load whatever was returned +- data = json.loads(e.response) +- except: +- # cannot parse json, just raise existing error +- raise e +- else: +- # response parsed, try to raise error from TMDB +- handle_status(data, url) +- # no error from TMDB, just raise existing error +- raise e ++ while True: ++ try: ++ # catch HTTP error from open() ++ data = json.load(self.open()) ++ break ++ except TMDBHTTPError, e: ++ try: ++ # try to load whatever was returned ++ data = json.loads(e.response) ++ except: ++ # cannot parse json, just raise existing error ++ raise e ++ else: ++ # Check for error code of 25 which means we are doing more than 40 requests per minute. ++ if data.get('status_code', 1) == 25: ++ # Sleep and retry query. ++ time.sleep(10) ++ continue ++ else: ++ # response parsed, try to raise error from TMDB ++ handle_status(data, url) ++ # no error from TMDB, just raise existing error ++ raise e + handle_status(data, url) + if DEBUG: + import pprint -- cgit v0.12 From f334e5d80b50663dc514f1a1c2596d5168bb9f33 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 30 Sep 2015 14:11:30 +0000 Subject: runit-scripts: change frontend and vnc to start usingg su runit can't term processes run with sudo and the -i option --- abs/core/runit-scripts/PKGBUILD | 2 +- abs/core/runit-scripts/runitscripts/services/frontend/run | 4 ++-- abs/core/runit-scripts/runitscripts/services/vnc/run | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index d257ffe..151eb90 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=8.3 -pkgrel=9 +pkgrel=10 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runitscripts/services/frontend/run b/abs/core/runit-scripts/runitscripts/services/frontend/run index 22b65db..7a80665 100755 --- a/abs/core/runit-scripts/runitscripts/services/frontend/run +++ b/abs/core/runit-scripts/runitscripts/services/frontend/run @@ -21,5 +21,5 @@ stat_runit "Starting LinHES frontend" # fi #echo "Starting LinHES frontend" >/dev/tty1 -#exec /bin/su - mythtv -l -c /usr/LH/bin/LinHES-start -exec sudo -u mythtv -i /usr/LH/bin/LinHES-start +exec su - mythtv -l -c /usr/LH/bin/LinHES-start +#exec sudo -u mythtv -i /usr/LH/bin/LinHES-start diff --git a/abs/core/runit-scripts/runitscripts/services/vnc/run b/abs/core/runit-scripts/runitscripts/services/vnc/run index bc411b1..b67d174 100755 --- a/abs/core/runit-scripts/runitscripts/services/vnc/run +++ b/abs/core/runit-scripts/runitscripts/services/vnc/run @@ -11,5 +11,5 @@ geometry=1024x768 #. /etc/conf.d/vncserver 2>/dev/null cp -f $MV_ROOT/templates/vnc.service /etc/avahi/services/vnc.service 2>/dev/null cd ~vncsvc -#exec su vncsvc -c "/usr/bin/vncserver -fg -geometry $geometry :1" 2>/var/log/vnc.log -exec sudo -u vncsvc -i /usr/bin/vncserver -fg -geometry $geometry :1 2>/var/log/vnc.log +exec su vncsvc -c "/usr/bin/vncserver -fg -geometry $geometry :1" 2>/var/log/vnc.log +#exec sudo -u vncsvc -i /usr/bin/vncserver -fg -geometry $geometry :1 2>/var/log/vnc.log -- cgit v0.12 From ad32538bf7e22a19b6dd29121548ee5bfa06da8c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 2 Oct 2015 13:05:53 +0000 Subject: runitscripts: change mythbackend, supplemental-slave, xymon-client, xymon-server run runit can't term any sudo manages processes since 1.8.14.p3 --- abs/core/runit-scripts/PKGBUILD | 2 +- abs/core/runit-scripts/runitscripts/services/mythbackend/run | 5 +++-- abs/core/runit-scripts/runitscripts/services/supplemental-slave/run | 2 +- abs/core/runit-scripts/runitscripts/services/xymon-client/run | 6 +----- abs/core/runit-scripts/runitscripts/services/xymon-server/run | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 151eb90..df20d62 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=8.3 -pkgrel=10 +pkgrel=11 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runitscripts/services/mythbackend/run b/abs/core/runit-scripts/runitscripts/services/mythbackend/run index d97cf21..6e42c12 100755 --- a/abs/core/runit-scripts/runitscripts/services/mythbackend/run +++ b/abs/core/runit-scripts/runitscripts/services/mythbackend/run @@ -79,5 +79,6 @@ export HOME=/root stat_runit "Starting Primary MythBackend" fi - exec sudo -u mythtv /usr/bin/mythbackend -q --syslog local6 -# fi + #exec sudo -u mythtv /usr/bin/mythbackend -q --syslog local6 + exec su mythtv -c "/usr/bin/mythbackend -q --syslog local6" +# fi diff --git a/abs/core/runit-scripts/runitscripts/services/supplemental-slave/run b/abs/core/runit-scripts/runitscripts/services/supplemental-slave/run index 5be390d..7c15210 100755 --- a/abs/core/runit-scripts/runitscripts/services/supplemental-slave/run +++ b/abs/core/runit-scripts/runitscripts/services/supplemental-slave/run @@ -8,4 +8,4 @@ MYTH_RUN_STATUS="1" . /etc/profile stat_runit "Starting supplemental web client" cd /data/srv/httpd/cgi -exec sudo -u http "./slaveserve.py" 2>/var/log/supplemental-slave.log +exec chpst -u http "./slaveserve.py" 2>/var/log/supplemental-slave.log diff --git a/abs/core/runit-scripts/runitscripts/services/xymon-client/run b/abs/core/runit-scripts/runitscripts/services/xymon-client/run index fcd5093..c18bf18 100644 --- a/abs/core/runit-scripts/runitscripts/services/xymon-client/run +++ b/abs/core/runit-scripts/runitscripts/services/xymon-client/run @@ -53,8 +53,4 @@ MACHINE="`echo $MACHINEDOTS | sed -e 's/\./,/g'`" export MACHINE -sudo -u nobody MACHINE=$MACHINE XYMONCLIENTHOME=$XYMONCLIENTHOME $XYMONCLIENTHOME/bin/xymonlaunch --config=$XYMONCLIENTHOME/etc/clientlaunch.cfg --log=$XYMONCLIENTHOME/logs/clientlaunch.log --pidfile=$XYMONCLIENTHOME/logs/clientlaunch.$MACHINEDOTS.pid --no-daemon - - - - +exec chpst -u nobody $XYMONCLIENTHOME/bin/xymonlaunch --config=$XYMONCLIENTHOME/etc/clientlaunch.cfg --log=$XYMONCLIENTHOME/logs/clientlaunch.log --pidfile=$XYMONCLIENTHOME/logs/clientlaunch.$MACHINEDOTS.pid --no-daemon diff --git a/abs/core/runit-scripts/runitscripts/services/xymon-server/run b/abs/core/runit-scripts/runitscripts/services/xymon-server/run index 6198543..c2053b1 100644 --- a/abs/core/runit-scripts/runitscripts/services/xymon-server/run +++ b/abs/core/runit-scripts/runitscripts/services/xymon-server/run @@ -6,4 +6,4 @@ export TERM=linux stat_runit "Starting xymon server" -exec sudo -u nobody /home/xymon/server/bin/xymonlaunch --config=/home/xymon/server/etc/tasks.cfg --env=/home/xymon/server/etc/xymonserver.cfg --log=/var/log/hobbit/xymonlaunch.log --pidfile=/var/log/hobbit/xymonlaunch.pid --no-daemon +exec chpst -u nobody /home/xymon/server/bin/xymonlaunch --config=/home/xymon/server/etc/tasks.cfg --env=/home/xymon/server/etc/xymonserver.cfg --log=/var/log/hobbit/xymonlaunch.log --pidfile=/var/log/hobbit/xymonlaunch.pid --no-daemon -- cgit v0.12 From 9e3af8b0450a452bc91c67a22f215d325b85def1 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 2 Oct 2015 13:19:33 +0000 Subject: LinHES-system: balance_storage.py: move check for files to find most full group --- abs/core/LinHES-system/PKGBUILD | 4 ++-- abs/core/LinHES-system/balance_storage.py | 22 ++++++++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 67f0c19..014f235 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.3 -pkgrel=14 +pkgrel=15 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -98,7 +98,7 @@ md5sums=('76842f8cff548d2c1289e0992a8b84dd' '74e17d6f7453c52d56fecaed5c3f6ad5' '47e093e8cfe4b5b96602358e1f540832' '63bbc62240f46a9997eaae4a84b09b76' - '2aa1a285161c8bf3e2ab16ca9e511b00' + 'd67a034fa1d8f253f42982f27a8d88ff' '2c005d95312018bef80092136f80f254' 'c8db6a83ecc089ea37ab7fcb0f7a01cf' 'ca63946920ba33de1f15abda83e74e40' diff --git a/abs/core/LinHES-system/balance_storage.py b/abs/core/LinHES-system/balance_storage.py index a6995ca..5556fd0 100755 --- a/abs/core/LinHES-system/balance_storage.py +++ b/abs/core/LinHES-system/balance_storage.py @@ -73,19 +73,29 @@ if __name__ == '__main__': continue freePcent = getFreePercentForDir(directory) freeSize = getFreeSpaceForDir(directory) - # Check if SG has any mpg or nuv files and if so add to SGDIRSdata - if len(glob.glob1(directory,"*.mpg")) or len(glob.glob1(directory,"*.nuv")): - SGDIRSdata.append([directory, freePcent, freeSize]) - print " " + directory + " - " + str(freePcent * 100) + "%" + SGDIRSdata.append([directory, freePcent, freeSize]) + print " " + directory + " - " + str(freePcent * 100) + "%" # Sort data on percent free SGDIRSdata = sorted(SGDIRSdata, reverse=True, key=operator.itemgetter(1)) #print SGDIRSdata - mostFull = SGDIRSdata[0] + + # Check if SG has any mpg or nuv files + i=0 + for dir in SGDIRSdata: + mostFull = SGDIRSdata[i] + i=i+1 + if len(glob.glob1(mostFull[0],"*.mpg")) or len(glob.glob1(mostFull[0],"*.nuv")): + break + else: + if i == 1: + print "------------------------------------------------" + print " " + mostFull[0] + " - NO files to move" + leastFull = SGDIRSdata[-1] print "------------------------------------------------" - print "Most Used Storage Group Directory: " + print "Most Used Storage Group Directory with files to move: " print " " + str(mostFull[0]) + " - " + str(mostFull[1] * 100) + "%" print "Least Used Storage Group Directory: " print " " + str(leastFull[0]) + " - " + str(leastFull[1] * 100) + "%" -- cgit v0.12 From 50ea25a17ac72da857c9ca47118b4853216a630b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 5 Oct 2015 22:21:46 +0000 Subject: xymon: hobbit_notify.sh: don't show memory criticals on OSD --- abs/core/xymon/PKGBUILD | 4 ++-- abs/core/xymon/hobbit_notify.sh | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD index b56c668..7197a24 100755 --- a/abs/core/xymon/PKGBUILD +++ b/abs/core/xymon/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=xymon pkgname=('xymonserver' 'xymonclient') pkgver=4.3.17 -pkgrel=19 +pkgrel=20 pkgdesc="Xymon is a system for monitoring of hosts and networks" license="GPL" arch=('i686' 'x86_64') @@ -176,7 +176,7 @@ md5sums=('d8d119a777e7b7204d1292fb27314312' '0c808fa12672289f86b0651545381308' '0469d775db9fdd18ea95dd41937ada82' '0757294eec13771f8e63da23cf066796' - '3126ef4e5e82f096cf5ecb4dce4e2306' + 'b1d5592fa92ef71303621964e84c2b9e' '22d4c9065fd959efe82f121dcb511305' '9af2ad60ac4c3cb653754618f603e311' '313b11e7a22c3c08fb2afaadbfb46d87' diff --git a/abs/core/xymon/hobbit_notify.sh b/abs/core/xymon/hobbit_notify.sh index 9028fb0..39e4d43 100644 --- a/abs/core/xymon/hobbit_notify.sh +++ b/abs/core/xymon/hobbit_notify.sh @@ -66,19 +66,23 @@ case x$BBSVCNAME in yellow ) msg_func_out "A disk on $BBHOSTNAME is almost full" ;; - esac - ;; + esac + ;; + + xmemory) + #do nothing for memory + ;; - xfunc) + xfunc) if [ "x$hostname" = "x$BBHOSTNAME" ] then - msg_local_out "System can not communicate with itself (func) |alert" + msg_local_out "System can not communicate with itself (func)|alert" else msg_func_out "$hostname can not communicate with $BBHOSTNAME (func)|alert" fi ;; - *) + *) #catch all for everything else msg_func_out "Condition $BBCOLORLEVEL $BBSVCNAME on $BBHOSTNAME\nSee the system health webpage.|alert" ;; -- cgit v0.12 From 713f54202af8b61e0b84e70805bd58c11dd40a9a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 5 Oct 2015 23:07:22 +0000 Subject: linux: update to 3.18.22 --- abs/core/linux/PKGBUILD | 6 +++--- abs/core/linux/config.x86_64 | 1 + abs/core/linux/linux.install.pkg | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/abs/core/linux/PKGBUILD b/abs/core/linux/PKGBUILD index 901f265..2a4c690 100644 --- a/abs/core/linux/PKGBUILD +++ b/abs/core/linux/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=linux # Build stock -ARCH kernel #pkgbase=linux-custom # Build kernel with a different name _srcname=linux-3.18 -pkgver=3.18.14 +pkgver=3.18.22 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -295,8 +295,8 @@ done # vim:set ts=8 sts=2 sw=2 et: md5sums=('9e854df51ca3fef8bfe566dbd7b89241' - '92994dfdfd9787db3c0f845c3bc18e51' + '04e193d2b3f4d8e3524422534ffe27f2' 'ed1d392d9feb77674e7a71c3eda060e6' - 'c2d4e432167a2bbd43ad09e07fc73e1e' + 'ce7ffe528b5920dc1e8b3d7229a66639' 'eb14dcfd80c00852ef81ded6e826826a' 'df7fceae6ee5d7e7be7b60ecd7f6bb35') diff --git a/abs/core/linux/config.x86_64 b/abs/core/linux/config.x86_64 index 895756e..e7efb1a 100644 --- a/abs/core/linux/config.x86_64 +++ b/abs/core/linux/config.x86_64 @@ -4834,6 +4834,7 @@ CONFIG_HID_LCPOWER=m CONFIG_HID_LENOVO=m CONFIG_HID_LOGITECH=m CONFIG_HID_LOGITECH_DJ=m +CONFIG_HID_LOGITECH_HIDPP=m CONFIG_LOGITECH_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y CONFIG_LOGIG940_FF=y diff --git a/abs/core/linux/linux.install.pkg b/abs/core/linux/linux.install.pkg index 804bd1d..fa5ccff 100644 --- a/abs/core/linux/linux.install.pkg +++ b/abs/core/linux/linux.install.pkg @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.18.14-1-ARCH +KERNEL_VERSION=3.18.22-1-ARCH post_install () { # updating module dependencies -- cgit v0.12 From 00d5fbca564109ce504ed918538ffa60882be90b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 5 Oct 2015 23:08:42 +0000 Subject: nvidia & nvidia-utils: update to 355.11 --- abs/core/nvidia-utils/PKGBUILD | 17 ++++++----- abs/core/nvidia/PKGBUILD | 61 +++++++++++++++++++++++++------------ abs/core/nvidia/__changelog | 1 - abs/core/nvidia/nv-drm-343.36.patch | 14 --------- abs/core/nvidia/nvidia-dkms.install | 30 ++++++++++++++++++ 5 files changed, 82 insertions(+), 41 deletions(-) delete mode 100644 abs/core/nvidia/nv-drm-343.36.patch create mode 100644 abs/core/nvidia/nvidia-dkms.install diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD index 32ffbd6..47ce055 100644 --- a/abs/core/nvidia-utils/PKGBUILD +++ b/abs/core/nvidia-utils/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: James Rayner pkgbase=nvidia-utils pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia') -pkgver=352.09 +pkgver=355.11 pkgrel=1 arch=('i686' 'x86_64') url="http://www.nvidia.com/" @@ -12,8 +12,8 @@ license=('custom') options=('!strip') source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -sha1sums=('1cc711e6c419ee03b0656cb4004aeb2e3effb4bd' - '3ab419b8ec442b6f59ff17d7aa53f72f66021810') +sha1sums=('5e944003366c2ec701ba5e0faf897cc1fd0defbf' + 'e21f03e2f641e8b36ac6f2df0f632b1ce5b83d63') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" @@ -67,9 +67,9 @@ package_nvidia-libgl() { ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.1" ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so" - ln -s "/usr/lib/nvidia/libEGL.so.${pkgver}" "${pkgdir}/usr/lib/libEGL.so.${pkgver}" - ln -s "libEGL.so.${pkgver}" "${pkgdir}/usr/lib/libEGL.so.1" - ln -s "libEGL.so.${pkgver}" "${pkgdir}/usr/lib/libEGL.so" + ln -s "/usr/lib/nvidia/libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so.1" + ln -s "libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so.$pkgver" + ln -s "libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so" ln -s "/usr/lib/nvidia/libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv1_CM.so.${pkgver}" ln -s "libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv1_CM.so.1" @@ -101,9 +101,12 @@ package_nvidia-utils() { # OpenGL libraries install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGL.so.${pkgver}" - install -D -m755 "libEGL.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libEGL.so.${pkgver}" + install -D -m755 "libEGL.so.1" "${pkgdir}/usr/lib/nvidia/libEGL.so.1" + install -D -m755 "libEGL_nvidia.so.0" "${pkgdir}/usr/lib/libEGL_nvidia.so.0" install -D -m755 "libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.${pkgver}" install -D -m755 "libGLESv2.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGLESv2.so.${pkgver}" + install -D -m755 "libOpenGL.so.0" "${pkgdir}/usr/lib/libOpenGL.so.0" + install -D -m755 "libGLdispatch.so.0" "${pkgdir}/usr/lib/libGLdispatch.so.0" # OpenGL core library install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}" diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD index c2264cf..68faa0e 100644 --- a/abs/core/nvidia/PKGBUILD +++ b/abs/core/nvidia/PKGBUILD @@ -1,50 +1,59 @@ # $Id$ # Maintainer: Sven-Hendrik Haase -# Maintainer: Thomas Baechler +# Maintainer: Felix Yan +# Contributor: Thomas Baechler -pkgname=nvidia -pkgver=352.09 +pkgbase=nvidia +pkgname=(nvidia nvidia-dkms) +pkgver=355.11 _extramodules=extramodules-3.18-ARCH -pkgrel=1 +pkgrel=3 pkgdesc="NVIDIA drivers for linux" arch=('i686' 'x86_64') url="http://www.nvidia.com/" -depends=('linux>=3.18' 'linux<3.19' "nvidia-libgl" "nvidia-utils=${pkgver}") -makedepends=('linux-headers>=3.18' 'linux-headers<3.19') +makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=3.18' 'linux-headers<3.19') license=('custom') -install=nvidia.install options=(!strip) -source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" - "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums=('0e009686400c522209eaa8ab835ff81f' - 'eb5ad6a07dc03e0a19d5f6fa069c494b') +source_i686="ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" +source_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" +md5sums_i686='16d143ccafe99328a2ca8e5a396fd4bc' +md5sums_x86_64='30133d89690f4683c4e289ec6c0247dc' [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" -prepare() { +prepare() { sh "${_pkg}.run" --extract-only cd "${_pkg}" # patches here + + cp -a kernel kernel-dkms + cd kernel-dkms + sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf + sed -i 's/__JOBS/`nproc`/' dkms.conf + sed -i 's/__DKMS_MODULES//' dkms.conf + sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\ +DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\ +BUILT_MODULE_NAME[1]="nvidia-uvm"\ +DEST_MODULE_LOCATION[1]="/kernel/drivers/video"' dkms.conf } build() { _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" cd "${_pkg}"/kernel make SYSSRC=/usr/lib/modules/"${_kernver}/build" module - - if [[ "$CARCH" = "x86_64" ]]; then - cd uvm - make SYSSRC=/usr/lib/modules/"${_kernver}/build" module - fi } -package() { +package_nvidia() { + pkgdesc="NVIDIA drivers for linux" + depends=('linux>=3.18' 'linux<3.19' "nvidia-utils=${pkgver}" 'libgl') + install=nvidia.install + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" if [[ "$CARCH" = "x86_64" ]]; then - install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \ + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko" fi @@ -53,3 +62,17 @@ package() { echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" } + +package_nvidia-dkms() { + pkgdesc="NVIDIA driver sources for linux" + depends=('dkms' "nvidia-utils=$pkgver") + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + conflicts+=('nvidia') + install=nvidia-dkms.install + + cd ${_pkg} + install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} + cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}" + echo 'blacklist nouveau' > "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" +} diff --git a/abs/core/nvidia/__changelog b/abs/core/nvidia/__changelog index 8bc0490..a8f8250 100644 --- a/abs/core/nvidia/__changelog +++ b/abs/core/nvidia/__changelog @@ -1,2 +1 @@ -PKGBUILD: use dep "nvidia-libgl" instead of libgl nvidia.install: post_upgrade add root cron job to run xconfig.cron diff --git a/abs/core/nvidia/nv-drm-343.36.patch b/abs/core/nvidia/nv-drm-343.36.patch deleted file mode 100644 index 4f96201..0000000 --- a/abs/core/nvidia/nv-drm-343.36.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c -index c0b41a0..700c193 100644 ---- a/kernel/nv-drm.c -+++ b/kernel/nv-drm.c -@@ -128,6 +128,8 @@ static struct drm_driver nv_drm_driver = { - .gem_prime_vmap = nv_gem_prime_vmap, - .gem_prime_vunmap = nv_gem_prime_vunmap, - -+ .set_busid = drm_pci_set_busid, -+ - .name = "nvidia-drm", - .desc = "NVIDIA DRM driver", - .date = "20130102", - diff --git a/abs/core/nvidia/nvidia-dkms.install b/abs/core/nvidia/nvidia-dkms.install new file mode 100644 index 0000000..f43e9a0 --- /dev/null +++ b/abs/core/nvidia/nvidia-dkms.install @@ -0,0 +1,30 @@ +#/bin/sh + +# arg 1: the new package version +post_install() { + dkms add nvidia/${1%-*} + cat << EOF +==> To build and install your modules run: dkms install nvidia/${1%-*} +==> To do this automatically at startup run: systemctl enable dkms.service +EOF +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# 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() { + # Remove modules using dkms + [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true +} + +# vim:set ts=2 sw=2 ft=sh et: \ No newline at end of file -- cgit v0.12 From 9933b96cc2db395780370219b805feef69c0774f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 5 Oct 2015 23:40:07 +0000 Subject: nvidia-340xx & nvidia-340xx-utils: update to 340.93 --- abs/core/nvidia-340xx-utils/PKGBUILD | 9 +++-- abs/core/nvidia-340xx/PKGBUILD | 52 +++++++++++++++++-------- abs/core/nvidia-340xx/nvidia-340xx-dkms.install | 30 ++++++++++++++ abs/core/nvidia-340xx/nvidia-340xx.install | 6 +-- 4 files changed, 73 insertions(+), 24 deletions(-) create mode 100644 abs/core/nvidia-340xx/nvidia-340xx-dkms.install diff --git a/abs/core/nvidia-340xx-utils/PKGBUILD b/abs/core/nvidia-340xx-utils/PKGBUILD index 5edb627..d9213a3 100644 --- a/abs/core/nvidia-340xx-utils/PKGBUILD +++ b/abs/core/nvidia-340xx-utils/PKGBUILD @@ -2,18 +2,19 @@ # Maintainer: Sven-Hendrik Haase # Maintainer: Thomas Baechler # Contributor: James Rayner + pkgbase=nvidia-340xx-utils pkgname=('nvidia-340xx-utils' 'nvidia-340xx-libgl' 'opencl-nvidia-340xx') -pkgver=340.76 -pkgrel=2 +pkgver=340.93 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.nvidia.com/" license=('custom') options=('!strip') source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -sha1sums=('1335af174324f5c752388110e65c3c51beea729b' - '2df59750d9fdeed613e84379108fb2bec67afd14') +sha1sums=('650564caa2937c8306cfdcfb6c97b1e206fdffb3' + '05ef4b8b01aa532d89cef309f268ae1c7beffdc0') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" diff --git a/abs/core/nvidia-340xx/PKGBUILD b/abs/core/nvidia-340xx/PKGBUILD index d20c718..d03db5c 100644 --- a/abs/core/nvidia-340xx/PKGBUILD +++ b/abs/core/nvidia-340xx/PKGBUILD @@ -1,25 +1,24 @@ -# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $ -# Maintainer : Thomas Baechler +# $Id$ +# Maintainer: Felix Yan +# Contributor: Thomas Baechler -pkgname=nvidia-340xx -pkgver=340.76 +pkgbase=nvidia-340xx +pkgname=(nvidia-340xx nvidia-340xx-dkms) +pkgver=340.93 _extramodules=extramodules-3.18-ARCH -pkgrel=6 -pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" +pkgrel=3 arch=('i686' 'x86_64') url="http://www.nvidia.com/" -depends=('linux>=3.18' 'linux<3.19' "nvidia-340xx-libgl" "nvidia-340xx-utils=${pkgver}") -makedepends=('linux-headers>=3.18' 'linux-headers<3.19') +makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=3.18' 'linux-headers<3.19') conflicts=('nvidia') license=('custom') -install=${pkgname}.install options=(!strip) -source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" - "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" - nv-drm.patch) -md5sums=('8064c0a0998c3e7ee3c98ac1832b8194' - '440df290e213280d6e20d4d4be6f8b4c' - '79671a27131da619a33eb02ed0c2c031') +source=(nv-drm.patch) +source_i686+=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") +source_x86_64+=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") +md5sums=('79671a27131da619a33eb02ed0c2c031') +md5sums_i686=('4a7edf6838a80c77a57fb6f6ec7f0437') +md5sums_x86_64=('cb80e3f1cb6f2fb6e6eab35fad0884e4') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" @@ -40,7 +39,12 @@ build() { make SYSSRC=/usr/lib/modules/"${_kernver}/build" module } -package() { +package_nvidia-340xx() { + pkgdesc="NVIDIA drivers for linux, 340xx legacy branch" + depends=('linux>=3.18' 'linux<3.19' 'libgl' "nvidia-340xx-utils=${pkgver}") + conflict+=('nvidia-340xx-dkms') + install=nvidia-340xx.install + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \ @@ -49,3 +53,19 @@ package() { install -d -m755 "${pkgdir}/usr/lib/modprobe.d" echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" } + +package_nvidia-340xx-dkms() { + pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch" + depends=('dkms' "nvidia-340xx-utils=$pkgver") + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + conflicts+=('nvidia-340xx') + install=nvidia-340xx-dkms.install + + cd ${_pkg} + make -C kernel clean + install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} + cp -dr --no-preserve='ownership' kernel "${pkgdir}"/usr/src/nvidia-${pkgver} + echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf + cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> "${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf +} diff --git a/abs/core/nvidia-340xx/nvidia-340xx-dkms.install b/abs/core/nvidia-340xx/nvidia-340xx-dkms.install new file mode 100644 index 0000000..3d9b74d --- /dev/null +++ b/abs/core/nvidia-340xx/nvidia-340xx-dkms.install @@ -0,0 +1,30 @@ +#/bin/sh + +# arg 1: the new package version +post_install() { + dkms add nvidia/${1%-*} + cat << EOF +==> To build and install your modules run: dkms install nvidia/${1%-*} +==> To do this automatically at startup run: systemctl enable dkms.service +EOF +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# 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() { + # Remove modules using dkms + [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/abs/core/nvidia-340xx/nvidia-340xx.install b/abs/core/nvidia-340xx/nvidia-340xx.install index a83edad..6d90420 100644 --- a/abs/core/nvidia-340xx/nvidia-340xx.install +++ b/abs/core/nvidia-340xx/nvidia-340xx.install @@ -5,11 +5,9 @@ post_install() { } post_upgrade() { - EXTRAMODULES='extramodules-3.18-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + post_install } post_remove() { - EXTRAMODULES='extramodules-3.18-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + post_install } -- cgit v0.12 From fdf6e7ebb6592b07a5d4df1f98d3fff9c96c9b09 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 5 Oct 2015 23:47:57 +0000 Subject: nvidia-304xx & nvidia-304xx-utils: update to 304.128 --- abs/core/nvidia-304xx-utils/PKGBUILD | 13 +++--- abs/core/nvidia-304xx/PKGBUILD | 58 +++++++++++++++---------- abs/core/nvidia-304xx/nvidia-304xx-dkms.install | 30 +++++++++++++ abs/core/nvidia-304xx/nvidia-304xx.install | 13 ++++++ abs/core/nvidia-304xx/nvidia.install | 15 ------- 5 files changed, 84 insertions(+), 45 deletions(-) create mode 100644 abs/core/nvidia-304xx/nvidia-304xx-dkms.install create mode 100644 abs/core/nvidia-304xx/nvidia-304xx.install delete mode 100644 abs/core/nvidia-304xx/nvidia.install diff --git a/abs/core/nvidia-304xx-utils/PKGBUILD b/abs/core/nvidia-304xx-utils/PKGBUILD index 95a9c50..e6196b7 100644 --- a/abs/core/nvidia-304xx-utils/PKGBUILD +++ b/abs/core/nvidia-304xx-utils/PKGBUILD @@ -1,27 +1,27 @@ # $Id$ -# Maintainer: Felix Yan +# Maintainer: Felix Yan # Contributor: Andreas Radke pkgbase=nvidia-304xx-utils pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx') -pkgver=304.125 +pkgver=304.128 pkgrel=1 arch=('i686' 'x86_64') url="http://www.nvidia.com/" license=('custom') makedepends=('zlib') options=('!strip') +source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") +source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") +sha512sums_i686=('9822b61872ae28751cd5c41714048612f7ddf0fd9f02e6340598150afbea43dddeba88482a8c88bcf893b015d14b2a2cf5157ed60583da57fdfe183ecb620c90') +sha512sums_x86_64=('fa7a81edaba92561314b4874635e639607cf2f9bcde10609764528a35bb2d4a6916c7ea2be2cdcb9e2abf5ac7455f54287ff7218f3e57acc67bdeae18a208db2') if [ "$CARCH" = "i686" ]; then _arch='x86' _pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('bc3b0ac291fa998d5109a6f7e94fb2d4') elif [ "$CARCH" = "x86_64" ]; then _arch='x86_64' _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" - source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('291d41ccdbcc08f752a38f9e0a7eeea0') fi create_links() { @@ -160,4 +160,3 @@ package_nvidia-304xx-utils() { create_links } -md5sums=('291d41ccdbcc08f752a38f9e0a7eeea0') diff --git a/abs/core/nvidia-304xx/PKGBUILD b/abs/core/nvidia-304xx/PKGBUILD index 1ef54d9..909491a 100644 --- a/abs/core/nvidia-304xx/PKGBUILD +++ b/abs/core/nvidia-304xx/PKGBUILD @@ -2,34 +2,26 @@ # Maintainer: Felix Yan # Contributor: Thomas Baechler -pkgname=nvidia-304xx -pkgver=304.125 +pkgbase=nvidia-304xx +pkgname=(nvidia-304xx nvidia-304xx-dkms) +pkgver=304.128 _extramodules=extramodules-3.18-ARCH -pkgrel=9 -pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" +pkgrel=3 arch=('i686' 'x86_64') url="http://www.nvidia.com/" -depends=('linux>=3.18' 'linux<3.19' 'nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}") -makedepends=('linux-headers>=3.18' 'linux-headers<3.19') +makedepends=('nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux' 'linux-headers>=3.18' 'linux-headers<3.19') conflicts=('nvidia') license=('custom') -install=nvidia.install options=(!strip) +source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" + "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" + 'nv-drm.patch') +sha512sums=('9822b61872ae28751cd5c41714048612f7ddf0fd9f02e6340598150afbea43dddeba88482a8c88bcf893b015d14b2a2cf5157ed60583da57fdfe183ecb620c90' + 'fa7a81edaba92561314b4874635e639607cf2f9bcde10609764528a35bb2d4a6916c7ea2be2cdcb9e2abf5ac7455f54287ff7218f3e57acc67bdeae18a208db2' + 'aaa36ef7179acdc86850381de145a3aebab22273cd3c702a9d1343dc3415192c74a35da692312555f36193c5d46a1771ce07ea9508113cb9d0698873064aa19f') -if [ "$CARCH" = "i686" ]; then - _arch='x86' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('bc3b0ac291fa998d5109a6f7e94fb2d4') -elif [ "$CARCH" = "x86_64" ]; then - _arch='x86_64' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" - source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") - md5sums=('291d41ccdbcc08f752a38f9e0a7eeea0') -fi - -source+=('nv-drm.patch') -md5sums+=('79671a27131da619a33eb02ed0c2c031') +[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" +[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" prepare() { cd "${srcdir}" @@ -45,13 +37,33 @@ build() { make SYSSRC=/usr/lib/modules/"${_kernver}/build" module } -package() { +package_nvidia-304xx() { + pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" + depends=('linux>=3.18' 'linux<3.19' 'libgl' "nvidia-304xx-utils=${pkgver}") + conflicts+=('nvidia-304xx-dkms') + install=nvidia-304xx.install + install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" install -d -m755 "${pkgdir}/usr/lib/modprobe.d" echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/${pkgname}.install" gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" # the license file is part of nvidia-304xx-utils - the module depends on it, so we don't ship it another time. } + +package_nvidia-304xx-dkms() { + pkgdesc="NVIDIA driver sources for linux, 304xx legacy branch" + depends=('dkms' "nvidia-304xx-utils=$pkgver") + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + conflicts+=('nvidia-304xx') + install=nvidia-304xx-dkms.install + + cd ${_pkg} + make -C kernel clean + install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src} + cp -dr --no-preserve='ownership' kernel "${pkgdir}"/usr/src/nvidia-${pkgver} + echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf +} diff --git a/abs/core/nvidia-304xx/nvidia-304xx-dkms.install b/abs/core/nvidia-304xx/nvidia-304xx-dkms.install new file mode 100644 index 0000000..3d9b74d --- /dev/null +++ b/abs/core/nvidia-304xx/nvidia-304xx-dkms.install @@ -0,0 +1,30 @@ +#/bin/sh + +# arg 1: the new package version +post_install() { + dkms add nvidia/${1%-*} + cat << EOF +==> To build and install your modules run: dkms install nvidia/${1%-*} +==> To do this automatically at startup run: systemctl enable dkms.service +EOF +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# 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() { + # Remove modules using dkms + [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/abs/core/nvidia-304xx/nvidia-304xx.install b/abs/core/nvidia-304xx/nvidia-304xx.install new file mode 100644 index 0000000..6d90420 --- /dev/null +++ b/abs/core/nvidia-304xx/nvidia-304xx.install @@ -0,0 +1,13 @@ +post_install() { + EXTRAMODULES='extramodules-3.18-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use nvidia module, reboot the system.' +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/abs/core/nvidia-304xx/nvidia.install b/abs/core/nvidia-304xx/nvidia.install deleted file mode 100644 index a83edad..0000000 --- a/abs/core/nvidia-304xx/nvidia.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.18-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use nvidia module, reboot the system.' -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.18-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.18-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} -- cgit v0.12 From f08d73e9b1b249ab07e134e86ddb7916b75fa7b3 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 6 Oct 2015 00:00:33 +0000 Subject: Kernel_rebuild_list: update --- abs/core/Kernel_rebuild_list | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/abs/core/Kernel_rebuild_list b/abs/core/Kernel_rebuild_list index 2a1ae79..e096840 100644 --- a/abs/core/Kernel_rebuild_list +++ b/abs/core/Kernel_rebuild_list @@ -1,6 +1,5 @@ -As of 3.18.4 +As of 3.18.22 linux -lirc nvidia nvidia-340xx nvidia-304xx -- cgit v0.12 From 9cea1a6c7df291d661803c339814536157227926 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 6 Oct 2015 00:01:27 +0000 Subject: ceton_infinitv: rebuild for kernel --- abs/core/ceton_infinitv/PKGBUILD | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/abs/core/ceton_infinitv/PKGBUILD b/abs/core/ceton_infinitv/PKGBUILD index a95a638..3a9ed39 100755 --- a/abs/core/ceton_infinitv/PKGBUILD +++ b/abs/core/ceton_infinitv/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: Cecil Watson pkgname=ceton_infinitv -_kernver=3.18.14-1-ARCH +_kernver=3.18.22-1-ARCH _extramods="extramodules-3.18-ARCH" pkgver=2013_0326_2226 -pkgrel=10 +pkgrel=11 usb_pkgver=0.1.0 pkgdesc="Drivers for Ceton InfiniTV4 - pci/usb " arch=('i686' 'x86_64') @@ -26,13 +26,15 @@ build() { patch -p1 -i $srcdir/no-date-time-warn.patch make KERNEL_VERSION=$_kernver - cd $startdir/src/infinitv-usbd-$usb_pkgver + cd $srcdir/infinitv-usbd-$usb_pkgver LDFLAGS="/usr/lib/libgthread-2.0.so" ./configure --prefix=/usr make - make DESTDIR=${pkgdir} install } package() { + cd $srcdir/infinitv-usbd-$usb_pkgver + make DESTDIR=${pkgdir} install + install -Dm644 ${srcdir}/ceton_infinitv_linux_driver/ctn91xx.ko ${pkgdir}/usr/lib/modules/$_extramods/ctn91xx.ko gzip -9 ${pkgdir}/usr/lib/modules/$_extramods/ctn91xx.ko install -Dm644 ${srcdir}/98-ctn91xx.rules ${pkgdir}/etc/udev/rules.d/98-ctn91xx.rules -- cgit v0.12 From e99bdd59503e594129d079904f7815c21dea8078 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 6 Oct 2015 18:13:15 +0000 Subject: LinHES-system: idle.py: add option to check if Samba files are in use --- abs/core/LinHES-system/PKGBUILD | 4 ++-- abs/core/LinHES-system/idle.py | 26 +++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 014f235..cd87ee8 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.3 -pkgrel=15 +pkgrel=16 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -122,7 +122,7 @@ md5sums=('76842f8cff548d2c1289e0992a8b84dd' '8b0298f70f97cc1dc2a58b9a73c64bd3' '716710e0db42147b079c9ec1c7080efa' 'cd28dd67a78f3b7da704e31db0298916' - '69ecfe682f1b61c2c4c95d890b9f523c' + 'bc34ef7da85dd6228d15771cb2ecf870' 'a94fe6d980f4b810f2e2ae5352084b39' '384956b4fd9bf40907856bab0e67b169' 'f4ce577e2ab1b6dbf9def46a8ab86e2d' diff --git a/abs/core/LinHES-system/idle.py b/abs/core/LinHES-system/idle.py index 4575e7d..ddea479 100755 --- a/abs/core/LinHES-system/idle.py +++ b/abs/core/LinHES-system/idle.py @@ -201,6 +201,23 @@ def userlogins_check(cmdargs): else: return True +def sambafiles_check(cmdargs): + if (cmdargs.sambafiles): + u=False + msg(cmdargs," Checking if Samba files are in use...") + try: + smbstatus=subprocess.check_output(["smbstatus", "-L"]) + except: + smbstatus="No locked files" + if "No locked files" in smbstatus: + msg(cmdargs," Samba files are NOT in use.") + return True + else: + msg(cmdargs," Samba files are in use.") + return False + else: + return True + def mythfe_check(cmdargs,cursor,mythDB): #checks to see if a frontend is considered idle # True means FE is idle @@ -259,6 +276,7 @@ def usage(): determine if it is idle: - (option -g) users are logged in return busy ignores mythtv (:0) for busy + - (option -f) Samba files are in use return busy - (option -l) mythshutdown is locked return busy - (option -d) in a daily wake period or about to start a daily wake period return busy @@ -282,7 +300,8 @@ def usage(): def main(args=[False]): parser = argparse.ArgumentParser() parser.add_argument('-d', '--daily', action='store_true', help='Include daily wake & about to start wake in system busy. (default: daily wake & about to start wake is system idle)') - parser.add_argument('-g', '--logins', action='store_true', help='Include user logins in system busy. ignores mythtv (:0) in system busy.') + parser.add_argument('-g', '--logins', action='store_true', help='Include user logins in system busy. Ignores mythtv (:0) in system busy.') + parser.add_argument('-f', '--sambafiles', action='store_true', help='Include Samba files in use in system busy.') parser.add_argument('-l', '--lock', action='store_true', help='Include mythshutdown lock in system busy. (default: mythshutdown lock is system idle)') parser.add_argument('-r', '--runningfe', action='store_true', help='Include running mythfrontends in system busy. (default: running mythfrontends are system idle)') parser.add_argument('-s', '--silent', action='store_true', help='Run without printing output. Recommended for use in cron jobs or scripts.') @@ -303,6 +322,11 @@ def main(args=[False]): else: idle = False + if (idle and sambafiles_check(cmdargs)): + idle = True + else: + idle = False + try: from MythTV import MythDB mythDB = MythDB() -- cgit v0.12 From 1160b48c12b6661eec18ddb5818ddc97e3c178fa Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 6 Oct 2015 18:21:07 +0000 Subject: LinHES-system: idle.py: remove unneeded variable. --- abs/core/LinHES-system/PKGBUILD | 4 ++-- abs/core/LinHES-system/idle.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index cd87ee8..e4ca5e2 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.3 -pkgrel=16 +pkgrel=17 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -122,7 +122,7 @@ md5sums=('76842f8cff548d2c1289e0992a8b84dd' '8b0298f70f97cc1dc2a58b9a73c64bd3' '716710e0db42147b079c9ec1c7080efa' 'cd28dd67a78f3b7da704e31db0298916' - 'bc34ef7da85dd6228d15771cb2ecf870' + 'e9f545c3bcf9c85b45496c281fc6a1b8' 'a94fe6d980f4b810f2e2ae5352084b39' '384956b4fd9bf40907856bab0e67b169' 'f4ce577e2ab1b6dbf9def46a8ab86e2d' diff --git a/abs/core/LinHES-system/idle.py b/abs/core/LinHES-system/idle.py index ddea479..05dedac 100755 --- a/abs/core/LinHES-system/idle.py +++ b/abs/core/LinHES-system/idle.py @@ -203,7 +203,6 @@ def userlogins_check(cmdargs): def sambafiles_check(cmdargs): if (cmdargs.sambafiles): - u=False msg(cmdargs," Checking if Samba files are in use...") try: smbstatus=subprocess.check_output(["smbstatus", "-L"]) -- cgit v0.12 From ea40cf061878a535bbc9dc287bf1ceeccb2c21dc Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 7 Oct 2015 18:20:15 +0000 Subject: plex-media-server: update to 0.9.12.13.1464 --- abs/extra/plex-media-server/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/extra/plex-media-server/PKGBUILD b/abs/extra/plex-media-server/PKGBUILD index 942a5f0..fe1dfae 100644 --- a/abs/extra/plex-media-server/PKGBUILD +++ b/abs/extra/plex-media-server/PKGBUILD @@ -7,8 +7,8 @@ # Contributor: Praekon pkgname=plex-media-server -pkgver=0.9.12.11.1406 -_pkgsum=8403350 +pkgver=0.9.12.13.1464 +_pkgsum=4ccd2ca pkgrel=1 pkgdesc='Plex Media Server' arch=('x86_64') @@ -58,4 +58,4 @@ md5sums=('b67fd10314ab756169ec963f710cb9e3' '34268b981e3b8c833a0e2270429232a6' 'bd703bc750b989a27edd590eb8c8e9d7' '506ec15815bba749a743780edd2323c8') -md5sums_x86_64=('70385a3a61f43efdead53075601b5880') +md5sums_x86_64=('d7715035e83e5eabe63482719fbc7968') -- cgit v0.12 From 8cde77bead8cdc72f8a8b4f7f70eb5e5eed3a8b3 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 12 Oct 2015 14:41:42 +0000 Subject: LinHES-system: checkXFSfrag.sh: ionice xfs_fsr --- abs/core/LinHES-system/PKGBUILD | 4 ++-- abs/core/LinHES-system/checkXFSfrag.sh | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index e4ca5e2..7469000 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.3 -pkgrel=17 +pkgrel=18 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -120,7 +120,7 @@ md5sums=('76842f8cff548d2c1289e0992a8b84dd' 'bacc813b48bafcc6fe906e5969930501' 'dedd3fcb1abec6361f4060d8149c7d6d' '8b0298f70f97cc1dc2a58b9a73c64bd3' - '716710e0db42147b079c9ec1c7080efa' + 'b4bb70650893c811c854d446cfa6ca6a' 'cd28dd67a78f3b7da704e31db0298916' 'e9f545c3bcf9c85b45496c281fc6a1b8' 'a94fe6d980f4b810f2e2ae5352084b39' diff --git a/abs/core/LinHES-system/checkXFSfrag.sh b/abs/core/LinHES-system/checkXFSfrag.sh index 74b73c4..709cdac 100755 --- a/abs/core/LinHES-system/checkXFSfrag.sh +++ b/abs/core/LinHES-system/checkXFSfrag.sh @@ -27,10 +27,11 @@ # 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. +e='/usr/bin/echo -e' # Use the echo command, not built-in. xfsfsr=/usr/bin/xfs_fsr # Set variable with the path to xfs_fsr. xfsdb=/usr/bin/xfs_db # Set variable with the path to xfs_db. -pctmax=15 # Set maxiumum frag percent needed for defrag. +ionice=/usr/bin/ionice # Set variable with the path to ionice. +pctmax=12 # 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. @@ -48,7 +49,7 @@ do $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. + $ionice -c3 $xfsfsr ${i} # Uncomment for quiet defrag. else $e "${i} is $percent2% fragmented and is below the fragmentation threshold of $pctmax%. Skipping." fi -- cgit v0.12 From 92236c4b22a3d51121656becbf08bc697ea6633b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 13 Oct 2015 18:26:08 +0000 Subject: google-chrome: update to 46.0.2490.71 --- 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 90c1136..330891f 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=45.0.2454.99 +pkgver=46.0.2490.71 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -26,8 +26,8 @@ source_i686=("google-chrome-${_channel}_${pkgver}_i386.deb::https://dl.google.co source_x86_64=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb") md5sums=('99fa93d5e7fb5d622cef0f9621f3ffa3' 'b7e752f549b215ac77f284b6486794b6') -md5sums_i686=('448666013ff876b49b2df6eff958afb8') -md5sums_x86_64=('4954ec432d2e15237eee69b361c7ade0') +md5sums_i686=('56e0fa8bd1554898e1ee2fc574170f4f') +md5sums_x86_64=('a793fb54d3f0e2f4fed153fbc18d010b') package() { msg2 "Extracting the data.tar.lzma..." @@ -50,7 +50,7 @@ package() { install -Dm644 eula_text.html "$pkgdir"/usr/share/licenses/google-chrome/eula_text.html msg2 "Fixing Chrome icon resolution..." - sed -i "/Exec=/i\StartupWMClass=Google-chrome" "$pkgdir"/usr/share/applications/google-chrome.desktop + sed -i "/Exec=/i\StartupWMClass=google-chrome" "$pkgdir"/usr/share/applications/google-chrome.desktop msg2 "Fixing permissions of documentation folder..." chmod 755 "$pkgdir"/usr/share/doc/google-chrome-$_channel/ -- cgit v0.12 From 61f19c1cc8b7272a8f6934dfad74ea1ca78db919 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 13 Oct 2015 19:43:56 +0000 Subject: xz: update to 5.2.2 --- abs/core/xz/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/abs/core/xz/PKGBUILD b/abs/core/xz/PKGBUILD index 945cc42..fb62b4c 100644 --- a/abs/core/xz/PKGBUILD +++ b/abs/core/xz/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: François Charette pkgname=xz -pkgver=5.0.7 +pkgver=5.2.2 pkgrel=1 pkgdesc='Library and command line tools for XZ and LZMA compressed files' arch=('i686' 'x86_64') @@ -12,8 +12,9 @@ license=('GPL' 'LGPL' 'custom') depends=('sh') source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz" "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig") -md5sums=('60449e1c9c0eabefc9c3166e325636e5' +md5sums=('7cf6a8544a7dae8e8106fdf7addfa28c' 'SKIP') +validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620') build() { cd ${srcdir}/${pkgname}-${pkgver} -- cgit v0.12 From c89a76aca5feb04cd44a0baf65ea219dead80dc3 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 16 Oct 2015 18:19:04 +0000 Subject: LinHES-config: mv_fileshare.py: add support to read in templates/nfs.shares to include custom nfs shares in /etc/exports --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/mv_fileshare.py | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 64ee3b3..54b6a83 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.3 -pkgrel=21 +pkgrel=22 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' @@ -174,7 +174,7 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff' '38665330aeb3a8bdf7be24857fe035bb' '80685e047993b00161be29e3580f3a40' 'b79fe6ef82b0b5e71d62806e773ed556' - '595663a2cb0b43c4ea3fb3dac915a3c8' + '3cb673adb83b6afa52cffaa621b9d96b' '781f161a79c3188a31c8615b8258b241' '888a6c57f272d9fa3e77e216a421562b' 'cdd5008ee77e67c1d51ad73a24612485' diff --git a/abs/core/LinHES-config/mv_fileshare.py b/abs/core/LinHES-config/mv_fileshare.py index 58c11d8..5844a2f 100755 --- a/abs/core/LinHES-config/mv_fileshare.py +++ b/abs/core/LinHES-config/mv_fileshare.py @@ -327,7 +327,6 @@ def setup_etc_exports(shares,data_config,servername,nfslist): templine = "%s %s" %(sharename,mountpoint) nfs_map_auto.append(templine) - #create the lists for both /etc/exports and nfs_map_auto for share in shares: if share == "/myth": @@ -354,6 +353,22 @@ def setup_etc_exports(shares,data_config,servername,nfslist): templine = nfs_auto_line %(servername,tempname,tempname) nfs_map_auto.append(templine) + #read in users templates/nfs.shares + logging.debug(" processing nfs.shares file") + nfsshares_file=data_config.MYTHHOME+"/templates/nfs.shares" + try: + f = open(nfsshares_file,"r") + for line in f.read().splitlines(): + if line.startswith("#"): + continue + item = line.split() + if len(line) <= 1 : + continue + logging.debug(" %s",line) + share_list.append(line) + except : + logging.critical(" Couldn't read %s",nfsshares_file) + new_exports=[] new_exports.append("#This file was generated by systemconfig.py -m fileshare") new_exports.append("#Use exportfs -arv to reread. \n\n") -- cgit v0.12 From 3d073a0659f457d7c0f60a5e0601450d6c491378 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 16 Oct 2015 19:26:46 +0000 Subject: mythtv & plugins: update to latest fixes --- abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index 7f1827c..3a2dfdd 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -2ad315894af9a7770b29dbec5d0ca56a84534f49 +3682a9a14783e81685af1f838ba7f3c9916e1746 diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 9f3145d..bdf5c10 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.5 -pkgrel=8 +pkgrel=9 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index 4d9cee6..62def00 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.5 -pkgrel=8 +pkgrel=9 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12 From 7af68adc8db354828f2be8e7322c3f9f6cd1efa1 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 30 Oct 2015 16:07:28 +0000 Subject: google-chrome: update to 46.0.2490.80 --- 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 330891f..53007d8 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=46.0.2490.71 +pkgver=46.0.2490.80 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -26,8 +26,8 @@ source_i686=("google-chrome-${_channel}_${pkgver}_i386.deb::https://dl.google.co source_x86_64=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb") md5sums=('99fa93d5e7fb5d622cef0f9621f3ffa3' 'b7e752f549b215ac77f284b6486794b6') -md5sums_i686=('56e0fa8bd1554898e1ee2fc574170f4f') -md5sums_x86_64=('a793fb54d3f0e2f4fed153fbc18d010b') +md5sums_i686=('33e2cde91b246ee0797e403a80429267') +md5sums_x86_64=('0427655c21f5f9bb30103ec6e517fab1') package() { msg2 "Extracting the data.tar.lzma..." -- cgit v0.12 From 08f96f5e87615b8be66dbb9581bcfb06bb876efa Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 30 Oct 2015 16:39:28 +0000 Subject: plex-media-server: update to 0.9.12.18.1520 --- abs/extra/plex-media-server/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/extra/plex-media-server/PKGBUILD b/abs/extra/plex-media-server/PKGBUILD index fe1dfae..427b608 100644 --- a/abs/extra/plex-media-server/PKGBUILD +++ b/abs/extra/plex-media-server/PKGBUILD @@ -7,8 +7,8 @@ # Contributor: Praekon pkgname=plex-media-server -pkgver=0.9.12.13.1464 -_pkgsum=4ccd2ca +pkgver=0.9.12.18.1520 +_pkgsum=6833552 pkgrel=1 pkgdesc='Plex Media Server' arch=('x86_64') @@ -58,4 +58,4 @@ md5sums=('b67fd10314ab756169ec963f710cb9e3' '34268b981e3b8c833a0e2270429232a6' 'bd703bc750b989a27edd590eb8c8e9d7' '506ec15815bba749a743780edd2323c8') -md5sums_x86_64=('d7715035e83e5eabe63482719fbc7968') +md5sums_x86_64=('ddd54db71e0df0417d9f8fcbabefcfd3') -- cgit v0.12 From cfb6b5af1d03dc3f20463b8eea58a48ab3196e2f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 30 Oct 2015 17:04:59 +0000 Subject: xf86-video-intel: update to 2.99.917+478+gdf72bc5 --- abs/core/xf86-video-intel/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/xf86-video-intel/PKGBUILD b/abs/core/xf86-video-intel/PKGBUILD index 8a5e734..e038e24 100644 --- a/abs/core/xf86-video-intel/PKGBUILD +++ b/abs/core/xf86-video-intel/PKGBUILD @@ -3,8 +3,8 @@ # Maintainer: Jan de Groot pkgname=xf86-video-intel -pkgver=2.99.917+364+gb24e758 -pkgrel=1 +pkgver=2.99.917+478+gdf72bc5 +pkgrel=2 epoch=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -27,7 +27,7 @@ conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSIO 'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy') groups=('xorg-drivers' 'xorg') #source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -source=('git://anongit.freedesktop.org/xorg/driver/xf86-video-intel#commit=b24e758') +source=('git://anongit.freedesktop.org/xorg/driver/xf86-video-intel#commit=df72bc5') sha256sums=('SKIP') pkgver() { -- cgit v0.12 From bf65376cb19aa78fd3c707e9227d3fee8531c7b0 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 30 Oct 2015 18:05:32 +0000 Subject: mythtv & plugins: update to latest fixes --- abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index 3a2dfdd..a53d40b 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -3682a9a14783e81685af1f838ba7f3c9916e1746 +68e51d6fd4fa25e985b21cb3a5b5ca6fce9aca9d diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index bdf5c10..69f3ccf 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.5 -pkgrel=9 +pkgrel=10 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index 62def00..1e6a917 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.5 -pkgrel=9 +pkgrel=10 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12 From 282e8209e1a55ebabfd744dc530f24557b4c04b8 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 3 Nov 2015 19:40:20 +0000 Subject: smartmontools: update to 6.4 --- abs/extra/smartmontools/PKGBUILD | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/abs/extra/smartmontools/PKGBUILD b/abs/extra/smartmontools/PKGBUILD index 685750d..e167856 100644 --- a/abs/extra/smartmontools/PKGBUILD +++ b/abs/extra/smartmontools/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 219339 2014-08-05 17:28:35Z giovanni $ +# $Id$ # Maintainer: Giovanni Scafora # Contributor: Jeff Mickey # Contributor: Jani Talikka # Contributor: Ralf Barth pkgname=smartmontools -pkgver=6.3 +pkgver=6.4 pkgrel=1 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives" url="http://smartmontools.sourceforge.net" license=('GPL') arch=('i686' 'x86_64') depends=('gcc-libs' 'libcap-ng' 'bash') -optdepends=('heirloom-mailx: to get mail alerts to work') +optdepends=('s-nail: to get mail alerts to work') backup=('etc/smartd.conf' 'etc/conf.d/smartd') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'smartd.conf') -md5sums=('2ea0c62206e110192a97b59291b17f54' +md5sums=('56812c8312fd123ed40ef65afde1049e' '28c1b80c41dac52d433961dcfb4f70e0') build() { @@ -28,7 +28,10 @@ build() { --sysconfdir=/etc \ --enable-drivedb \ --with-libcap-ng=yes \ - --with-systemdsystemunitdir=/usr/lib/systemd/system + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --with-smartdscriptdir=/usr/share/smartmontools \ + --with-smartdplugindir=/usr/share/smartmontools/smartd_warning.d + make } -- cgit v0.12 From f929ba59943099fe60b634a7dfaf3fe42f1caec3 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 3 Nov 2015 20:50:52 +0000 Subject: powerpanel: update to 1.3.2 --- abs/extra/powerpanel/PKGBUILD | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/abs/extra/powerpanel/PKGBUILD b/abs/extra/powerpanel/PKGBUILD index 22edba7..b1377f1 100644 --- a/abs/extra/powerpanel/PKGBUILD +++ b/abs/extra/powerpanel/PKGBUILD @@ -1,30 +1,31 @@ -# Contributor: das-ich +# Maintainer: Justin Settle +# Contributor: Kyle Keen , das-ich pkgname=powerpanel -pkgver=1.2.3 -pkgrel=6 -pkgdesc="PowerPanel for Linux software can be used with most CyberPower UPS products." +pkgver=1.3.2 +pkgrel=1 +pkgdesc="CyberPower UPS daemon" arch=("x86_64" "i686") url="http://www.cyberpowersystems.com" license=("custom:CyberPower") depends=('libusb') install=pwrstatd.install -source=(http://www.cyberpowersystems.com/software/powerpanel_123_x86_64.tar.gz pwrstatd.service) backup=(etc/powerpanel/pwrstatd-{powerfail,lowbatt,email}.sh - etc/pwrstatd.conf) + etc/pwrstatd.conf) -if [ "$CARCH" = "x86_64" ]; then - md5sums=('0226b17e9470b93cd1e4fd2f149c5d05' - 'b945ff7c15ef206022c8df29a96338c8') +if [[ $CARCH = 'x86_64' ]]; then + source=(http://www.cyberpowersystems.com/software/powerpanel-$pkgver-$CARCH.tar.gz pwrstatd.service) + md5sums=('d69233e117f92611931cb820bad141df' + 'b945ff7c15ef206022c8df29a96338c8') fi -if [ "$CARCH" = "i686" ]; then -source=(http://www.cyberpowersystems.com/software/powerpanel_123_i386.tar.gz) - md5sums=('79d1b60f5146b5286c786c93b90e6c87' - 'b945ff7c15ef206022c8df29a96338c8') +if [[ $CARCH = 'i686' ]]; then + source=(http://www.cyberpowersystems.com/software/powerpanel-$pkgver-i386.tar.gz pwrstatd.service) + md5sums=('833f35179a8b0ca303698de08f048c8b' + 'b945ff7c15ef206022c8df29a96338c8') fi package() { - cd ${srcdir}/$pkgname-$pkgver-0 + cd ${srcdir}/$pkgname-$pkgver # # copy files # @@ -63,7 +64,9 @@ install -Dm644 doc/pwrstatd.8 ${pkgdir}/usr/share/man/man8/pwrstatd.8 gzip -9 ${pkgdir}/usr/share/man/man8/pwrstat.8 gzip -9 ${pkgdir}/usr/share/man/man8/pwrstatd.8 -} +# Install License +install -D -m644 doc/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -md5sums=('0226b17e9470b93cd1e4fd2f149c5d05' +} +md5sums=('d69233e117f92611931cb820bad141df' 'b945ff7c15ef206022c8df29a96338c8') -- cgit v0.12 From 875d51444ac3d01367f9fcb26da04ecf81200148 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 3 Nov 2015 20:56:50 +0000 Subject: apcupsd: update to 3.14.13 --- abs/extra/apcupsd/PKGBUILD | 10 +++++----- abs/extra/apcupsd/apcupsd.install | 15 +++------------ 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/abs/extra/apcupsd/PKGBUILD b/abs/extra/apcupsd/PKGBUILD index 936ae52..c994545 100644 --- a/abs/extra/apcupsd/PKGBUILD +++ b/abs/extra/apcupsd/PKGBUILD @@ -5,18 +5,18 @@ # Contributor: Massimiliano Torromeo pkgname=apcupsd -pkgver=3.14.12 -pkgrel=3 +pkgver=3.14.13 +pkgrel=2 pkgdesc="Power mangement and controlling most of APC's UPS models" arch=(i686 x86_64) url="http://www.apcupsd.org" license=('GPL') -install=apcupsd.install -depends=('gcc-libs') +depends=('gcc-libs' 'systemd-sysvcompat') optdepends=('gd: for CGI' 'gconf: for frontend' 'gtk2: for frontend') makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2') +install=apcupsd.install backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf etc/apcupsd/multimon.conf @@ -30,7 +30,7 @@ backup=(etc/apcupsd/apcupsd.conf source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz{,.sig} apcupsd.service apcupsd-tmpfiles.conf) -sha256sums=('1b4f703cb19cfdf44daf173dc8394cafd30fee0b30a0c75a7d19db622454a440' +sha256sums=('57ecbde01d0448bf8c4dbfe0ad016724ae66ab98adf2de955bf2be553c5d03f9' 'SKIP' '145e88863335f077fc354b4d263b15f64af67b45a10ed37c68ebd468181e23f7' 'a4474cfcd607c5e9b64e27eec7cbc2b0bcf08c8ea37fd1f0f28e98ac2883fd4f') diff --git a/abs/extra/apcupsd/apcupsd.install b/abs/extra/apcupsd/apcupsd.install index 3f1e6b2..06eeee4 100644 --- a/abs/extra/apcupsd/apcupsd.install +++ b/abs/extra/apcupsd/apcupsd.install @@ -1,24 +1,15 @@ -# This is a default template for a post-install scriptlet. You can -# remove any functions you don't need (and this header). - -# arg 1: the new package version post_install() { add_service.sh apcupsd - /sbin/sv start apcupsd + sv start apcupsd + systemd-tmpfiles --create apcupsd.conf } -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { post_install } -# arg 1: the old package version post_remove() { - /sbin/sv stop apcupsd + sv stop apcupsd remove_service.sh apcupsd } -op=$1 -shift -$op $* -- cgit v0.12 From 269b32c5d4ee2c80dac748c9c9d2918bde69b404 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 3 Nov 2015 21:06:35 +0000 Subject: upower: update to 0.99.3 --- ...-signal-when-built-with-systemd-and-using.patch | 35 ---------------------- abs/extra/upower/PKGBUILD | 32 ++++++++------------ 2 files changed, 13 insertions(+), 54 deletions(-) delete mode 100644 abs/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch diff --git a/abs/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch b/abs/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch deleted file mode 100644 index 2694334..0000000 --- a/abs/extra/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a5b3dd887dcd60e981626ae2e15c874311fc4fef Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Sun, 2 Sep 2012 04:36:13 +0200 -Subject: [PATCH] Send resume signal when built with systemd and using - pm-utils suspend - -This case was apparently overlooked when adding systemd support. - -Signed-off-by: Jan Alexander Steffens (heftig) ---- - src/linux/up-backend.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c -index ddd4472..52b430e 100644 ---- a/src/linux/up-backend.c -+++ b/src/linux/up-backend.c -@@ -603,10 +603,11 @@ gboolean - up_backend_emits_resuming (UpBackend *backend) - { - #ifdef HAVE_SYSTEMD -- return TRUE; --#else -- return FALSE; -+ if (sd_booted ()) -+ return TRUE; -+ else - #endif -+ return FALSE; - } - - /** --- -1.7.12 - diff --git a/abs/extra/upower/PKGBUILD b/abs/extra/upower/PKGBUILD index d27d378..7833118 100644 --- a/abs/extra/upower/PKGBUILD +++ b/abs/extra/upower/PKGBUILD @@ -1,29 +1,25 @@ -# $Id: PKGBUILD 166524 2012-09-09 15:41:20Z heftig $ +# $Id$ # Maintainer: Jan de Groot pkgname=upower -pkgver=0.9.18 -pkgrel=2 +pkgver=0.99.3 +pkgrel=1 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64') url="http://upower.freedesktop.org" license=('GPL') -depends=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice') -makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd') -options=('!libtool') -source=($url/releases/$pkgname-$pkgver.tar.xz - 0001-Send-resume-signal-when-built-with-systemd-and-using.patch) +depends=('systemd' 'libusb' 'dbus-glib' 'libimobiledevice' 'libgudev') +makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python2') +backup=('etc/UPower/UPower.conf') +source=(http://upower.freedesktop.org/releases/$pkgname-$pkgver.tar.xz) +sha256sums=('697199bcc113bb069e6fb6bf4135536a702ba9847e46c5fc6df87d19624ddd38') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver - # put udev files in /usr/lib - sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure - - # https://bugs.freedesktop.org/show_bug.cgi?id=54371 - patch -Np1 -i ../0001-Send-resume-signal-when-built-with-systemd-and-using.patch - - ./configure --prefix=/usr --sysconfdir=/etc \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/$pkgname \ --disable-static @@ -31,8 +27,6 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } -md5sums=('bfaaa1e7f8479fca5594406b3c36dff9' - '188afea4919dc324b2efbae35d9d216a') -- cgit v0.12 From 8c2f0953ec25c537e5ff3f09b3906cc536583009 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 3 Nov 2015 21:14:45 +0000 Subject: less: update to 481 --- abs/core/less/PKGBUILD | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/abs/core/less/PKGBUILD b/abs/core/less/PKGBUILD index 4b12894..5a5c2a4 100644 --- a/abs/core/less/PKGBUILD +++ b/abs/core/less/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 149934 2012-02-11 23:29:36Z allan $ -# Maintainer: Allan McRae +# $Id$ +# Maintainer: Sébastien "Seblu" Luttringer +# Contributor: Allan McRae # Contributor: judd pkgname=less -pkgver=444 -pkgrel=3 -pkgdesc="A terminal based program for viewing text files" +pkgver=481 +pkgrel=2 +pkgdesc='A terminal based program for viewing text files' license=('GPL3') arch=('i686' 'x86_64') -url="http://www.greenwoodsoftware.com/less" +url='http://www.greenwoodsoftware.com/less' groups=('base') -depends=('ncurses' 'pcre') -source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('56f9f76ffe13f70155f47f6b3c87d421' - 'd5fafbd94a9cfdeaad0c82143a033fe5') +depends=('glibc' 'ncurses' 'pcre') +validpgpkeys=('AE27252BD6846E7D6EAE1DD6F153A7C833235259') # Mark Nudelman +source=("http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +md5sums=('50ef46065c65257141a7340123527767' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre + cd $pkgname-$pkgver + sh configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make prefix="${pkgdir}"/usr install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: -- cgit v0.12 From 4339ddf11c25a2db077d3694286b7104073ad9d7 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 4 Nov 2015 19:20:17 +0000 Subject: archlinux-keyring: update to 20150605 --- abs/core/archlinux-keyring/PKGBUILD | 16 ++++++++++------ abs/core/archlinux-keyring/archlinux-keyring.install | 11 +++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/abs/core/archlinux-keyring/PKGBUILD b/abs/core/archlinux-keyring/PKGBUILD index b0ff4f6..bca238a 100644 --- a/abs/core/archlinux-keyring/PKGBUILD +++ b/abs/core/archlinux-keyring/PKGBUILD @@ -1,18 +1,22 @@ -# $Id: PKGBUILD 162172 2012-06-22 16:21:47Z pierre $ +# $Id$ # Maintainer: Pierre Schmitz pkgname=archlinux-keyring -pkgver=20120622 +pkgver=20150605 pkgrel=1 pkgdesc='Arch Linux PGP keyring' arch=('any') url='https://projects.archlinux.org/archlinux-keyring.git/' license=('GPL') install="${pkgname}.install" -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" - "ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig") -md5sums=('8fecc7ec4a9b51e3166b79a90930e7ce' - 'afa0253f24c6ba3fee22ae6c2150cb6c') +source=("https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig") +md5sums=('65f1c23ca17e8c72363d831a352e6fd2' + 'SKIP') +validpgpkeys=( + '4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC' # Pierre + 'A314827C4E4250A204CE6E13284FC34C8E4B1A25' # Thomas + ) package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/abs/core/archlinux-keyring/archlinux-keyring.install b/abs/core/archlinux-keyring/archlinux-keyring.install index 81726c6..19f594b 100644 --- a/abs/core/archlinux-keyring/archlinux-keyring.install +++ b/abs/core/archlinux-keyring/archlinux-keyring.install @@ -1,6 +1,17 @@ post_upgrade() { if usr/bin/pacman-key -l >/dev/null 2>&1; then usr/bin/pacman-key --populate archlinux + + # Re-enable key of dwallace + # See https://bugs.archlinux.org/task/35478 + if [ -z "$2" ] || [ "$2" = "20130525-1" ]; then + printf 'enable\nquit\n' | LANG=C \ + gpg --homedir /etc/pacman.d/gnupg \ + --no-permission-warning --command-fd 0 \ + --quiet --batch --edit-key \ + 5559BC1A32B8F76B3FCCD9555FA5E5544F010D48 \ + 2>/dev/null + fi fi } -- cgit v0.12 From 9e6c835afb726b1eb283d7b81b37b86dd5e5f0a0 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 4 Nov 2015 19:29:17 +0000 Subject: grep: update to 2.22 --- abs/core/grep/PKGBUILD | 34 ++++++++++--------- abs/core/grep/grep-2.11-exclude-dir-crash.patch | 44 ------------------------- abs/core/grep/grep.install | 17 ++++------ 3 files changed, 25 insertions(+), 70 deletions(-) delete mode 100644 abs/core/grep/grep-2.11-exclude-dir-crash.patch diff --git a/abs/core/grep/PKGBUILD b/abs/core/grep/PKGBUILD index b878e71..c910394 100644 --- a/abs/core/grep/PKGBUILD +++ b/abs/core/grep/PKGBUILD @@ -1,34 +1,36 @@ -# $Id: PKGBUILD 163715 2012-07-18 02:16:59Z dreisner $ -# Maintainer: Allan McRae +# $Id$ +# Maintainer: Sébastien Luttringer +# Contributor: Allan McRae # Contributor: judd pkgname=grep -pkgver=2.13 -pkgrel=2 -pkgdesc="A string search utility" +pkgver=2.22 +pkgrel=1 +pkgdesc='A string search utility' arch=('i686' 'x86_64') license=('GPL3') -url="http://www.gnu.org/software/grep/grep.html" -groups=('base') -depends=('glibc' 'pcre' 'sh') +url='http://www.gnu.org/software/grep/grep.html' +groups=('base' 'base-devel') +depends=('glibc' 'pcre') makedepends=('texinfo') -install=${pkgname}.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) -md5sums=('5894d484e6c02249f9702d0d8a472115' - '99acaa4d45ab931be2ecba49a1766df7') +install=$pkgname.install +validpgpkeys=('155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) +md5sums=('e1015e951a49a82b02e38891026ef5df' + 'SKIP') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd $pkgname-$pkgver ./configure --prefix=/usr --without-included-regex make } check() { - cd ${srcdir}/${pkgname}-${pkgver} + cd $pkgname-$pkgver make check } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd $pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/abs/core/grep/grep-2.11-exclude-dir-crash.patch b/abs/core/grep/grep-2.11-exclude-dir-crash.patch deleted file mode 100644 index 6b17317..0000000 --- a/abs/core/grep/grep-2.11-exclude-dir-crash.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 12c957f786b12a4dd116f9c40a715d671d17fa16 Mon Sep 17 00:00:00 2001 -From: Allan McRae -Date: Mon, 12 Mar 2012 09:28:01 +0100 -Subject: [PATCH] grep: fix segfault with -r --exclude-dir and no file operand - -* src/main.c (grepdir): Don't invoke excluded_file_name on NULL. -* NEWS (Bug fixes): Mention it. ---- - NEWS | 5 +++++ - src/main.c | 2 +- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/NEWS b/NEWS -index d0a63d5..d4d70f5 100644 ---- a/NEWS -+++ b/NEWS -@@ -2,6 +2,11 @@ GNU grep NEWS -*- outline -*- - - * Noteworthy changes in release ?.? (????-??-??) [?] - -+** Bug fixes -+ -+ grep no longer segfaults with -r --exclude-dir and no file operand. -+ I.e., ":|grep -r --exclude-dir=D PAT" would segfault. -+ - - * Noteworthy changes in release 2.11 (2012-03-02) [stable] - -diff --git a/src/main.c b/src/main.c -index 2f6c761..f4f1235 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -1361,7 +1361,7 @@ grepdir (char const *dir, struct stats const *stats) - struct stats const *ancestor; - char *name_space; - int status = 1; -- if (excluded_directory_patterns -+ if (dir && excluded_directory_patterns - && excluded_file_name (excluded_directory_patterns, dir)) - return 1; - --- -1.7.9.3 - diff --git a/abs/core/grep/grep.install b/abs/core/grep/grep.install index 7cd3130..a594d9c 100644 --- a/abs/core/grep/grep.install +++ b/abs/core/grep/grep.install @@ -1,21 +1,18 @@ infodir=usr/share/info -filelist=(grep.info) +file=grep.info post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done + [[ -x usr/bin/install-info ]] || return 0 + install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null } post_upgrade() { - post_install $1 + post_install "$1" } pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done + [[ -x usr/bin/install-info ]] || return 0 + install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null } +# vim:set ts=2 sw=2 ft=sh et: -- cgit v0.12 From 64100f7d403ea11544578738c25b9e5cd651e8a1 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 4 Nov 2015 19:33:25 +0000 Subject: xterm: update to 320 --- abs/core/xterm/PKGBUILD | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/abs/core/xterm/PKGBUILD b/abs/core/xterm/PKGBUILD index 38e4875..7b16dc1 100644 --- a/abs/core/xterm/PKGBUILD +++ b/abs/core/xterm/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Alexander Baldeck pkgname=xterm -pkgver=313 -pkgrel=1 +pkgver=320 +pkgrel=2 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64') url="http://invisible-island.net/xterm/" @@ -12,12 +12,13 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter' 'libxkbfile') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz{,.asc} LICENSE) -md5sums=('4c2e85f46d8a96c81daf3f9e6c2e1997' +md5sums=('0d7f0e6390d132ae59876b3870e5783d' 'SKIP' '10ecc3f8ee91e3189863a172f68282d2') +validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB') # "Thomas Dickey " build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --libdir=/etc \ --mandir=/usr/share/man \ @@ -49,7 +50,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install chmod 0755 "${pkgdir}/usr/bin/xterm" -- cgit v0.12 From e00a62df847b0965aa36f02529d47ae97be366d2 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 4 Nov 2015 21:30:20 +0000 Subject: linuxtv-dvb-apps: update to 1505 --- abs/extra/linuxtv-dvb-apps/PKGBUILD | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/abs/extra/linuxtv-dvb-apps/PKGBUILD b/abs/extra/linuxtv-dvb-apps/PKGBUILD index 2414de4..9d5b090 100644 --- a/abs/extra/linuxtv-dvb-apps/PKGBUILD +++ b/abs/extra/linuxtv-dvb-apps/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 80369 2012-11-21 04:04:30Z jconder $ +# $Id$ # Maintainer: Jonathan Conder # Contributor: Jaroslaw Swierczynski # Contributor: Camille Moncelier pkgname=linuxtv-dvb-apps -pkgver=1486 -pkgrel=2 -_hgrev=3fc7dfa68484 -pkgdesc='Viewer programs for DVB cards' +pkgver=1505 +pkgrel=1 +_hgrev=3d43b280298c +pkgdesc='Linux DVB API applications and utilities' arch=('i686' 'x86_64') url='http://www.linuxtv.org/' license=('GPL') +depends=('glibc') source=("http://linuxtv.org/hg/dvb-apps/archive/$_hgrev.tar.bz2") -sha256sums=('60cfd45fe7417a4445a7814ce6e645ddaad0f8e934015c09d53eb93c8739b35a') -build() { +prepare() { cd "dvb-apps-$_hgrev" - rm -rf include +} - make -C lib - make -C util +build() { + cd "dvb-apps-$_hgrev" + make } package() { cd "dvb-apps-$_hgrev" - - make -C lib DESTDIR="$pkgdir" install - make -C util DESTDIR="$pkgdir" install - - chmod 755 "$pkgdir"/usr/lib/*.so* + make DESTDIR="$pkgdir" install + # Remove conflict with xbase (FS#37862) + mv "$pkgdir"/usr/bin/{zap,dvbzap} } +md5sums=('e2cc2ca0c429f6cb73d0f73b29dd70e8') -- cgit v0.12 From 31b4072a852b6f34c3d2f4d360d8e806cf56542c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 4 Nov 2015 21:36:45 +0000 Subject: dtv-scan-tables-git: initial inclusion. DVB scan tables, formerly part of the linuxtv-dvb-apps package --- abs/extra/dtv-scan-tables-git/PKGBUILD | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 abs/extra/dtv-scan-tables-git/PKGBUILD diff --git a/abs/extra/dtv-scan-tables-git/PKGBUILD b/abs/extra/dtv-scan-tables-git/PKGBUILD new file mode 100644 index 0000000..4f5a67e --- /dev/null +++ b/abs/extra/dtv-scan-tables-git/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Olaf Bauer + +pkgname=dtv-scan-tables-git +pkgver=r1185.82dfbc1 +pkgrel=1 +pkgdesc="Digital TV scan tables" +arch=('any') +url="http://linuxtv.org/" +license=('GPL2' 'LGPL2') +makedepends=('git' 'v4l-utils') +conflicts=('dtv-scan-tables') +provides=('dtv-scan-tables') +source=('git://linuxtv.org/dtv-scan-tables.git') +md5sums=('SKIP') + +pkgver() { + cd "$srcdir/dtv-scan-tables" + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +build() { + cd "$srcdir/dtv-scan-tables" + make dvbv3 +} + +package() { + cd "$srcdir/dtv-scan-tables" + make PREFIX="$pkgdir/usr" DVBV5DIR=dvb install + make PREFIX="$pkgdir/usr" install_v3 +} -- cgit v0.12 From 930a1efbde92672c05279b93754771f57254c97e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 4 Nov 2015 22:06:00 +0000 Subject: w_scan: initial inclusion --- abs/extra/w_scan/PKGBUILD | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 abs/extra/w_scan/PKGBUILD diff --git a/abs/extra/w_scan/PKGBUILD b/abs/extra/w_scan/PKGBUILD new file mode 100644 index 0000000..b7af805 --- /dev/null +++ b/abs/extra/w_scan/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: birdflesh +# Contributor: Michael Lass +# Contributor: Leo von Klenze + +pkgname=w_scan +pkgver=20141122 +pkgrel=1 +pkgdesc="Universal ATSC and DVB blind scanner" +arch=('i686' 'x86_64' 'armv6h') +url="http://wirbel.htpc-forum.de/w_scan/index_en.html" +license=('GPL') +depends=('glibc') +source=("http://wirbel.htpc-forum.de/$pkgname/$pkgname-$pkgver.tar.bz2") +md5sums=('da0f190bee696a02bf030fc01c0706e8') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -dm755 "$pkgdir/usr/share/doc/$pkgname" + install -m644 README "$pkgdir/usr/share/doc/$pkgname" +} + -- cgit v0.12 From c4d512c64bd57ff213cd1039791c0bbc2ed0720b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 11 Nov 2015 17:28:23 +0000 Subject: plex-media-server: update to 0.9.12.19.1537 --- abs/extra/plex-media-server/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/extra/plex-media-server/PKGBUILD b/abs/extra/plex-media-server/PKGBUILD index 427b608..5c5f91c 100644 --- a/abs/extra/plex-media-server/PKGBUILD +++ b/abs/extra/plex-media-server/PKGBUILD @@ -7,8 +7,8 @@ # Contributor: Praekon pkgname=plex-media-server -pkgver=0.9.12.18.1520 -_pkgsum=6833552 +pkgver=0.9.12.19.1537 +_pkgsum=f38ac80 pkgrel=1 pkgdesc='Plex Media Server' arch=('x86_64') @@ -58,4 +58,4 @@ md5sums=('b67fd10314ab756169ec963f710cb9e3' '34268b981e3b8c833a0e2270429232a6' 'bd703bc750b989a27edd590eb8c8e9d7' '506ec15815bba749a743780edd2323c8') -md5sums_x86_64=('ddd54db71e0df0417d9f8fcbabefcfd3') +md5sums_x86_64=('51434159317fe5b90a189eeb2b524792') -- cgit v0.12 From cf6fc29dc84d73151889db20be3fe4614c756f36 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 11 Nov 2015 17:33:23 +0000 Subject: google-chrome: update to 46.0.2490.86 --- 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 53007d8..a0b7c4d 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=46.0.2490.80 +pkgver=46.0.2490.86 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -26,8 +26,8 @@ source_i686=("google-chrome-${_channel}_${pkgver}_i386.deb::https://dl.google.co source_x86_64=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb") md5sums=('99fa93d5e7fb5d622cef0f9621f3ffa3' 'b7e752f549b215ac77f284b6486794b6') -md5sums_i686=('33e2cde91b246ee0797e403a80429267') -md5sums_x86_64=('0427655c21f5f9bb30103ec6e517fab1') +md5sums_i686=('f921051dd9eb1ccd282062f7904685ce') +md5sums_x86_64=('28dbecbd7cbc3db94d215a8a50a90b06') package() { msg2 "Extracting the data.tar.lzma..." -- cgit v0.12 From bb42bd1ad2bd4fc6a934cee3279560b561008859 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 11 Nov 2015 19:11:47 +0000 Subject: mythtv & mythplugins: update to latest -fixes mythtv: update tmdb error 25 patch --- abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 8 +-- .../stable-0.27/mythtv/tmdb3_query_limit.2.diff | 70 ++++++++++++++++++++++ .../mythtv/stable-0.27/mythtv/tmdb_error25.patch | 55 ----------------- 5 files changed, 76 insertions(+), 61 deletions(-) create mode 100644 abs/core/mythtv/stable-0.27/mythtv/tmdb3_query_limit.2.diff delete mode 100644 abs/core/mythtv/stable-0.27/mythtv/tmdb_error25.patch diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index a53d40b..3ebe7b8 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -68e51d6fd4fa25e985b21cb3a5b5ca6fce9aca9d +acd481df3f5be108bd6de5f4be27ac50aedab162 diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 69f3ccf..127c5d3 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.5 -pkgrel=10 +pkgrel=11 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index 1e6a917..786ca3d 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.5 -pkgrel=10 +pkgrel=11 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -23,10 +23,10 @@ patches=('myth_settings.patch' 'videoAlwaysUseBookmark.patch' 'fixQTvirtualkeyboard.patch' 'suggestedstarttime.patch.v1' - 'tmdb_error25.patch') + 'tmdb3_query_limit.2.diff') #fixQTvirtualkeyboard.patch: https://code.mythtv.org/trac/ticket/12347 #suggestedstarttime.patch.v1: http://code.mythtv.org/trac/ticket/11562 next mythfilldatabase run in mythweb - #tmdb_error25.patch: https://code.mythtv.org/trac/ticket/12455 + #tmdb3_query_limit.2.diff: https://code.mythtv.org/trac/ticket/12455 optdepends=() replaces=('mythvideo' 'myththemes') @@ -109,5 +109,5 @@ md5sums=('5f3e43567e62afe17bad39f5a9b604cf' '41098e898361a5a3cde3eaae358482a8' 'a853dff0f5c92ca58fcc1e389cd16266' '35a7fd3e3057691e3b1bf355bb9e8b16' - '5e645c3d0df38143c45f3e8fe24f1b6f' + 'a41581e7b80093eeadabcf7d9d01fc19' '928de4b070d9f3b784d55c0db415eaf3') diff --git a/abs/core/mythtv/stable-0.27/mythtv/tmdb3_query_limit.2.diff b/abs/core/mythtv/stable-0.27/mythtv/tmdb3_query_limit.2.diff new file mode 100644 index 0000000..7b44537 --- /dev/null +++ b/abs/core/mythtv/stable-0.27/mythtv/tmdb3_query_limit.2.diff @@ -0,0 +1,70 @@ +diff --git mythtv/bindings/python/tmdb3/tmdb3/request.py mythtv/bindings/python/tmdb3/tmdb3/request.py +index 2de4cd5..1b6663d 100644 +--- src/mythtv/bindings/python/tmdb3/tmdb3/request.py ++++ src/mythtv/bindings/python/tmdb3/tmdb3/request.py +@@ -16,6 +16,7 @@ from urllib import urlencode + import urllib2 + import json + import os ++import time + + DEBUG = False + cache = Cache(filename='pytmdb3.cache') +@@ -113,21 +114,32 @@ class Request(urllib2.Request): + def readJSON(self): + """Parse result from specified URL as JSON data.""" + url = self.get_full_url() +- try: +- # catch HTTP error from open() +- data = json.load(self.open()) +- except TMDBHTTPError, e: ++ tries = 0 ++ while tries < 100: + try: +- # try to load whatever was returned +- data = json.loads(e.response) +- except: +- # cannot parse json, just raise existing error ++ # catch HTTP error from open() ++ data = json.load(self.open()) ++ break ++ except TMDBHTTPError, e: ++ try: ++ # try to load whatever was returned ++ data = json.loads(e.response) ++ except: ++ # cannot parse json, just raise existing error ++ raise e ++ else: ++ # Check for error code of 25 which means we are doing more than 40 requests per 10 seconds ++ if data.get('status_code', 1) ==25: ++ # Sleep and retry query. ++ if DEBUG: ++ print 'Retry after {0} seconds'.format(max(float(e.headers['retry-after']),10)) ++ time.sleep(max(float(e.headers['retry-after']),10)) ++ continue ++ else: ++ # response parsed, try to raise error from TMDB ++ handle_status(data, url) ++ # no error from TMDB, just raise existing error + raise e +- else: +- # response parsed, try to raise error from TMDB +- handle_status(data, url) +- # no error from TMDB, just raise existing error +- raise e + handle_status(data, url) + if DEBUG: + import pprint +diff --git mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py +index f85fbcf..5020c4a 100644 +--- src/mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py ++++ src/mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py +@@ -96,6 +96,7 @@ class TMDBHTTPError(TMDBError): + def __init__(self, err): + self.httperrno = err.code + self.response = err.fp.read() ++ self.headers = err.headers + super(TMDBHTTPError, self).__init__(str(err)) + + diff --git a/abs/core/mythtv/stable-0.27/mythtv/tmdb_error25.patch b/abs/core/mythtv/stable-0.27/mythtv/tmdb_error25.patch deleted file mode 100644 index fc1a2fe..0000000 --- a/abs/core/mythtv/stable-0.27/mythtv/tmdb_error25.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- src/mythtv/bindings/python/tmdb3/tmdb3/request.py.orig 2015-09-29 16:11:52.436024705 +0000 -+++ src/mythtv/bindings/python/tmdb3/tmdb3/request.py 2015-09-29 16:13:24.297824407 +0000 -@@ -16,6 +16,7 @@ - import urllib2 - import json - import os -+import time - - DEBUG = False - cache = Cache(filename='pytmdb3.cache') -@@ -113,21 +114,29 @@ - def readJSON(self): - """Parse result from specified URL as JSON data.""" - url = self.get_full_url() -- try: -- # catch HTTP error from open() -- data = json.load(self.open()) -- except TMDBHTTPError, e: -- try: -- # try to load whatever was returned -- data = json.loads(e.response) -- except: -- # cannot parse json, just raise existing error -- raise e -- else: -- # response parsed, try to raise error from TMDB -- handle_status(data, url) -- # no error from TMDB, just raise existing error -- raise e -+ while True: -+ try: -+ # catch HTTP error from open() -+ data = json.load(self.open()) -+ break -+ except TMDBHTTPError, e: -+ try: -+ # try to load whatever was returned -+ data = json.loads(e.response) -+ except: -+ # cannot parse json, just raise existing error -+ raise e -+ else: -+ # Check for error code of 25 which means we are doing more than 40 requests per minute. -+ if data.get('status_code', 1) == 25: -+ # Sleep and retry query. -+ time.sleep(10) -+ continue -+ else: -+ # response parsed, try to raise error from TMDB -+ handle_status(data, url) -+ # no error from TMDB, just raise existing error -+ raise e - handle_status(data, url) - if DEBUG: - import pprint -- cgit v0.12 From b964f37d22ecbcaedfab7bfdf08b423688907b63 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 12 Nov 2015 00:23:23 +0000 Subject: linux: update to 3.18.24. add xc5000 patch --- abs/core/linux/PKGBUILD | 11 ++- abs/core/linux/linux.install.pkg | 2 +- .../linux/xc5000-add_IF_output_level_control.patch | 103 +++++++++++++++++++++ 3 files changed, 112 insertions(+), 4 deletions(-) create mode 100644 abs/core/linux/xc5000-add_IF_output_level_control.patch diff --git a/abs/core/linux/PKGBUILD b/abs/core/linux/PKGBUILD index 2a4c690..c9fa42a 100644 --- a/abs/core/linux/PKGBUILD +++ b/abs/core/linux/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=linux # Build stock -ARCH kernel #pkgbase=linux-custom # Build kernel with a different name _srcname=linux-3.18 -pkgver=3.18.22 +pkgver=3.18.24 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -21,6 +21,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz" # standard config files for mkinitcpio ramdisk 'linux.preset' 'change-default-console-loglevel.patch' + 'xc5000-add_IF_output_level_control.patch' ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -43,6 +44,9 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" + # xc5000 patches + patch -p1 -i "${srcdir}/xc5000-add_IF_output_level_control.patch" + if [ "${CARCH}" = "x86_64" ]; then cat "${srcdir}/config.x86_64" > ./.config else @@ -295,8 +299,9 @@ done # vim:set ts=8 sts=2 sw=2 et: md5sums=('9e854df51ca3fef8bfe566dbd7b89241' - '04e193d2b3f4d8e3524422534ffe27f2' + '3edcf56dba63548978fb66805a1e6167' 'ed1d392d9feb77674e7a71c3eda060e6' 'ce7ffe528b5920dc1e8b3d7229a66639' 'eb14dcfd80c00852ef81ded6e826826a' - 'df7fceae6ee5d7e7be7b60ecd7f6bb35') + 'df7fceae6ee5d7e7be7b60ecd7f6bb35' + 'f8ffc0bf9c01329d21093adce05b9ebb') diff --git a/abs/core/linux/linux.install.pkg b/abs/core/linux/linux.install.pkg index fa5ccff..1fc923b 100644 --- a/abs/core/linux/linux.install.pkg +++ b/abs/core/linux/linux.install.pkg @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.18.22-1-ARCH +KERNEL_VERSION=3.18.24-1-ARCH post_install () { # updating module dependencies diff --git a/abs/core/linux/xc5000-add_IF_output_level_control.patch b/abs/core/linux/xc5000-add_IF_output_level_control.patch new file mode 100644 index 0000000..b880fd6 --- /dev/null +++ b/abs/core/linux/xc5000-add_IF_output_level_control.patch @@ -0,0 +1,103 @@ +From 52e269b133d167a345758cb9d76d6348b3c66ebb Mon Sep 17 00:00:00 2001 +From: Richard Vollkommer +Date: Sat, 25 Oct 2014 17:17:22 -0300 +Subject: [media] xc5000: add IF output level control + +Adds control of the IF output level to the xc5000 tuner +configuration structure. Increases the IF level to the +demodulator to fix failure to lock and picture breakup +issues (with the au8522 demodulator, in the case of the +Hauppauge HVR950Q). + +This patch works with all XC5000 firmware versions. + +Signed-off-by: Richard Vollkommer +Signed-off-by: Michael Ira Krufky +Reviewed-by: Devin Heitmueller +Signed-off-by: Mauro Carvalho Chehab +--- + drivers/media/tuners/xc5000.c | 14 +++++++++++++- + drivers/media/tuners/xc5000.h | 1 + + drivers/media/usb/au0828/au0828-dvb.c | 2 ++ + 3 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/drivers/media/tuners/xc5000.c b/drivers/media/tuners/xc5000.c +index 803a0e6..705c258 100644 +--- a/drivers/media/tuners/xc5000.c ++++ b/drivers/media/tuners/xc5000.c +@@ -62,6 +62,7 @@ struct xc5000_priv { + unsigned int mode; + u8 rf_mode; + u8 radio_input; ++ u16 output_amp; + + int chip_id; + u16 pll_register_no; +@@ -744,7 +745,9 @@ static int xc5000_tune_digital(struct dvb_frontend *fe) + return -EIO; + } + +- xc_write_reg(priv, XREG_OUTPUT_AMP, 0x8a); ++ dprintk(1, "%s() setting OUTPUT_AMP to 0x%x\n", ++ __func__, priv->output_amp); ++ xc_write_reg(priv, XREG_OUTPUT_AMP, priv->output_amp); + + xc_tune_channel(priv, priv->freq_hz, XC_TUNE_DIGITAL); + +@@ -1358,6 +1361,9 @@ static int xc5000_set_config(struct dvb_frontend *fe, void *priv_cfg) + if (p->radio_input) + priv->radio_input = p->radio_input; + ++ if (p->output_amp) ++ priv->output_amp = p->output_amp; ++ + return 0; + } + +@@ -1438,6 +1444,12 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe, + it can be overridden if this is a hybrid driver */ + priv->chip_id = (cfg->chip_id) ? cfg->chip_id : 0; + ++ /* don't override output_amp if it's already been set ++ unless explicitly specified */ ++ if ((priv->output_amp == 0) || (cfg->output_amp)) ++ /* use default output_amp value if none specified */ ++ priv->output_amp = (cfg->output_amp) ? cfg->output_amp : 0x8a; ++ + /* Check if firmware has been loaded. It is possible that another + instance of the driver has loaded the firmware. + */ +diff --git a/drivers/media/tuners/xc5000.h b/drivers/media/tuners/xc5000.h +index 7245cae..6aa534f 100644 +--- a/drivers/media/tuners/xc5000.h ++++ b/drivers/media/tuners/xc5000.h +@@ -36,6 +36,7 @@ struct xc5000_config { + u32 if_khz; + u8 radio_input; + u16 xtal_khz; ++ u16 output_amp; + + int chip_id; + }; +diff --git a/drivers/media/usb/au0828/au0828-dvb.c b/drivers/media/usb/au0828/au0828-dvb.c +index 00ab1563..c267d76 100644 +--- a/drivers/media/usb/au0828/au0828-dvb.c ++++ b/drivers/media/usb/au0828/au0828-dvb.c +@@ -88,12 +88,14 @@ static struct xc5000_config hauppauge_xc5000a_config = { + .i2c_address = 0x61, + .if_khz = 6000, + .chip_id = XC5000A, ++ .output_amp = 0x8f, + }; + + static struct xc5000_config hauppauge_xc5000c_config = { + .i2c_address = 0x61, + .if_khz = 6000, + .chip_id = XC5000C, ++ .output_amp = 0x8f, + }; + + static struct mxl5007t_config mxl5007t_hvr950q_config = { +-- +cgit v0.11.2-5-g481e + -- cgit v0.12 From 92890a608cae174b22e83514227f9c041ac7df44 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 12 Nov 2015 00:24:01 +0000 Subject: nvidia: rebuild --- abs/core/nvidia/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD index 68faa0e..62408d6 100644 --- a/abs/core/nvidia/PKGBUILD +++ b/abs/core/nvidia/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=nvidia pkgname=(nvidia nvidia-dkms) pkgver=355.11 _extramodules=extramodules-3.18-ARCH -pkgrel=3 +pkgrel=4 pkgdesc="NVIDIA drivers for linux" arch=('i686' 'x86_64') url="http://www.nvidia.com/" -- cgit v0.12 From 204cf5348ad08f2291733537bed02389d40f590e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 12 Nov 2015 00:24:23 +0000 Subject: nvidia-340xx: rebuild --- abs/core/nvidia-340xx/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/nvidia-340xx/PKGBUILD b/abs/core/nvidia-340xx/PKGBUILD index d03db5c..06f2e16 100644 --- a/abs/core/nvidia-340xx/PKGBUILD +++ b/abs/core/nvidia-340xx/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=nvidia-340xx pkgname=(nvidia-340xx nvidia-340xx-dkms) pkgver=340.93 _extramodules=extramodules-3.18-ARCH -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.nvidia.com/" makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=3.18' 'linux-headers<3.19') -- cgit v0.12 From d8f0fed5b439a0832ae1a17efe2845ad055dfc17 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 12 Nov 2015 00:25:15 +0000 Subject: nvidia-304xx: rebuild --- abs/core/nvidia-304xx/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/nvidia-304xx/PKGBUILD b/abs/core/nvidia-304xx/PKGBUILD index 909491a..54f9c3b 100644 --- a/abs/core/nvidia-304xx/PKGBUILD +++ b/abs/core/nvidia-304xx/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=nvidia-304xx pkgname=(nvidia-304xx nvidia-304xx-dkms) pkgver=304.128 _extramodules=extramodules-3.18-ARCH -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.nvidia.com/" makedepends=('nvidia-304xx-libgl' "nvidia-304xx-utils=${pkgver}" 'linux' 'linux-headers>=3.18' 'linux-headers<3.19') -- cgit v0.12 From ba2be7bcf3bd61642fb50ff779fbcea4d4df597c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 12 Nov 2015 00:25:58 +0000 Subject: ceton_infinitv: rebuild --- abs/core/ceton_infinitv/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/abs/core/ceton_infinitv/PKGBUILD b/abs/core/ceton_infinitv/PKGBUILD index 3a9ed39..2112ed6 100755 --- a/abs/core/ceton_infinitv/PKGBUILD +++ b/abs/core/ceton_infinitv/PKGBUILD @@ -1,11 +1,12 @@ # Maintainer: Cecil Watson pkgname=ceton_infinitv -_kernver=3.18.22-1-ARCH +_kernver=`uname -r` _extramods="extramodules-3.18-ARCH" -pkgver=2013_0326_2226 -pkgrel=11 +pkgver=2013.0326.2226 +pkgrel=12 usb_pkgver=0.1.0 +pci_pkgver=`echo $pkgver | tr . _` pkgdesc="Drivers for Ceton InfiniTV4 - pci/usb " arch=('i686' 'x86_64') license=('GPL2') @@ -13,7 +14,7 @@ url="http://cetoncorp.com/infinitv_support/linux_drivers" depends=('linux>=3.18' 'linux<3.19' 'libgusb' 'libnl1' 'ctntad') makedepends=(linux-headers) install=ceton.install -source=("http://cetoncorp.com/downloads/ceton_infinitv_linux_driver_$pkgver.tar.gz" +source=("http://cetoncorp.com/downloads/ceton_infinitv_linux_driver_$pci_pkgver.tar.gz" "98-ctn91xx.rules" "http://cetoncorp.com/downloads/infinitv-usbd-$usb_pkgver.tar.gz" "ceton_usb_init.sh" "ifctn.sh" -- cgit v0.12 From a37f4c1263e867e049502aeb96a8a207424ae46c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 12 Nov 2015 18:59:24 +0000 Subject: LinHES-system: myth_mtc.py & myth_mtc.cron: add new --check_home option. The --check_home option checks how full home is and if it is over 90% it will remove caches in .mythtv and restart mythfrontend. --- abs/core/LinHES-system/PKGBUILD | 6 +++--- abs/core/LinHES-system/myth_mtc.cron | 15 +++++++++++++- abs/core/LinHES-system/myth_mtc.py | 39 +++++++++++++++++++++++++++++++++--- 3 files changed, 53 insertions(+), 7 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 7469000..e3c1700 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.3 -pkgrel=18 +pkgrel=19 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -81,7 +81,7 @@ md5sums=('76842f8cff548d2c1289e0992a8b84dd' 'de32a1c50101265dd7f6ca5037f7a26a' '2d7b8414ddce5f401331342ac1529c22' '76b2637cac0452b3acdbeeb4e8a5474b' - 'd02ddadeb2181f90954e435842cd7f0a' + 'cd81693e73556ff09565799516e81554' 'dc3eef2a624754e16805d72bbe488b67' '617af86b901538817ebdcaf646248dc5' '542e670e78d117657f93141e9689f54d' @@ -135,7 +135,7 @@ md5sums=('76842f8cff548d2c1289e0992a8b84dd' 'eb879fee9603a05d5420d4ce8ed9e450' '02c810c2f47b7c4495fdacaf54189473' '1aac1872bf9569ea58ceb2f6f766a654' - 'dc48a53d4e5fe27b218657ccc318d07f' + '3a9fb38db8ad0736d85d5f85dbb948d7' '4d7164800122243be6513b29c8fc498e' 'd14fdc38878c70011754317b0f2ea59e' '36bdfa8d877cea20ca3870faf08e08d5' diff --git a/abs/core/LinHES-system/myth_mtc.cron b/abs/core/LinHES-system/myth_mtc.cron index d3dc50a..ff8e84a 100755 --- a/abs/core/LinHES-system/myth_mtc.cron +++ b/abs/core/LinHES-system/myth_mtc.cron @@ -16,6 +16,19 @@ fi #check logfile for Finished and if not run myth_mtc.py if ! grep -q "Finished Maintenance" $logFile then + + if ! grep -q "Finished checking size of MythTV home" $logFile + then + MYTHCONFDIR=/usr/share/mythtv unbuffer myth_mtc.py --check_home | $log + if [ $? = 0 ] + then + echo "" | $log + else + echo "Time Exceeded" | $log + exit + fi + fi + if ! grep -q "Finished Optimize" $logFile then MYTHCONFDIR=/usr/share/mythtv unbuffer myth_mtc.py --optimize | $log @@ -52,7 +65,7 @@ then fi fi - if grep -q "Finished Optimize" $logFile && grep -q "Finished Backup" $logFile && grep -q "Finished Update" $logFile + if grep -q "Finished checking size of MythTV home" $logFile && grep -q "Finished Optimize" $logFile && grep -q "Finished Backup" $logFile && grep -q "Finished Update" $logFile then echo "Finished Maintenance" | $log fi diff --git a/abs/core/LinHES-system/myth_mtc.py b/abs/core/LinHES-system/myth_mtc.py index 8a08c05..ee4fde2 100755 --- a/abs/core/LinHES-system/myth_mtc.py +++ b/abs/core/LinHES-system/myth_mtc.py @@ -17,10 +17,35 @@ except: def get_timestamp(): now = datetime.datetime.now() -#date = "%s-%s-%s" %(now.year, now.month, now.day) - date = (now.strftime('%Y-%m-%d %H:%M')) + date = (now.strftime('%Y-%m-%d %H:%M')) return date +def getFreePercentForDir(dir): + stats = os.statvfs(dir) + total = (stats.f_blocks) + avail = (stats.f_bavail) + return (total - avail) / float(total) + +def check_home(): + #get the mythtv home dir + sys.path.append('/usr/MythVantage/bin/') + config_file = "mv_config" + data_config = __import__(config_file, globals(), locals(), []) + + freePcent = getFreePercentForDir(data_config.MYTHHOME) + print " Home directory percent used: " + str(freePcent * 100) + "%" + if float(freePcent) > .9: + print " Home directory is greater than 90% used. Clearing MythTV caches..." + cmd = "/usr/bin/rm -rf " + data_config.MYTHHOME + "/.mythtv/{*cache,Cache-*}" + subprocess.call(["sh", "-c", cmd]) + print " Restarting mythfrontend..." + subprocess.call(["killall", "mythfrontend"]) + freePcent = getFreePercentForDir(data_config.MYTHHOME) + print " Home directory percent used: " + str(freePcent * 100) + "%" + else: + print " Home directory is less than 90% used. Not clearing MythTV caches." + return 0 + def optimize(): try: cursor = mythtv.db.cursor() @@ -60,6 +85,14 @@ def bail_if_another_is_running(): def run_stuff(): print "\n%s" %get_timestamp() if not subprocess.call(["/usr/bin/python2", "/usr/LH/bin/idle.py"]): + if ("--check_home" in sys.argv) or (len(sys.argv) == 1): + print "\n#######################################" + print "\n%s Checking size of MythTV home" %(get_timestamp()) + if not check_home(): + print "\nFinished checking size of MythTV home" + else: + return True + if ("--optimize" in sys.argv) or (len(sys.argv) == 1): print "\n#######################################" print "\n%s Running Optimize" %(get_timestamp()) @@ -96,7 +129,7 @@ while ctin: if ctin: print "\n%s Waiting 10 minutes before trying again." %(get_timestamp()) time.sleep(600) - + current_time=time.time() if (current_time - starttime) > 3000 : ctin = False -- cgit v0.12 From d4a449905b54a4ec84e794bea4b35244042c9dab Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 13 Nov 2015 04:34:16 +0000 Subject: mythinstall: rebuild --- abs/core/mythinstall/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD index e053c0d..76c7ca3 100644 --- a/abs/core/mythinstall/PKGBUILD +++ b/abs/core/mythinstall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jams pkgname=mythinstall pkgver=8.3 -pkgrel=11 +pkgrel=12 pkgdesc="LinHES installer/systemconfig GUI." arch=('i686' 'x86_64') depends=('mythtv>=0.27') -- cgit v0.12 From eebf53bdb256c6bac0303aae0690fb4a2e01874f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 13 Nov 2015 18:04:03 +0000 Subject: cifs-utils: update to 6.4 --- abs/extra/cifs-utils/PKGBUILD | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/abs/extra/cifs-utils/PKGBUILD b/abs/extra/cifs-utils/PKGBUILD index fb2db27..cc97948 100644 --- a/abs/extra/cifs-utils/PKGBUILD +++ b/abs/extra/cifs-utils/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 200381 2013-11-27 10:08:51Z tpowa $ +# $Id$ # Maintainer: Tobias Powalowski pkgname=cifs-utils -pkgver=6.2 +pkgver=6.4 pkgrel=1 pkgdesc="CIFS filesystem user-space tools" arch=(i686 x86_64) url="http://wiki.samba.org/index.php/LinuxCIFS_utils" license=('GPL') -depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient') -source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2) +depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient' 'pam') +source=("https://download.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2"{,.asc}) +validpgpkeys=('98EDEB95638461E78CE83B795AFDBFB270F3B981') #cifs-utils Distribution Verification Key build() { cd "$srcdir/$pkgname-$pkgver" @@ -21,7 +22,11 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" ROOTSBINDIR=/usr/bin install + mkdir -p $pkgdir/etc/request-key.d + install -m 644 contrib/request-key.d/cifs.idmap.conf $pkgdir/etc/request-key.d + install -m 644 contrib/request-key.d/cifs.spnego.conf $pkgdir/etc/request-key.d # set mount.cifs uid, to enable none root mounting form fstab chmod +s $pkgdir/usr/bin/mount.cifs } -md5sums=('6a83fe19e02266cb468ea3bf1cc0d007') +md5sums=('b7d75b67fd3987952896d27256c7293d' + 'SKIP') -- cgit v0.12 From 838fe688fe806e4d96cad5c7a3a7489ed6281fc6 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 13 Nov 2015 20:22:37 +0000 Subject: LinHES-config: soundconfig.sh: select card for iecset to enable audio to play on non default cards. Unmute IEC958 devices so that test will actually make sound. --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/soundconfig.sh | 24 +++++++++++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 54b6a83..ac9cce9 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.3 -pkgrel=22 +pkgrel=23 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' @@ -151,7 +151,7 @@ md5sums=('17d9dd5a097fbbd4dae75dff8e2677ff' '6e5639fff82fa2ba76113ac1ab8f2016' 'f0376c98a7986897406d393186c0365e' '157e73d0f90d7b306aba8f5921aeedd3' - 'db9b625332493d5a7d12f3fa3ffae0ff' + '1f58c0393a131f4a8f9a84b3fe08a7e4' 'eef9b882ecb70648a8f253f85b73a274' '5f890ea9bda6aef652d2560ca19dac07' 'ab2aa42c2947148c2b1cac0ade6d1d55' diff --git a/abs/core/LinHES-config/soundconfig.sh b/abs/core/LinHES-config/soundconfig.sh index 2f30306..e6aaa41 100755 --- a/abs/core/LinHES-config/soundconfig.sh +++ b/abs/core/LinHES-config/soundconfig.sh @@ -143,8 +143,6 @@ function write_asound { pcm "hw:'"$mixAUDIODEVICE"'" period_size 512 buffer_size 4096 -# rate 48000 -# format S16_LE } } @@ -241,8 +239,28 @@ case $SOUNDOPTYPE in ;; test|TEST) echo $@ > /tmp/audio.test + #set iec958 audio bit - iecset audio 1 + if [[ $AUDIODEVICE == plughw:* ]] + then + cardName=`echo $AUDIODEVICE | sed 's/plughw:\(.*\),.*/\1/g'` + #cardDevice=`echo $AUDIODEVICE | sed 's/.*,\(.*\)/\1/g'` + iecset -c "$cardName" audio 1 + else + cardName="0" + iecset audio 1 + fi + + #unmute IEC958 + amixerControls=`amixer -c "$cardName" scontrols` + while read -r line; do + if [[ $line == *IEC958* ]] + then + amixCard=`echo "$line" | sed "s/.*\ \('.*\)/\1/g"` + amixer -c "$cardName" sset "$amixCard" unmute + fi + done <<< "$amixerControls" + #loadsound if [ x$AUDIOTYPE = xOSS -o x$AUDIOTYPE = xoss ] then -- cgit v0.12 From 917316aa3b3dc34b579616286f26666a8243d998 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 23 Nov 2015 16:42:08 +0000 Subject: mythtv & mythplugins: update to latest -fixes remove tmdb3_query_limit.2 patch as it has been applied upstream --- abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 6 +- .../stable-0.27/mythtv/tmdb3_query_limit.2.diff | 70 ---------------------- 4 files changed, 4 insertions(+), 76 deletions(-) delete mode 100644 abs/core/mythtv/stable-0.27/mythtv/tmdb3_query_limit.2.diff diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index 3ebe7b8..73d61a0 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -acd481df3f5be108bd6de5f4be27ac50aedab162 +5c34db0fa3da9bccf4cf16c696b34d12d08c5fa6 diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 127c5d3..29eb7db 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.5 -pkgrel=11 +pkgrel=12 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index 786ca3d..706cb77 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.5 -pkgrel=11 +pkgrel=12 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -23,10 +23,9 @@ patches=('myth_settings.patch' 'videoAlwaysUseBookmark.patch' 'fixQTvirtualkeyboard.patch' 'suggestedstarttime.patch.v1' - 'tmdb3_query_limit.2.diff') + ) #fixQTvirtualkeyboard.patch: https://code.mythtv.org/trac/ticket/12347 #suggestedstarttime.patch.v1: http://code.mythtv.org/trac/ticket/11562 next mythfilldatabase run in mythweb - #tmdb3_query_limit.2.diff: https://code.mythtv.org/trac/ticket/12455 optdepends=() replaces=('mythvideo' 'myththemes') @@ -109,5 +108,4 @@ md5sums=('5f3e43567e62afe17bad39f5a9b604cf' '41098e898361a5a3cde3eaae358482a8' 'a853dff0f5c92ca58fcc1e389cd16266' '35a7fd3e3057691e3b1bf355bb9e8b16' - 'a41581e7b80093eeadabcf7d9d01fc19' '928de4b070d9f3b784d55c0db415eaf3') diff --git a/abs/core/mythtv/stable-0.27/mythtv/tmdb3_query_limit.2.diff b/abs/core/mythtv/stable-0.27/mythtv/tmdb3_query_limit.2.diff deleted file mode 100644 index 7b44537..0000000 --- a/abs/core/mythtv/stable-0.27/mythtv/tmdb3_query_limit.2.diff +++ /dev/null @@ -1,70 +0,0 @@ -diff --git mythtv/bindings/python/tmdb3/tmdb3/request.py mythtv/bindings/python/tmdb3/tmdb3/request.py -index 2de4cd5..1b6663d 100644 ---- src/mythtv/bindings/python/tmdb3/tmdb3/request.py -+++ src/mythtv/bindings/python/tmdb3/tmdb3/request.py -@@ -16,6 +16,7 @@ from urllib import urlencode - import urllib2 - import json - import os -+import time - - DEBUG = False - cache = Cache(filename='pytmdb3.cache') -@@ -113,21 +114,32 @@ class Request(urllib2.Request): - def readJSON(self): - """Parse result from specified URL as JSON data.""" - url = self.get_full_url() -- try: -- # catch HTTP error from open() -- data = json.load(self.open()) -- except TMDBHTTPError, e: -+ tries = 0 -+ while tries < 100: - try: -- # try to load whatever was returned -- data = json.loads(e.response) -- except: -- # cannot parse json, just raise existing error -+ # catch HTTP error from open() -+ data = json.load(self.open()) -+ break -+ except TMDBHTTPError, e: -+ try: -+ # try to load whatever was returned -+ data = json.loads(e.response) -+ except: -+ # cannot parse json, just raise existing error -+ raise e -+ else: -+ # Check for error code of 25 which means we are doing more than 40 requests per 10 seconds -+ if data.get('status_code', 1) ==25: -+ # Sleep and retry query. -+ if DEBUG: -+ print 'Retry after {0} seconds'.format(max(float(e.headers['retry-after']),10)) -+ time.sleep(max(float(e.headers['retry-after']),10)) -+ continue -+ else: -+ # response parsed, try to raise error from TMDB -+ handle_status(data, url) -+ # no error from TMDB, just raise existing error - raise e -- else: -- # response parsed, try to raise error from TMDB -- handle_status(data, url) -- # no error from TMDB, just raise existing error -- raise e - handle_status(data, url) - if DEBUG: - import pprint -diff --git mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py -index f85fbcf..5020c4a 100644 ---- src/mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py -+++ src/mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py -@@ -96,6 +96,7 @@ class TMDBHTTPError(TMDBError): - def __init__(self, err): - self.httperrno = err.code - self.response = err.fp.read() -+ self.headers = err.headers - super(TMDBHTTPError, self).__init__(str(err)) - - -- cgit v0.12 From 214fa024f53003b4ce5aa0a7888f12f80684703f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 23 Nov 2015 17:54:42 +0000 Subject: LinHES-system: linhes_update.sh & linhes_update2.sh: fix linhes.xml from being incomplete grep 2.22 changed of behavior so changed the options don't use pkill -USR1 mythfrontend as it causes some keybindings to not work after. --- abs/core/LinHES-system/PKGBUILD | 6 +-- abs/core/LinHES-system/linhes_update.sh | 72 +++++++++++++------------------- abs/core/LinHES-system/linhes_update2.sh | 49 ++++++++++------------ 3 files changed, 54 insertions(+), 73 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index e3c1700..e8f220d 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.3 -pkgrel=19 +pkgrel=20 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -124,8 +124,8 @@ md5sums=('76842f8cff548d2c1289e0992a8b84dd' 'cd28dd67a78f3b7da704e31db0298916' 'e9f545c3bcf9c85b45496c281fc6a1b8' 'a94fe6d980f4b810f2e2ae5352084b39' - '384956b4fd9bf40907856bab0e67b169' - 'f4ce577e2ab1b6dbf9def46a8ab86e2d' + '0d1632ea63d8145c173c6aecf0b007f0' + 'ff689f2e9572a78d88384b2e5774f579' '28f29578e5b3ba84fdf2aa57cf475bcf' '4a1fda884dcd7d65fb2690fbdbd92a83' '2b7fe3b57592823a4c7e3ec132dcb7f4' diff --git a/abs/core/LinHES-system/linhes_update.sh b/abs/core/LinHES-system/linhes_update.sh index d563504..3ac2a56 100644 --- a/abs/core/LinHES-system/linhes_update.sh +++ b/abs/core/LinHES-system/linhes_update.sh @@ -9,17 +9,6 @@ usage () { exit $1 } -restart_mfe () { - #check if started from mythfrontend-start and if so just kill mfe - #otherwise reload mfe - if [[ `pgrep -fx "/bin/bash /usr/LH/bin/mythfrontend-start"` ]] - then - killall mythfrontend - else - pkill -USR1 mythfrontend - fi -} - dsply () { if grep -q "Updates Available" /usr/share/mythtv/themes/defaultmenu/linhes.xml then @@ -28,10 +17,10 @@ dsply () { msg_client.py --kill msg_client.py --msg "Updates available!\nGo to the Service Menu to install the updates.|middle" else - restart_mfe + killall mythfrontend fi echo " Updates available!" - exit + exit else [ "$1" = false ] && { msg_client.py --msg "Checking for updates...|middle" --timeout 600 --tag "checkUpdates"; } echo " Checking for updates..." @@ -39,11 +28,11 @@ dsply () { } chck () { - sudo pacman -Sy + sudo pacman -Sy [ -f /tmp/to_be_upgraded ] && sudo rm /tmp/to_be_upgraded - sudo pacman -Qu > /tmp/to_be_upgraded - if [[ ! -s /tmp/to_be_upgraded ]] - then + sudo pacman -Qu > /tmp/to_be_upgraded + if [[ ! -s /tmp/to_be_upgraded ]] + then #hide LinHES update message on main menu echo " Hiding update message in LinHES theme." sudo sed -i '/LinHES UPDATE MESSAGE/c\ " >> /tmp/linhes.xml.tmp - echo " " >> /tmp/linhes.xml.tmp - echo "" >> /tmp/linhes.xml.tmp - echo "" >> /tmp/linhes.xml.tmp - mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml + 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 -va '/mythmenu' /tmp/linhes.xml > /tmp/linhes.xml.tmp + echo "" >> /tmp/linhes.xml.tmp + echo " " >> /tmp/linhes.xml.tmp + echo "" >> /tmp/linhes.xml.tmp + echo "" >> /tmp/linhes.xml.tmp + mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml - echo "" > /tmp/update3.xml.tmp + echo "" > /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 + then echo "" >> /tmp/update3.xml.tmp echo " " >> /tmp/update3.xml.tmp - fi + fi #create menu items for each pkg to be upgraded - while read line; do + while read line; do echo "" >> /tmp/update3.xml.tmp echo " " >> /tmp/linhes.xml.tmp - echo "" >> /tmp/linhes.xml.tmp - echo "" >> /tmp/linhes.xml.tmp - echo "" >> /tmp/linhes.xml.tmp - mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml + 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 -va '/mythmenu' /tmp/linhes.xml > /tmp/linhes.xml.tmp + echo "" >> /tmp/linhes.xml.tmp + echo " " >> /tmp/linhes.xml.tmp + echo "" >> /tmp/linhes.xml.tmp + echo "" >> /tmp/linhes.xml.tmp + echo "" >> /tmp/linhes.xml.tmp + mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml fi #hide LinHES update message on main menu sudo sed -i '/LinHES UPDATE MESSAGE/c\ + + + diff --git a/abs/extra/openpht/plexhometheater.sh b/abs/extra/openpht/plexhometheater.sh new file mode 100755 index 0000000..579bed6 --- /dev/null +++ b/abs/extra/openpht/plexhometheater.sh @@ -0,0 +1,11 @@ +#!/bin/sh +#Stop XScreensaver +stop_xss.sh & + +#Launch plex +export XBMC_BIN_HOME='/usr/lib/plexhometheater' +export XBMC_HOME='/usr/share/plexhometheater' +plexhometheater + +#Start Xscreensaver again +killall stop_xss.sh diff --git a/abs/extra/plex-home-theater/PKGBUILD b/abs/extra/plex-home-theater/PKGBUILD deleted file mode 100755 index 6de7cb1..0000000 --- a/abs/extra/plex-home-theater/PKGBUILD +++ /dev/null @@ -1,79 +0,0 @@ -# $Id$ -# Maintainer: Maxime Gauduin -# Contributor: Daniel Wallace - -pkgname=plex-home-theater -pkgver=1.4.1.469 -_pkghash=47a90f01 -pkgrel=2 -pkgdesc='Plex Home Theater' -arch=('i686' 'x86_64') -url='http://www.plexapp.com/' -license=('GPL2') -install="${pkgname}.install" -depends=('boost-libs' 'curl' 'ffmpeg-compat' 'glew' 'libcdio' 'libmad' - 'libmicrohttpd' 'libmpeg2' 'libsamplerate' 'libssh' 'libusb-compat' - 'libvdpau' 'libxrandr' 'lzo' 'sdl_image' 'sdl_mixer' 'smbclient' - 'taglib' 'tinyxml' 'yajl') -makedepends=('boost' 'cmake' 'doxygen' 'git' 'java-environment' 'libcec' - 'libplist' 'libshairport' 'nasm' 'swig' 'unzip' 'zip') -optdepends=('libplist: AirPlay support' - 'libshairport: AirPlay support' - 'libcec: Pulse-Eight USB-CEC adapter support') -source=("https://github.com/plexinc/plex-home-theater-public/archive/v${pkgver}-${_pkghash}.tar.gz" - 'plex-ffmpeg-compat.patch' - 'plex-libcec.patch' - 'plex_lib.conf' - 'plexhometheater.sh') - -prepare() { - cd plex-home-theater-public-${pkgver}-${_pkghash} - - patch -Np1 -i ../plex-libcec.patch - patch -Np1 -i ../plex-ffmpeg-compat.patch -} - -build() { - cd plex-home-theater-public-${pkgver}-${_pkghash} - - if [[ -d build ]]; then - rm -rf build - fi - mkdir build && cd build - - cmake .. \ - -DCMAKE_INSTALL_PREFIX='/usr' \ - -DCMAKE_C_FLAGS="$CMAKE_C_FLAGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \ - -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \ - -DCREATE_BUNDLE='FALSE' \ - -DDUMP_SYMBOLS='FALSE' \ - -DENABLE_AUTOUPDATE='FALSE' \ - -DENABLE_PYTHON='TRUE' \ - -DPYTHON_EXEC='/usr/bin/python2' \ - -DUSE_INTERNAL_FFMPEG='FALSE' - make -} - -package() { - cd plex-home-theater-public-${pkgver}-${_pkghash}/build - - make DESTDIR="${pkgdir}" install - install -dm 755 "${pkgdir}"/usr/{lib/plexhometheater,share/{applications,pixmaps}} - mv "${pkgdir}"/usr/bin/{system,xbmc-xrandr} "${pkgdir}"/usr/lib/plexhometheater/ - mv "${pkgdir}"/usr/share/XBMC "${pkgdir}"/usr/share/plexhometheater - rm -rf "${pkgdir}"/usr/bin/*.so - install -Dm 755 "${srcdir}"/plexhometheater.sh "${pkgdir}"/usr/LH/bin/plexhometheater.sh - install -m 644 ../plex/Resources/plexhometheater.desktop "${pkgdir}"/usr/share/applications/ - install -m 644 ../plex/Resources/plex-icon-256.png "${pkgdir}"/usr/share/pixmaps/plexhometheater.png - - # LinHES stuff - #add in plex_lib.conf - install -D -m0744 ${srcdir}/plex_lib.conf ${pkgdir}/etc/gen_lib_xml.d/plex_lib.conf -} - -# vim: ts=2 sw=2 et: -md5sums=('62456ec6266f769f2c873ed7132b26d3' - '6704244166497db7fa6b3ddd43a0e53b' - '0f753e1ebea13e5a2029a59b9db79877' - 'c1eedd9f89ee727230833db9ef1e5d29' - '4ceae60ed2f9e4304eda4f80d407e799') diff --git a/abs/extra/plex-home-theater/__changelog b/abs/extra/plex-home-theater/__changelog deleted file mode 100644 index e631336..0000000 --- a/abs/extra/plex-home-theater/__changelog +++ /dev/null @@ -1,4 +0,0 @@ -PKGBUILD - Remove opt dep pulseaudio -PKGBUILD - Added plex_lib.conf, this file goes in /etc/gen_lib_xml.d/ -PKGBUILD - Install plexhometheater.sh to /usr/LH/bin -plexhometheater.install - add gen_lib_xml.py to post_install and post_remove and post_update diff --git a/abs/extra/plex-home-theater/plex-ffmpeg-compat.patch b/abs/extra/plex-home-theater/plex-ffmpeg-compat.patch deleted file mode 100755 index 1601500..0000000 --- a/abs/extra/plex-home-theater/plex-ffmpeg-compat.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -rupN plex-home-theater.orig/plex/CMakeModules/FindFFmpeg.cmake plex-home-theater/plex/CMakeModules/FindFFmpeg.cmake ---- plex-home-theater.orig/plex/CMakeModules/FindFFmpeg.cmake 2014-09-15 11:46:21.751638700 +0200 -+++ plex-home-theater/plex/CMakeModules/FindFFmpeg.cmake 2014-09-15 11:43:25.678039000 +0200 -@@ -41,7 +41,7 @@ MACRO(FFMPEG_FIND varname shortname head - /opt/csw/include # Blastwave - /opt/include - /usr/freeware/include -- PATH_SUFFIXES ffmpeg -+ PATH_SUFFIXES ffmpeg-compat - DOC "Location of FFMPEG Headers" - ) - -@@ -62,7 +62,7 @@ MACRO(FFMPEG_FIND varname shortname head - /opt/csw/include # Blastwave - /opt/include - /usr/freeware/include -- PATH_SUFFIXES ffmpeg -+ PATH_SUFFIXES ffmpeg-compat - DOC "Location of FFMPEG Headers" - ) - ENDIF(NOT FFMPEG_${varname}_INCLUDE_DIRS) -@@ -85,6 +85,7 @@ MACRO(FFMPEG_FIND varname shortname head - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -+ PATH_SUFFIXES ffmpeg-compat - DOC "Location of FFMPEG Libraries" - ) - diff --git a/abs/extra/plex-home-theater/plex-home-theater.install b/abs/extra/plex-home-theater/plex-home-theater.install deleted file mode 100644 index 6788abc..0000000 --- a/abs/extra/plex-home-theater/plex-home-theater.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gen_lib_xml.py -} - -post_upgrade() { - gen_lib_xml.py -} - -post_remove() { - gen_lib_xml.py -} diff --git a/abs/extra/plex-home-theater/plex-libcec.patch b/abs/extra/plex-home-theater/plex-libcec.patch deleted file mode 100644 index 2087569..0000000 --- a/abs/extra/plex-home-theater/plex-libcec.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -rupN plex-home-theater-public-1.4.1.469-47a90f01.orig/system/peripherals.xml plex-home-theater-public-1.4.1.469-47a90f01/system/peripherals.xml ---- plex-home-theater-public-1.4.1.469-47a90f01.orig/system/peripherals.xml 2015-07-22 11:09:33.213307552 +0200 -+++ plex-home-theater-public-1.4.1.469-47a90f01/system/peripherals.xml 2015-07-22 11:09:47.349594239 +0200 -@@ -28,7 +28,7 @@ - - - -- -+ - - - -diff -rupN plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp ---- plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp 2015-07-22 11:09:32.826651274 +0200 -+++ plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp 2015-07-22 11:09:47.349594239 +0200 -@@ -101,6 +101,8 @@ bool CPeripheralBusCEC::PerformDeviceSca - break; - case ADAPTERTYPE_RPI: - result.m_mappedBusType = PERIPHERAL_BUS_RPI; -+ // the Pi's adapter cannot be removed, no need to rescan -+ m_bNeedsPolling = false; - break; - default: - break; -diff -rupN plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/devices/PeripheralCecAdapter.cpp plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/devices/PeripheralCecAdapter.cpp ---- plex-home-theater-public-1.4.1.469-47a90f01.orig/xbmc/peripherals/devices/PeripheralCecAdapter.cpp 2015-07-22 11:09:32.826651274 +0200 -+++ plex-home-theater-public-1.4.1.469-47a90f01/xbmc/peripherals/devices/PeripheralCecAdapter.cpp 2015-07-22 11:13:05.310907421 +0200 -@@ -282,7 +283,7 @@ bool CPeripheralCecAdapter::InitialiseFe - } - else - { -- CLog::Log(LOGDEBUG, "%s - using libCEC v%s", __FUNCTION__, m_cecAdapter->ToString((cec_server_version)m_configuration.serverVersion)); -+ CLog::Log(LOGDEBUG, "%s - using libCEC v%s", __FUNCTION__, m_cecAdapter->ToString((cec_version)m_configuration.serverVersion)); - SetVersionInfo(m_configuration); - } - -@@ -295,7 +296,7 @@ bool CPeripheralCecAdapter::InitialiseFe - - void CPeripheralCecAdapter::SetVersionInfo(const libcec_configuration &configuration) - { -- m_strVersionInfo.Format("libCEC %s - firmware v%d", m_cecAdapter->ToString((cec_server_version)configuration.serverVersion), configuration.iFirmwareVersion); -+ m_strVersionInfo.Format("libCEC %s - firmware v%d", m_cecAdapter->ToString((cec_version)configuration.serverVersion), configuration.iFirmwareVersion); - - // append firmware build date - if (configuration.iFirmwareBuildDate != CEC_FW_BUILD_UNKNOWN) -@@ -1303,7 +1304,7 @@ void CPeripheralCecAdapter::SetConfigura - void CPeripheralCecAdapter::SetConfigurationFromSettings(void) - { - // use the same client version as libCEC version -- m_configuration.clientVersion = CEC_CLIENT_VERSION_CURRENT; -+ m_configuration.clientVersion = LIBCEC_VERSION_CURRENT; - - // device name 'XBMC' - snprintf(m_configuration.strDeviceName, 13, "%s", GetSettingString("device_name").c_str()); -@@ -1379,7 +1380,7 @@ void CPeripheralCecAdapter::SetConfigura - m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; - - // double tap prevention timeout in ms -- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); -+ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50; - } - - void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) diff --git a/abs/extra/plex-home-theater/plex_lib.conf b/abs/extra/plex-home-theater/plex_lib.conf deleted file mode 100644 index 1aa78f3..0000000 --- a/abs/extra/plex-home-theater/plex_lib.conf +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/abs/extra/plex-home-theater/plexhometheater.sh b/abs/extra/plex-home-theater/plexhometheater.sh deleted file mode 100755 index 579bed6..0000000 --- a/abs/extra/plex-home-theater/plexhometheater.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -#Stop XScreensaver -stop_xss.sh & - -#Launch plex -export XBMC_BIN_HOME='/usr/lib/plexhometheater' -export XBMC_HOME='/usr/share/plexhometheater' -plexhometheater - -#Start Xscreensaver again -killall stop_xss.sh -- cgit v0.12 From 8ec110e0250531a8e56ba14b5eac356f66fb2345 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 13 Jan 2016 16:51:55 +0000 Subject: mysql: update to 5.6.28 --- abs/core/mysql/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/mysql/PKGBUILD b/abs/core/mysql/PKGBUILD index 9a4e092..b75dca4 100644 --- a/abs/core/mysql/PKGBUILD +++ b/abs/core/mysql/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('mysql' 'libmysqlclient' 'mysql-clients') pkgbase=mysql -pkgver=5.6.25 +pkgver=5.6.28 pkgrel=1 pkgdesc="Fast SQL database server, community edition" arch=('i686' 'x86_64') @@ -169,7 +169,7 @@ package_mysql(){ rm "${pkgdir}/usr/share/man/man1/mysql-test-run.pl.1" } -md5sums=('37664399c91021abe070faa700ecd0ed' +md5sums=('4bc8fde6d04fb7104df1ba8a4025b156' 'b79e65a5aa536e6b5bc60988eb0b78a2' '2fa6e456964d4ff5e6d4f9ff0126aed6' '81b62df0f569935109c1b107dfe9f9fa' -- cgit v0.12 From 8e4814feb5cb7c24c5f2efeb221fb495810d1de2 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 13 Jan 2016 19:47:25 +0000 Subject: linhes-theme: refresh with new background and some other adjustments base.xml: change warning colors to orange menu-ui-vert.xml: adjust logo for new background and menus video-ui.xml: swap Runtime and UserRating location; increase width of Video #; make video stats (video#, runtime, etc) white and the label blue for easier visiblility recordings-ui.xml: made selection colors yellow to be more consistant; moved coverart to appear over the groups when available install-ui.xml: adjustments for background --- abs/core/linhes-theme/PKGBUILD | 30 +- abs/core/linhes-theme/base.xml.patch | 47 +- abs/core/linhes-theme/blank_coverart.png | Bin 0 -> 50947 bytes abs/core/linhes-theme/bubble_background.png | Bin 0 -> 1857101 bytes abs/core/linhes-theme/install-ui.xml | 28 +- abs/core/linhes-theme/menu-ui-vert.xml.patch | 114 ++- abs/core/linhes-theme/preview.png | Bin 736603 -> 264596 bytes abs/core/linhes-theme/recordings-ui.xml.patch | 116 +++ abs/core/linhes-theme/video-ui.xml.patch | 1194 +++++++++++++++++++++++++ 9 files changed, 1460 insertions(+), 69 deletions(-) create mode 100755 abs/core/linhes-theme/blank_coverart.png create mode 100644 abs/core/linhes-theme/bubble_background.png mode change 100644 => 100755 abs/core/linhes-theme/preview.png create mode 100644 abs/core/linhes-theme/recordings-ui.xml.patch create mode 100644 abs/core/linhes-theme/video-ui.xml.patch diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index 02ee1db..e3af746 100644 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,5 +1,5 @@ pkgname=linhes-theme -pkgver=8.3 +pkgver=8.4 pkgrel=1 pkgdesc="Default LinHES MythTV theme" arch=('i686' 'x86_64') @@ -7,12 +7,13 @@ license=('GPL2') url="http://linhes.org/" patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch' - 'menu-ui-vert.xml.patch' 'schedule-ui.xml.patch' 'qtlook.txt.patch') + 'menu-ui-vert.xml.patch' 'schedule-ui.xml.patch' 'qtlook.txt.patch' + 'recordings-ui.xml.patch' 'video-ui.xml.patch') #The LinHES theme is based on TintedGlass 4.56 by Harley Peters source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml' 'osd_subtitle.xml' - 'background.png' 'preview.png' 'tux_thoughts.png' - 'LHLogoAndText.png') + 'bubble_background.png' 'preview.png' 'blank_coverart.png' + 'LHLogo.png' 'LHLogoAndText.png') prepare() { _gitroot="https://github.com/MythTV-Themes/TintedGlass.git" @@ -53,11 +54,13 @@ package() { msg "Copy *.xml and adding backgrounds and images for LinHES" rsync -pL $srcdir/*.xml $pkgdir/$THEMEROOT/LinHES/ rm -r $pkgdir/$THEMEROOT/LinHES/images/backgrounds/* - rsync -pL $srcdir/background.png $pkgdir/$THEMEROOT/LinHES/images/backgrounds/ + rsync -pL $srcdir/bubble_background.png $pkgdir/$THEMEROOT/LinHES/images/backgrounds/background.png + rsync -pL $srcdir/blank_coverart.png $pkgdir/$THEMEROOT/LinHES/images/ rsync -pL $srcdir/preview.png $pkgdir/$THEMEROOT/LinHES/ #tux_thoughts.png is the thought bubble for the menu descriptions - rsync -pL $srcdir/tux_thoughts.png $pkgdir/$THEMEROOT/LinHES/images/ + #rsync -pL $srcdir/tux_thoughts.png $pkgdir/$THEMEROOT/LinHES/images/ + rsync -pL $srcdir/LHLogo.png $pkgdir/$THEMEROOT/LinHES/images/ rsync -pL $srcdir/LHLogoAndText.png $pkgdir/$THEMEROOT/LinHES/images/ #vertical menu @@ -81,14 +84,17 @@ package() { } md5sums=('2dca856c2a4d1f959473512c94e43b60' '13bff6425487194cc7bc622e64c6176a' - '5fccb4e20c15d87223ea5de4c40faa06' - 'acf2fa359f7be7db30a81cae4dd5fa3f' + 'f2b9c85519e80843294315a42870e582' + 'e17b628a6a9d8e0bdb20f6f5e0651a0c' '22ff4044c8c29560451fb51dcbf4d44e' '9fe3371a8b964a7028126405cfaa330b' + '919d02ffb789b2ec3c1fd5d2866d12dc' + 'a04b287a48d5d67ee6d95a8e975684cc' '5a8fb2a5f0e657d52be6f0a6a006ce72' - 'a0201e0aa1608eeab27ee754e4d2c1de' + '35d77d91125e46728a30ab23d0903223' 'bfc32b9fa5dca3d46dd6f365ecb449b5' - '12d26a786fde397348653128a6d7676a' - '4b1c27297bb5f8d9d7bbaf72b35130b5' - '2bd09b8049aaf5ba21db5baf3a0ce077' + '326a71eb795b322a9ea26f116d890c87' + '8fcd0acc11f4db33a9442949fb1a293d' + '699e3abe05523f454db3561bfc08b4b2' + 'b51ef0cbf8ed2d3a8c1a8257a89aceff' '09ad14842f828b7a8d24070ec8214fe5') diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch index a0715f6..f672114 100644 --- a/abs/core/linhes-theme/base.xml.patch +++ b/abs/core/linhes-theme/base.xml.patch @@ -1,5 +1,5 @@ ---- base.xml.orig 2014-10-26 18:47:37.279439028 +0000 -+++ base.xml 2014-10-26 19:02:50.565913686 +0000 +--- base.xml.orig 2016-01-13 18:47:41.473066307 +0000 ++++ base.xml 2016-01-13 01:12:57.516392855 +0000 @@ -3,55 +3,55 @@ @@ -195,6 +195,33 @@ +@@ -305,7 +305,7 @@ + baseextrasmallverylightgrey + baseextrasmalllightgrey + baseextrasmallred +- baseextrasmallyellow ++ baseextrasmallorange + baseextrasmallverylightgrey + baseextrasmallgreen + yes +@@ -317,7 +317,7 @@ + basesmallerverylightgrey + basesmallerlightgrey + basesmallerred +- basesmalleryellow ++ basesmallerorange + basesmallerverylightgrey + basesmallergreen + yes +@@ -329,7 +329,7 @@ + basesmallverylightgrey + basesmalllightgrey + basesmallred +- basesmallyellow ++ basesmallorange + basesmallverylightgrey + basesmallgreen + yes @@ -411,7 +411,7 @@ 283,436,50,11 roundbox @@ -221,10 +248,10 @@ - - - -+ -+ -+ -+ ++ ++ ++ ++ @@ -236,10 +263,10 @@ - - - -+ -+ -+ -+ ++ ++ ++ ++ diff --git a/abs/core/linhes-theme/blank_coverart.png b/abs/core/linhes-theme/blank_coverart.png new file mode 100755 index 0000000..c44148e Binary files /dev/null and b/abs/core/linhes-theme/blank_coverart.png differ diff --git a/abs/core/linhes-theme/bubble_background.png b/abs/core/linhes-theme/bubble_background.png new file mode 100644 index 0000000..28d83f1 Binary files /dev/null and b/abs/core/linhes-theme/bubble_background.png differ diff --git a/abs/core/linhes-theme/install-ui.xml b/abs/core/linhes-theme/install-ui.xml index 1c95ef3..b3f1884 100644 --- a/abs/core/linhes-theme/install-ui.xml +++ b/abs/core/linhes-theme/install-ui.xml @@ -9,10 +9,28 @@ @@ -57,27 +75,27 @@ - 365,450,550,179 + 365,480,550,179 true images/LHLogoAndText.png - 107,465,150,150 + 107,495,150,150 true /usr/MythVantage/logos/logo-%1.png 5000 - 1022,465,150,150 + 1022,495,150,150 diff --git a/abs/core/linhes-theme/menu-ui-vert.xml.patch b/abs/core/linhes-theme/menu-ui-vert.xml.patch index 5d6f330..543b638 100644 --- a/abs/core/linhes-theme/menu-ui-vert.xml.patch +++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch @@ -1,56 +1,48 @@ ---- menu-ui-vert.xml.orig 2014-12-15 17:49:37.474734296 +0000 -+++ menu-ui-vert.xml 2014-12-15 17:51:03.670344843 +0000 -@@ -18,6 +18,49 @@ +--- menu-ui-vert.xml.orig 2016-01-13 18:48:20.631382184 +0000 ++++ menu-ui-vert.xml 2016-01-13 18:24:57.804680515 +0000 +@@ -18,6 +18,41 @@ 394,0,2,720 -+ -+ 594,165,487,210 -+ images/tux_thoughts.png -+ -+ -+ -+ -+ -+ 519,348,638,207 -+ images/LHLogoAndText.png -+ -+ + + ++ ++ 554,645,172,43 ++ images/LHLogo.png ++ ++ ++ ++ @@ -102,36 +94,57 @@ -@@ -136,9 +224,9 @@ +- 87,62,310,596 ++ 87,62,310,586 + vertical + 4 + free +@@ -136,9 +216,9 @@ 0,0,100%,100% - 0,0,310,64 -+ 0,0,310,66 ++ 0,0,310,60 - -10,0,330,64 -+ -10,0,330,66 ++ -12,0,330,80 - 0,0,330,100% +- 0,0,330,100% ++ 0,0,100%,100% ++ ++ -1,-1,100%+2,100%+2 ++ box ++ ++ ++ 0,4,2,100%-6 ++ ++ ++ 100%-2,4,2,100%-6 ++ - - 330,12,843,40 @@ -148,6 +161,23 @@ - no - - ++ ++ +@@ -190,7 +270,7 @@ + + + +- 147,588 ++ 147,578 + yes + + diff --git a/abs/core/linhes-theme/preview.png b/abs/core/linhes-theme/preview.png old mode 100644 new mode 100755 index 506ab1d..7c1efdb Binary files a/abs/core/linhes-theme/preview.png and b/abs/core/linhes-theme/preview.png differ diff --git a/abs/core/linhes-theme/recordings-ui.xml.patch b/abs/core/linhes-theme/recordings-ui.xml.patch new file mode 100644 index 0000000..af599c0 --- /dev/null +++ b/abs/core/linhes-theme/recordings-ui.xml.patch @@ -0,0 +1,116 @@ +--- recordings-ui.xml.orig 2016-01-13 18:49:43.937377460 +0000 ++++ recordings-ui.xml 2016-01-13 01:12:57.516392855 +0000 +@@ -105,19 +105,11 @@ + + + +- 188,487,684,2 ++ 37,487,835,2 + + + +- 188,643,684,2 +- +- +- +- 37,464,136,204 +- roundbox +- +- +- 6 ++ 37,643,835,2 + + + +@@ -194,6 +186,7 @@ + + +@@ -232,11 +225,12 @@ + 0,0,898,64 + + + + + + + +- 189,659 ++ 38,659 + +- 0,0,682,8 ++ 0,0,833,8 + images/progressbar/progressbar_background.png + + +- 0,0,682,8 ++ 0,0,833,8 + images/progressbar/progressbar_fill.png + + + + + +@@ -876,13 +877,6 @@ + left,vcenter + + +- +- + + 1206,416,30,30 + +@@ -890,238 +884,273 @@ + 0,0,30,30 + images/mv_level_none.png + ++ + + + + 0,0,30,30 + images/mv_level_lowest.png + ++ + + + + 0,0,30,30 + images/mv_level_low.png + ++ + + + + 0,0,30,30 + images/mv_level_medium.png + ++ + + + + 0,0,30,30 + images/mv_level_high.png + ++ + + + + + + + +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +- +- +- +- +- +- +- +- +- +- + + + + + + + + + + + + + + + +@@ -1369,14 +1398,14 @@ + basemediumlargeryellow + left,vcenter + +- ++ + + 1206,414,30,30 + +@@ -1384,238 +1413,273 @@ + 0,0,30,30 + images/mv_level_none.png + ++ + + + + 0,0,30,30 + images/mv_level_lowest.png + ++ + + + + 0,0,30,30 + images/mv_level_low.png + ++ + + + + 0,0,30,30 + images/mv_level_medium.png + ++ + + + + 0,0,30,30 + images/mv_level_high.png + ++ + + + + + + + +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +- +- +- +- +- +- +- +- +- +- + + + + + + + + + + + + + + + +@@ -1798,6 +1862,7 @@ + + + + + +@@ -1875,7 +1940,7 @@ + 0,0,30,30 + images/mv_level_high.png + +- + + ++ ++ + +- ++ ++ ++ ++ ++ ++ ++ ++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +- +- +- +- +- +- +- +- +- +- + + + + + + + + + + + + + + + + +@@ -2947,82 +3013,84 @@ + no + basesmalldarkyellow + allcenter +- yes ++ + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v0.12 From 30389cf99f1c91e32a6966e2668fe358139a329a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 13 Jan 2016 20:22:22 +0000 Subject: LinHES-system: add /etc/X11/autostart/autostart.run --- abs/core/LinHES-system/PKGBUILD | 8 +++++--- abs/core/LinHES-system/autostart.run | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 abs/core/LinHES-system/autostart.run diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index c700861..26fc453 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.3 -pkgrel=22 +pkgrel=23 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -10,7 +10,7 @@ depends=('linhes-sounds' 'xdotool' 'tilda' 'keylaunch' 'python2-dbus' 'unclutter' 'wmctrl' 'archlinux-xdg-menu' 'ethtool' 'gnu-netcat' 'normalize' 'ttf-overlock' 'handbrake-cli' 'mkvtoolnix' 'mplayer' 'runit-scripts>=8.1-12') -backup=('etc/modprobe.d/alsa-base.conf') +backup=('etc/modprobe.d/alsa-base.conf' 'etc/X11/autostart/autostart.run') binfiles="LinHES-start optimize_mythdb.py myth_mtc.py load-modules-mythvantage.sh unclutter-toggle.sh tvterm.sh mythfrontend-start set_windowmanager.sh myth_status.py myth_status.sh @@ -28,7 +28,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py 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 +source=(LinHES-session autostart.run LinHES-profile.sh $binfiles alsa-base cacheclean.cron fstrim.cron myth_mtc.cron xfs_defrag.cron etc_care.cron readme_is_xml readme_light add_storage.readme system-sudo.rules msg.cfg) @@ -40,6 +40,7 @@ package() { BINDIR=$pkgdir/usr/bin install -m755 -D LinHES-session $pkgdir/etc/X11/Sessions/LinHES + install -m755 -D autostart.run $pkgdir/etc/X11/autostart/autostart.run install -m755 -D LinHES-profile.sh $pkgdir/etc/profile.d/LinHES-profile.sh #files install to /usr/LH/bin @@ -79,6 +80,7 @@ package() { } md5sums=('76842f8cff548d2c1289e0992a8b84dd' + 'ad5e144999b6f37931dea799c2761c7e' 'de32a1c50101265dd7f6ca5037f7a26a' '2d7b8414ddce5f401331342ac1529c22' '76b2637cac0452b3acdbeeb4e8a5474b' diff --git a/abs/core/LinHES-system/autostart.run b/abs/core/LinHES-system/autostart.run new file mode 100644 index 0000000..278bc2b --- /dev/null +++ b/abs/core/LinHES-system/autostart.run @@ -0,0 +1,7 @@ +#!/bin/bash +# autostart.run runs after X has started. +# Put startup commands for scripts and programs in this file. +# Any files with execute permission in /etc/X11/autostart will also be run +# when X starts. +# Scripts and programs that don't require X can be started from +# /etc/runit/1.local. -- cgit v0.12 From 409b5af51eee9e207a5df243abf2632d26c0b1f6 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 14 Jan 2016 21:02:48 +0000 Subject: google-chrome: update to 47.0.2526.111 --- abs/extra/google-chrome/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD index 9fae3cd..1ce0299 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=47.0.2526.106 +pkgver=47.0.2526.111 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('i686' 'x86_64') @@ -24,10 +24,6 @@ source=('google-chrome-stable' 'eula_text.html') source_i686=("google-chrome-${_channel}_${pkgver}_i386.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_i386.deb") source_x86_64=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb") -md5sums=('99fa93d5e7fb5d622cef0f9621f3ffa3' - 'b7e752f549b215ac77f284b6486794b6') -md5sums_i686=('93cf807452e6d69d079e4b874f1bd085') -md5sums_x86_64=('ac9a6f982fb0e64a96ca63229ae7b56e') package() { msg2 "Extracting the data.tar.lzma..." @@ -62,3 +58,7 @@ package() { msg2 "Rename google-chrome-stable to google-chrome..." mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome } +md5sums=('99fa93d5e7fb5d622cef0f9621f3ffa3' + 'b7e752f549b215ac77f284b6486794b6') +md5sums_i686=('2397933553deff22b2f60d4bdcddd607') +md5sums_x86_64=('5aa55a8382b7614098c775d011249abb') -- cgit v0.12 From bd99523adf334481f5e09ed8d52ce82d121e1e65 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 14 Jan 2016 21:13:40 +0000 Subject: webmin: update to 1.780 --- abs/extra/webmin/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/extra/webmin/PKGBUILD b/abs/extra/webmin/PKGBUILD index 1962157..c823016 100644 --- a/abs/extra/webmin/PKGBUILD +++ b/abs/extra/webmin/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Tobias Powalowski pkgname=webmin -pkgver=1.760 +pkgver=1.780 pkgrel=1 pkgdesc="a web-based interface for system administration" arch=(i686 x86_64) @@ -219,7 +219,7 @@ package() { # install license install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE } -md5sums=('69ca5bd1f4ca0e1fa48afcd914bacf4a' +md5sums=('d5de2ef2b47de718c7f1addbf0bc2e5c' 'b0b3e3fb231a12e60165b6b4d604dcfa' 'bfebb75bb94029b48c46b7f1ba1aa811' 'fc29ecb6a5cd8c278abe054e60381095') -- cgit v0.12 From 384da89ebb8060c6c8f20aaffcf17e1feab56374 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 15 Jan 2016 19:23:33 +0000 Subject: LinHES-system: myth_mtc.cron: don't run optimize on frontend_only systems myth_mtc.py: add --noidlecheck option to not check forsystem idle. This is probably wise to only use for testing. --- abs/core/LinHES-system/PKGBUILD | 6 +++--- abs/core/LinHES-system/myth_mtc.cron | 17 ++++++++++++----- abs/core/LinHES-system/myth_mtc.py | 22 +++++++++++++++++----- 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 26fc453..5501add 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.3 -pkgrel=23 +pkgrel=24 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -84,7 +84,7 @@ md5sums=('76842f8cff548d2c1289e0992a8b84dd' 'de32a1c50101265dd7f6ca5037f7a26a' '2d7b8414ddce5f401331342ac1529c22' '76b2637cac0452b3acdbeeb4e8a5474b' - 'cd81693e73556ff09565799516e81554' + '8e5d224788154fea8639a37eecdaefd9' 'dc3eef2a624754e16805d72bbe488b67' '617af86b901538817ebdcaf646248dc5' '542e670e78d117657f93141e9689f54d' @@ -139,7 +139,7 @@ md5sums=('76842f8cff548d2c1289e0992a8b84dd' 'eb879fee9603a05d5420d4ce8ed9e450' '02c810c2f47b7c4495fdacaf54189473' '1aac1872bf9569ea58ceb2f6f766a654' - '3a9fb38db8ad0736d85d5f85dbb948d7' + '1fb7b4badf30508b0a761a2ae7d7887d' '4d7164800122243be6513b29c8fc498e' 'd14fdc38878c70011754317b0f2ea59e' '36bdfa8d877cea20ca3870faf08e08d5' diff --git a/abs/core/LinHES-system/myth_mtc.cron b/abs/core/LinHES-system/myth_mtc.cron index ff8e84a..6d70058 100755 --- a/abs/core/LinHES-system/myth_mtc.cron +++ b/abs/core/LinHES-system/myth_mtc.cron @@ -1,5 +1,6 @@ #!/bin/bash MYTH_RUN_STATUS=1 +. /etc/systemconfig . /etc/profile date=`date +%Y-%m-%d` @@ -31,13 +32,19 @@ then if ! grep -q "Finished Optimize" $logFile then - MYTHCONFDIR=/usr/share/mythtv unbuffer myth_mtc.py --optimize | $log - if [ $? = 0 ] + if [ $SystemType = Frontend_only ] then - echo "" | $log + echo "Will not run Optimize on Frontend Only systems." | $log + echo "Finished Optimize" | $log else - echo "Time Exceeded" | $log - exit + MYTHCONFDIR=/usr/share/mythtv unbuffer myth_mtc.py --optimize | $log + if [ $? = 0 ] + then + echo "" | $log + else + echo "Time Exceeded" | $log + exit + fi fi fi diff --git a/abs/core/LinHES-system/myth_mtc.py b/abs/core/LinHES-system/myth_mtc.py index ee4fde2..e62592f 100755 --- a/abs/core/LinHES-system/myth_mtc.py +++ b/abs/core/LinHES-system/myth_mtc.py @@ -84,8 +84,20 @@ def bail_if_another_is_running(): def run_stuff(): print "\n%s" %get_timestamp() - if not subprocess.call(["/usr/bin/python2", "/usr/LH/bin/idle.py"]): - if ("--check_home" in sys.argv) or (len(sys.argv) == 1): + + if (len(sys.argv) == 1) or ("--noidlecheck" in sys.argv) and (len(sys.argv) == 2): + runall = True + else: + runall = False + + if ("--noidlecheck" in sys.argv): + print "No system idle check will be done." + idle = 0 + else: + idle = subprocess.call(["/usr/bin/python2", "/usr/LH/bin/idle.py"]) + + if not idle: + if ("--check_home" in sys.argv) or runall: print "\n#######################################" print "\n%s Checking size of MythTV home" %(get_timestamp()) if not check_home(): @@ -93,7 +105,7 @@ def run_stuff(): else: return True - if ("--optimize" in sys.argv) or (len(sys.argv) == 1): + if ("--optimize" in sys.argv) or runall: print "\n#######################################" print "\n%s Running Optimize" %(get_timestamp()) if not optimize(): @@ -101,13 +113,13 @@ def run_stuff(): else: return True - if ("--backup" in sys.argv) or (len(sys.argv) == 1): + if ("--backup" in sys.argv) or runall: print "\n#######################################" print "\n%s Running Backup" %(get_timestamp()) if not os.system('/usr/LH/bin/lh_system_backup_job'): print "\nFinished Backup" - if ("--update" in sys.argv) or (len(sys.argv) == 1): + if ("--update" in sys.argv) or runall: print "\n#######################################" print "\n%s Running System Update" %(get_timestamp()) if not os.system('/usr/LH/bin/lh_system_host_update'): -- cgit v0.12 From d3f8722a113faa265a7abc29629fe467b095a1da Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 15 Jan 2016 20:54:02 +0000 Subject: mythtv & mythplugins: update to latest -fixes --- abs/core/mythtv/stable-0.27/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.27/mythtv/PKGBUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/mythtv/stable-0.27/git_src/git_hash b/abs/core/mythtv/stable-0.27/git_src/git_hash index fa5b15e..fdf94d2 100644 --- a/abs/core/mythtv/stable-0.27/git_src/git_hash +++ b/abs/core/mythtv/stable-0.27/git_src/git_hash @@ -1 +1 @@ -31b271bc1783bd33f5804c225575d89279b6f350 +a62fc0da9e9d8152a5b83cb6e8898faf67d6cbab diff --git a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD index 958061f..f8056c8 100644 --- a/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.27.5 -pkgrel=14 +pkgrel=15 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD index a6e7449..f157f21 100644 --- a/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.27/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.27.5 -pkgrel=14 +pkgrel=15 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12 From 421b1c00b15b19b6d51c59da8befeda9741ae36b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 15 Jan 2016 22:29:15 +0000 Subject: grub: update to 2.02.beta2 --- ...y-issue-when-reading-username-and-passwor.patch | 47 ++ abs/core/grub/10_archlinux | 194 +++++++++ abs/core/grub/20_memtest86+ | 29 -- abs/core/grub/60_memtest86+ | 32 ++ abs/core/grub/PKGBUILD | 481 ++++++++++++++------- abs/core/grub/__changelog | 3 +- abs/core/grub/archlinux_grub_mkconfig_fixes.patch | 22 +- .../grub-10_linux-detect-archlinux-initramfs.patch | 54 +++ abs/core/grub/grub-2.00-mkinitcpio-0.15.patch | 11 + abs/core/grub/grub-2.00.5086-fix-lvm-parsing.patch | 54 +++ abs/core/grub/grub-add-GRUB_COLOR_variables.patch | 32 ++ abs/core/grub/grub-intel-ucode.patch | 26 ++ abs/core/grub/grub.cfg | 8 +- abs/core/grub/grub_bzr_export.sh | 113 ----- 14 files changed, 781 insertions(+), 325 deletions(-) create mode 100644 abs/core/grub/0001-Fix-security-issue-when-reading-username-and-passwor.patch create mode 100755 abs/core/grub/10_archlinux delete mode 100644 abs/core/grub/20_memtest86+ create mode 100644 abs/core/grub/60_memtest86+ create mode 100644 abs/core/grub/grub-10_linux-detect-archlinux-initramfs.patch create mode 100644 abs/core/grub/grub-2.00-mkinitcpio-0.15.patch create mode 100644 abs/core/grub/grub-2.00.5086-fix-lvm-parsing.patch create mode 100644 abs/core/grub/grub-add-GRUB_COLOR_variables.patch create mode 100644 abs/core/grub/grub-intel-ucode.patch delete mode 100644 abs/core/grub/grub_bzr_export.sh diff --git a/abs/core/grub/0001-Fix-security-issue-when-reading-username-and-passwor.patch b/abs/core/grub/0001-Fix-security-issue-when-reading-username-and-passwor.patch new file mode 100644 index 0000000..aa07f2f --- /dev/null +++ b/abs/core/grub/0001-Fix-security-issue-when-reading-username-and-passwor.patch @@ -0,0 +1,47 @@ +From e16eeda1200deabd0d3a4af968d526d62845a85f Mon Sep 17 00:00:00 2001 +From: Hector Marco-Gisbert +Date: Fri, 13 Nov 2015 16:21:09 +0100 +Subject: [PATCH] Fix security issue when reading username and password + + This patch fixes two integer underflows at: + * grub-core/lib/crypto.c + * grub-core/normal/auth.c + +Resolves: CVE-2015-8370 + +Signed-off-by: Hector Marco-Gisbert +Signed-off-by: Ismael Ripoll-Ripoll +--- + grub-core/lib/crypto.c | 2 +- + grub-core/normal/auth.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c +index 010e550..524a3d8 100644 +--- a/grub-core/lib/crypto.c ++++ b/grub-core/lib/crypto.c +@@ -468,7 +468,7 @@ grub_password_get (char buf[], unsigned buf_size) + break; + } + +- if (key == '\b') ++ if (key == '\b' && cur_len) + { + cur_len--; + continue; +diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c +index c6bd96e..5782ec5 100644 +--- a/grub-core/normal/auth.c ++++ b/grub-core/normal/auth.c +@@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size) + break; + } + +- if (key == '\b') ++ if (key == '\b' && cur_len) + { + cur_len--; + grub_printf ("\b"); +-- +2.6.4 + diff --git a/abs/core/grub/10_archlinux b/abs/core/grub/10_archlinux new file mode 100755 index 0000000..f86578a --- /dev/null +++ b/abs/core/grub/10_archlinux @@ -0,0 +1,194 @@ +#!/usr/bin/env bash + +## +## grub-mkconfig helper script specific to Arch Linux +## Contributed by "Keshav Amburay" +## Updated on 08 February 2014 +## +## Script based on do_grub_config() function in Arch Linux Archboot ISO Installer/Setup script +## Some parts taken from /etc/grub.d/10_linux script shipped by GRUB(2) upstream +## +## This script can be freely distributed and/or modified +## under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This script is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## + +_FUNC_GRUB_FILE_PRESENT() { + + [[ -z "${GRUB_PLATFORM}" ]] && GRUB_PLATFORM="x86" + + if [[ "${GRUB_PLATFORM}" == "x86" ]]; then + check="--is-x86-linux32" + elif [[ "${GRUB_PLATFORM}" == "i386-xen-pae" ]]; then + check="--is-i386-xen-pae-domu" + elif [[ "${GRUB_PLATFORM}" == "x86_64-xen" ]]; then + check="--is-x86_64-xen-domu" + else + check="--is-${GRUB_PLATFORM}-linux" + fi + + case "${GRUB_PLATFORM}" in + x86) + list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do + if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi + done)" ;; + *) + list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do + if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi + done)" ;; + esac +} + +set -e + +prefix="/usr" +exec_prefix="${prefix}" +datarootdir="/usr/share" +datadir="${datarootdir}" +sysconfdir="/etc" + +. "${datarootdir}/grub/grub-mkconfig_lib" + +. "${sysconfdir}/default/grub" + +export TEXTDOMAIN="grub" +export TEXTDOMAINDIR="${datarootdir}/locale" + +CLASS="--class arch-linux --class arch --class gnu-linux --class gnu --class os" + +[[ "${grub_file}" != "" ]] && _FUNC_GRUB_FILE_PRESENT + +BOOT_PART_FS_UUID="$(${grub_probe} --target="fs_uuid" "/boot" 2>/dev/null)" +BOOT_PART_HINTS_STRING="$(${grub_probe} --target="hints_string" "/boot" 2>/dev/null || true)" +BOOT_PART_FS="$(${grub_probe} --target="fs" "/boot" 2>/dev/null)" + +ROOT_PART_GRUB_DEVICE="$(${grub_probe} --target=device / || true)" +ROOT_PART_FS="$(${grub_probe} --device ${ROOT_PART_GRUB_DEVICE} --target=fs 2> /dev/null || echo "unknown")" + +if [[ "${GRUB_LINUX_ROOT_DEVICE}" == "" ]]; then + + case "${ROOT_PART_FS}" in + btrfs) + rootsubvol="$(make_system_path_relative_to_its_root /)" + rootsubvol="${rootsubvol#/}" + if [[ "${rootsubvol}" != "" ]]; then + GRUB_LINUX_ROOT_DEVICE="subvol=${rootsubvol}" + fi + ;; + zfs) + rpool="$(${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true)" + bootfs="$(make_system_path_relative_to_its_root / | sed -e "s,@$,,")" + GRUB_LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}" + ;; + esac + + if [[ "${GRUB_DEVICE_UUID}" == "" ]] || \ + [[ "${GRUB_DISABLE_LINUX_UUID}" == "true" ]] || \ + [[ ! -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ]] || \ + uses_abstraction "${GRUB_DEVICE}" lvm ; then + GRUB_LINUX_ROOT_DEVICE="${GRUB_DEVICE}" + else + GRUB_LINUX_ROOT_DEVICE="UUID=${GRUB_DEVICE_UUID}" + fi +fi + +[[ "${GRUB_LINUX_PARAMS}" == "" ]] && GRUB_LINUX_PARAMS="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" + +for _KERNEL_ in ${list} ; do + + echo "Found linux image: ${_KERNEL_}" >&2 + + basename="$(basename "${_KERNEL_}")" + dirname="$(dirname "${_KERNEL_}")" + REAL_DIR="$(make_system_path_relative_to_its_root "${dirname}")" + + _KERNEL_FILE_="$(echo ${_KERNEL_} | sed 's,/boot/,,g')" + _KERNEL_PKG_="pkg-$(echo ${_KERNEL_FILE_} | sed 's,vmlinuz-,,g')" + + _INITRAMFS_="${_KERNEL_FILE_/vmlinuz-/initramfs-}.img" + + if [[ -e "/boot/${_INITRAMFS_}" ]]; then + + echo "Found initramfs image: /boot/${_INITRAMFS_}" >&2 + +cat << EOF + +menuentry "Arch Linux ${_KERNEL_PKG_} kernel" ${CLASS} { + $(save_default_entry) + if [ x\$feature_all_video_module = xy ]; then + insmod all_video + fi + set gfxpayload=keep + insmod ${BOOT_PART_FS} + if [ x\$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} + else + search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} + fi + echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel ...' + linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} + echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel initramfs ...' + initrd ${REAL_DIR}/${_INITRAMFS_} +} + +EOF + fi + + _INITRAMFS_FALLBACK_="${_KERNEL_FILE_/vmlinuz-/initramfs-}-fallback.img" + + if [[ -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then + + echo "Found fallback initramfs image: /boot/${_INITRAMFS_FALLBACK_}" >&2 + +cat << EOF + +menuentry "Arch Linux ${_KERNEL_PKG_} kernel (fallback initramfs)" ${CLASS} { + $(save_default_entry) + if [ x\$feature_all_video_module = xy ]; then + insmod all_video + fi + set gfxpayload=keep + insmod ${BOOT_PART_FS} + if [ x\$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} + else + search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} + fi + echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel ...' + linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} + echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel fallback initramfs ...' + initrd ${REAL_DIR}/${_INITRAMFS_FALLBACK_} +} + +EOF + fi + + if [[ ! -e "/boot/${_INITRAMFS_}" ]] && [[ ! -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then +cat << EOF + +menuentry "Arch Linux ${_KERNEL_PKG_} kernel (no initramfs)" ${CLASS} { + $(save_default_entry) + if [ x\$feature_all_video_module = xy ]; then + insmod all_video + fi + set gfxpayload=keep + insmod ${BOOT_PART_FS} + if [ x\$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} + else + search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} + fi + echo 'Loading Arch Linux ${_KERNEL_PKG_} kernel ...' + linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} +} + +EOF + fi + +done diff --git a/abs/core/grub/20_memtest86+ b/abs/core/grub/20_memtest86+ deleted file mode 100644 index 1d3096f..0000000 --- a/abs/core/grub/20_memtest86+ +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh -e -######################################################## -# This script generates a memtest86+ entry on grub.cfg # -# if memtest is installed on the system. # -######################################################## - -prefix="/usr" -exec_prefix="${prefix}" - -datarootdir="/usr/share" -datadir="${datarootdir}" - -. "${datadir}/grub/grub-mkconfig_lib" - -MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin" -CLASS="--class memtest86 --class gnu --class tool" - -if [ -e $MEMTEST86_IMAGE ] && is_path_readable_by_grub $MEMTEST86_IMAGE; then - # image exists, create menu entry - echo "Found memtest86+ image: $MEMTEST86_IMAGE" >&2 - cat << EOF -menuentry "Memory test (memtest86+)" $CLASS { -EOF - prepare_grub_to_access_device `${grub_probe} --target=device $MEMTEST86_IMAGE` | sed -e "s/^/ /" - cat << EOF - linux16 (\$root)`make_system_path_relative_to_its_root $MEMTEST86_IMAGE` -} -EOF -fi diff --git a/abs/core/grub/60_memtest86+ b/abs/core/grub/60_memtest86+ new file mode 100644 index 0000000..086f0cc --- /dev/null +++ b/abs/core/grub/60_memtest86+ @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +######################################################## +# This script generates a memtest86+ entry on grub.cfg # +# if memtest is installed on the system. # +######################################################## + +prefix="/usr" +exec_prefix="${prefix}" + +datarootdir="/usr/share" +datadir="${datarootdir}" + +. "${datadir}/grub/grub-mkconfig_lib" + +MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin" +CLASS="--class memtest86 --class gnu --class tool" + +if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" ; then + ## image exists, create menu entry + echo "Found memtest86+ image: ${MEMTEST86_IMAGE}" >&2 + _GRUB_MEMTEST_HINTS_STRING="$(${grub_probe} --target=hints_string ${MEMTEST86_IMAGE})" + _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})" + _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})" + cat << EOF +if [ "\${grub_platform}" == "pc" ]; then + menuentry "Memory Tester (memtest86+)" ${CLASS} { + search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID} + linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86} + } +fi +EOF +fi diff --git a/abs/core/grub/PKGBUILD b/abs/core/grub/PKGBUILD index 460935d..e7daa70 100644 --- a/abs/core/grub/PKGBUILD +++ b/abs/core/grub/PKGBUILD @@ -1,90 +1,173 @@ -# Maintainer: Ronald van Haren -# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Maintainer : Tobias Powalowski +# Maintainer : Ronald van Haren +# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -_grub_lua_ver=24 -_grub_ntldr_ver=21 -_grub_915_ver=9 +## "1" to enable IA32-EFI build in Arch x86_64, "0" to disable +_IA32_EFI_IN_ARCH_X64="1" -pkgname=('grub-common' 'grub-bios' 'grub-efi-i386') -pkgbase=grub -pkgver=2.00 -pkgrel=2 -url="https://www.gnu.org/software/grub/" -arch=('i686' 'x86_64') -license=('GPL3') -makedepends=('xz' 'bdf-unifont' 'ttf-dejavu' 'python2' 'autogen' - 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') +## "1" to enable EMU build, "0" to disable +_GRUB_EMU_BUILD="0" -source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" - "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" - "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" - "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" - 'archlinux_grub_mkconfig_fixes.patch' - 'grub.default' - 'grub.cfg' - '20_memtest86+' - 'grub_bzr_export.sh') - -noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz" - "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" - "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz") - -sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b' - '89290031b974780c6df76893836d2477d4add895' - 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a' - 'd5ae2efec25616028a9d89e98b6e454f1c4c415f' - '26e4e946190bea1f03632658cf08ba90e11dec57' - 'dbf493dec4722feb11f0b5c71ad453a18daf0fc5' - '76ae862a945a8848e6999adf8ad1847f0f7008b9' - 'ce35d7ae75cd1b5b677e894e528f96add40e77b9' - '0cfd4e51cdb14a92f06cfd3c607f2aa21f3e55fc') +_pkgver="2.02" +_GRUB_GIT_TAG="grub-2.02-beta2" +_GRUB_EXTRAS_COMMIT=4a56e2c2cc3d78f12f1788c27669a651071dee49 -_build_grub-common_and_bios() { +_UNIFONT_VER="6.3.20131217" - ## copy the source for building the common/bios package - cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_bios-${pkgver}" - cd "${srcdir}/grub_bios-${pkgver}" - #sed -i -e '/gets is a security/d' grub-core/gnulib/stdio.in.h - ## Apply Archlinux specific fixes to enable grub-mkconfig detect Arch kernels and initramfs - patch -Np1 -i "${srcdir}/archlinux_grub_mkconfig_fixes.patch" - echo +[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64" +[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386" - ## fix unifont.bdf location so that grub-mkfont can create *.pf2 files - sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub_bios-${pkgver}/configure.ac" +[[ "${CARCH}" == "x86_64" ]] && _EMU_ARCH="x86_64" +[[ "${CARCH}" == "i686" ]] && _EMU_ARCH="i386" - ## fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme - sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub_bios-${pkgver}/configure.ac" +pkgname="grub" +pkgdesc="GNU GRand Unified Bootloader (2)" +pkgver=2.02.beta2 +pkgrel=6 +epoch=1 +url="https://www.gnu.org/software/grub/" +arch=('x86_64' 'i686') +license=('GPL3') +backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom') +install="${pkgname}.install" +options=('!makeflags') - ## add the grub-extra sources - export GRUB_CONTRIB="${srcdir}/grub_bios-${pkgver}/grub-extras/" - install -d "${srcdir}/grub_bios-${pkgver}/grub-extras" +conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy') +replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}") +provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}") - bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ - -C "${srcdir}/grub_bios-${pkgver}/grub-extras" +makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python2' 'autogen' + 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') +depends=('sh' 'xz' 'gettext' 'device-mapper') +optdepends=('freetype2: For grub-mkfont usage' + 'fuse: For grub-mount usage' + 'dosfstools: For grub-mkrescue FAT FS and EFI support' + 'efibootmgr: For grub-install EFI support' + 'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue' + 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' + 'mtools: For grub-mkrescue FAT FS support') + +if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then + makedepends+=('libusbx' 'sdl') + optdepends+=('libusbx: For grub-emu USB support' + 'sdl: For grub-emu SDL support') +fi + +source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG}" + "grub-extras::git+git://git.sv.gnu.org/grub-extras.git#commit=${_GRUB_EXTRAS_COMMIT}" + "http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz" + "http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz.sig" + '0001-Fix-security-issue-when-reading-username-and-passwor.patch' + 'grub-10_linux-detect-archlinux-initramfs.patch' + 'grub-intel-ucode.patch' + 'grub-add-GRUB_COLOR_variables.patch' + '60_memtest86+' + 'grub.default' + 'grub.cfg') + +md5sums=('SKIP' + 'SKIP' + '728b7439ac733a7c0d56049adec364c7' + 'SKIP' + '9589ec46a04f9bb4d5da987340a4a324' + '945527e0de8d384166a4cf23439ae9ee' + 'a678629bc82c4e70c48d28242036d1d7' + 'e506ae4a9f9f7d1b765febfa84e10d48' + 'be55eabc102f2c60b38ed35c203686d6' + 'a03ffd56324520393bf574cefccb893d' + 'c8b9511586d57d6f2524ae7898397a46') +validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33') #Paul Hardy + +_pkgver() { + cd "${srcdir}/grub-${_pkgver}/" + echo "$(git describe --tags)" | sed -e 's|grub.||g' -e 's|-|\.|g' +} - bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \ - -C "${srcdir}/grub_bios-${pkgver}/grub-extras" +prepare() { + + cd "${srcdir}/grub-${_pkgver}/" - bsdtar xf "${srcdir}/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" \ - -C "${srcdir}/grub_bios-${pkgver}/grub-extras" + # CVE-2015-8370 + patch -Np1 -i ../0001-Fix-security-issue-when-reading-username-and-passwor.patch + + msg "Patch to load Intel microcode" + patch -Np1 -i "${srcdir}/grub-intel-ucode.patch" + echo - ## Requires python2 - sed 's|python |python2 |g' -i "${srcdir}/grub_bios-${pkgver}/autogen.sh" + msg "Patch to detect of Arch Linux initramfs images by grub-mkconfig" + patch -Np1 -i "${srcdir}/grub-10_linux-detect-archlinux-initramfs.patch" + echo + + msg "Patch to enable GRUB_COLOR_* variables in grub-mkconfig" + ## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html + patch -Np1 -i "${srcdir}/grub-add-GRUB_COLOR_variables.patch" + echo + + msg "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme" + sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${_pkgver}/configure.ac" + + msg "Fix mkinitcpio 'rw' FS#36275" + sed 's| ro | rw |g' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in" + + msg "Fix OS naming FS#33393" + sed 's|GNU/Linux|Linux|' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in" + + # msg "autogen.sh requires python (2/3). since bzr is in makedepends, use python2 and no need to pull python3" + # sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh" + + msg "Pull in latest language files" + ./linguas.sh + echo + + msg "Remove not working langs which need LC_ALL=C.UTF-8" + sed -e 's#en@cyrillic en@greek##g' -i "${srcdir}/grub-${_pkgver}/po/LINGUAS" + + msg "Avoid problem with unifont during compile of grub, http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847" + cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf" "${srcdir}/grub-${_pkgver}/unifont.bdf" + +} - ## start the actual build process - cd "${srcdir}/grub_bios-${pkgver}" +_build_grub-common_and_bios() { + + msg "Set ARCH dependent variables for bios build" + if [[ "${CARCH}" == 'x86_64' ]]; then + _EFIEMU="--enable-efiemu" + else + _EFIEMU="--disable-efiemu" + fi + + msg "Copy the source for building the bios part" + cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-bios" + cd "${srcdir}/grub-${_pkgver}-bios/" + + msg "Add the grub-extra sources for bios build" + install -d "${srcdir}/grub-${_pkgver}-bios/grub-extras" + cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}-bios/grub-extras/915resolution" + export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}-bios/grub-extras/" + + msg "Unset all compiler FLAGS for bios build" + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + unset LDFLAGS + unset MAKEFLAGS + + cd "${srcdir}/grub-${_pkgver}-bios/" + + msg "Run autogen.sh for bios build" ./autogen.sh echo - - CFLAGS="" ./configure \ + + msg "Run ./configure for bios build" + ./configure \ --with-platform="pc" \ --target="i386" \ - --host="${CARCH}-unknown-linux-gnu" \ "${_EFIEMU}" \ --enable-mm-debug \ --enable-nls \ --enable-device-mapper \ --enable-cache-stats \ + --enable-boot-time \ --enable-grub-mkfont \ --enable-grub-mount \ --prefix="/usr" \ @@ -94,42 +177,47 @@ _build_grub-common_and_bios() { --infodir="/usr/share/info" \ --datarootdir="/usr/share" \ --sysconfdir="/etc" \ - --program-prefix="" \ + --program-prefix="" \ --with-bootdir="/boot" \ --with-grubdir="grub" \ + --disable-silent-rules \ --disable-werror echo - - CFLAGS="" make + + msg "Run make for bios build" + make echo - } -_build_grub-efi-i386() { - - ## copy the source for building the efi package - cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_efi-${pkgver}" - cd "${srcdir}/grub_efi-${pkgver}" - #sed -i -e '/gets is a security/d' grub-core/gnulib/stdio.in.h - export GRUB_CONTRIB="${srcdir}/grub_efi-${pkgver}/grub-extras/" - install -d "${srcdir}/grub_efi-${pkgver}/grub-extras" - - bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ - -C "${srcdir}/grub_efi-${pkgver}/grub-extras" - - cd "${srcdir}/grub_efi-${pkgver}" +_build_grub-efi() { + + msg "Copy the source for building the ${_EFI_ARCH} efi part" + cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}" + cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/" + + msg "Unset all compiler FLAGS for ${_EFI_ARCH} efi build" + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + unset LDFLAGS + unset MAKEFLAGS + + cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/" + + msg "Run autogen.sh for ${_EFI_ARCH} efi build" ./autogen.sh echo - - CFLAGS="" ./configure \ + + msg "Run ./configure for ${_EFI_ARCH} efi build" + ./configure \ --with-platform="efi" \ - --target="i386" \ - --host="${CARCH}-unknown-linux-gnu" \ + --target="${_EFI_ARCH}" \ --disable-efiemu \ --enable-mm-debug \ --enable-nls \ --enable-device-mapper \ --enable-cache-stats \ + --enable-boot-time \ --enable-grub-mkfont \ --enable-grub-mount \ --prefix="/usr" \ @@ -142,108 +230,167 @@ _build_grub-efi-i386() { --program-prefix="" \ --with-bootdir="/boot" \ --with-grubdir="grub" \ + --disable-silent-rules \ --disable-werror echo - - CFLAGS="" make + + msg "Run make for ${_EFI_ARCH} efi build" + make echo + +} +_build_grub-emu() { + + msg "Copy the source for building the emu part" + cp -r "${srcdir}/grub-${_pkgver}/" "${srcdir}/grub-${_pkgver}-emu/" + + msg "Unset all compiler FLAGS for emu build" + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + unset LDFLAGS + unset MAKEFLAGS + + cd "${srcdir}/grub-${_pkgver}-emu/" + + msg "Run autogen.sh for emu build" + ./autogen.sh + echo + + msg "Run ./configure for emu build" + ./configure \ + --with-platform="emu" \ + --target="${_EMU_ARCH}" \ + --enable-mm-debug \ + --enable-nls \ + --enable-device-mapper \ + --enable-cache-stats \ + --enable-grub-mkfont \ + --enable-grub-mount \ + --enable-grub-emu-usb=no \ + --enable-grub-emu-sdl=no \ + --disable-grub-emu-pci \ + --prefix="/usr" \ + --bindir="/usr/bin" \ + --sbindir="/usr/bin" \ + --mandir="/usr/share/man" \ + --infodir="/usr/share/info" \ + --datarootdir="/usr/share" \ + --sysconfdir="/etc" \ + --program-prefix="" \ + --with-bootdir="/boot" \ + --with-grubdir="grub" \ + --disable-silent-rules \ + --disable-werror + echo + + msg "Run make for emu build" + make + echo + } build() { - - ## set architecture dependent variables - if [[ "${CARCH}" == 'x86_64' ]]; then - _EFIEMU="--enable-efiemu" - else - _EFIEMU="--disable-efiemu" - fi - - _HOST="${CARCH}" - - cd "${srcdir}/grub-${pkgver}" - # _get_locale_files - sed -i -e '/gets is a security/d' grub-core/gnulib/stdio.in.h + + cd "${srcdir}/grub-${_pkgver}/" + + msg "Build grub bios stuff" _build_grub-common_and_bios echo - - _build_grub-efi-i386 + + msg "Build grub ${_EFI_ARCH} efi stuff" + _build_grub-efi echo - + + if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then + msg "Build grub i386 efi stuff" + _EFI_ARCH="i386" _build_grub-efi + echo + fi + + if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then + msg "Build grub emu stuff" + _build_grub-emu + echo + fi + } -package_grub-common() { - - pkgdesc="GNU GRand Unified Bootloader - Utilities and Common Files" - depends=('sh' 'xz' 'freetype2' 'gettext' 'device-mapper' 'fuse') - conflicts=('grub-legacy' 'grub') - replaces=('grub2-common') - provides=('grub2-common') - backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom') - optdepends=('libisoburn: provides xorriso for generating grub rescue iso using grub-mkrescue' - 'os-prober: to detect other OSes when generating grub.cfg in BIOS systems' - 'mtools: for grub-mkrescue FAT FS support') - install="grub.install" - options=('strip' 'purge' 'docs' 'zipman' '!emptydirs') - - cd "${srcdir}/grub_bios-${pkgver}" +_package_grub-common_and_bios() { + + cd "${srcdir}/grub-${_pkgver}-bios/" + + msg "Run make install for bios build" make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install echo - - ## install extra /etc/grub.d/ files - install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+" - - ## install /etc/default/grub (used by grub-mkconfig) + + msg "Remove gdb debugging related files for bios build" + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true + + msg "Install extra /etc/grub.d/ files" + install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+" + + msg "Install /etc/default/grub (used by grub-mkconfig)" install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - - ## install grub.cfg (needed so it doesn't get removed on upgrading because it was previously here) + + msg "Install grub.cfg for backup array" install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg" - - # remove platform specific files - rm -rf "${pkgdir}/usr/lib/grub/i386-pc/" - + } -package_grub-bios() { - - pkgdesc="GNU GRand Unified Bootloader - i386 PC BIOS Modules" - depends=("grub-common=${pkgver}") - options=('!strip' '!emptydirs') - replaces=('grub2-bios') - provides=('grub2-bios') - - cd "${srcdir}/grub_bios-${pkgver}" - make DESTDIR="${pkgdir}/" install +_package_grub-efi() { + + cd "${srcdir}/grub-${_pkgver}-efi-${_EFI_ARCH}/" + + msg "Run make install for ${_EFI_ARCH} efi build" + make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install echo - - ## remove non platform-specific files - rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}} - - ## remove gdb debugging related files - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true - + + msg "Remove gdb debugging related files for ${_EFI_ARCH} efi build" + rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true + } -package_grub-efi-i386() { - - pkgdesc="GNU GRand Unified Bootloader - i386 UEFI Modules" - depends=("grub-common=${pkgver}" 'dosfstools' 'efibootmgr') - options=('!strip' '!emptydirs') - replaces=('grub2-efi-i386') - provides=('grub2-efi-i386') - - cd "${srcdir}/grub_efi-${pkgver}" - make DESTDIR="${pkgdir}/" install +_package_grub-emu() { + + cd "${srcdir}/grub-${_pkgver}-emu/" + + msg "Run make install for emu build" + make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install echo + + msg "Remove gdb debugging related files for emu build" + rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/{kernel.exec,gdb_grub,gmodule.pl} || true + +} - ## remove non platform-specific files - rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}} - - ## remove gdb debugging related files - rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true - +package() { + + cd "${srcdir}/grub-${_pkgver}/" + + msg "Package grub ${_EFI_ARCH} efi stuff" + _package_grub-efi + + if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then + msg "Package grub i386 efi stuff" + _EFI_ARCH="i386" _package_grub-efi + echo + fi + + if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then + msg "Package grub emu stuff" + _package_grub-emu + echo + fi + + msg "Package grub bios stuff" + _package_grub-common_and_bios + } diff --git a/abs/core/grub/__changelog b/abs/core/grub/__changelog index 0be82a4..608798d 100644 --- a/abs/core/grub/__changelog +++ b/abs/core/grub/__changelog @@ -1 +1,2 @@ - -e '/gets is a security/d' grub-core/gnulib/stdio.in.h +PKGBUILD: +- change dep python to python2 diff --git a/abs/core/grub/archlinux_grub_mkconfig_fixes.patch b/abs/core/grub/archlinux_grub_mkconfig_fixes.patch index c8bd3e4..c87a428 100644 --- a/abs/core/grub/archlinux_grub_mkconfig_fixes.patch +++ b/abs/core/grub/archlinux_grub_mkconfig_fixes.patch @@ -1,8 +1,8 @@ diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 516be86..5f37db2 100644 +index db58ab9..e66e139 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in -@@ -213,6 +213,8 @@ export GRUB_DEFAULT \ +@@ -212,6 +212,8 @@ export GRUB_DEFAULT \ GRUB_THEME \ GRUB_GFXPAYLOAD_LINUX \ GRUB_DISABLE_OS_PROBER \ @@ -12,10 +12,10 @@ index 516be86..5f37db2 100644 GRUB_SAVEDEFAULT \ GRUB_ENABLE_CRYPTODISK \ diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 765bfdc..b148558 100644 +index 9838720..dbb5dd2 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in -@@ -115,6 +115,14 @@ cat < +Date: Sat, 5 Apr 2014 20:40:51 -0400 +Subject: [PATCH] 10_linux: Detect Arch Linux main and fallback initramfs + images + +--- + util/grub.d/10_linux.in | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index 00d1931..7d4086b 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -81,6 +81,8 @@ linux_entry () + case $type in + recovery) + title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; ++ fallback) ++ title="$(gettext_printf "%s, with Linux %s (fallback initramfs)" "${os}" "${version}")" ;; + *) + title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; + esac +@@ -180,7 +182,7 @@ while [ "x$list" != "x" ] ; do + basename=`basename $linux` + dirname=`dirname $linux` + rel_dirname=`make_system_path_relative_to_its_root $dirname` +- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` ++ version=`echo $basename | sed -e "s,vmlinuz-,,g"` + alt_version=`echo $version | sed -e "s,\.old$,,g"` + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + +@@ -236,6 +238,18 @@ while [ "x$list" != "x" ] ; do + + linux_entry "${OS}" "${version}" advanced \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ ++ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then ++ initrd="initramfs-${version}-fallback.img" ++ ++ if test -n "${initrd}" ; then ++ gettext_printf "Found fallback initramfs image: %s\n" "${dirname}/${initrd}" >&2 ++ fi ++ ++ linux_entry "${OS}" "${version}" fallback \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ fi ++ + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then + linux_entry "${OS}" "${version}" recovery \ + "single ${GRUB_CMDLINE_LINUX}" +-- +1.9.1 + diff --git a/abs/core/grub/grub-2.00-mkinitcpio-0.15.patch b/abs/core/grub/grub-2.00-mkinitcpio-0.15.patch new file mode 100644 index 0000000..1af848f --- /dev/null +++ b/abs/core/grub/grub-2.00-mkinitcpio-0.15.patch @@ -0,0 +1,11 @@ +--- util/grub.d/10_linux.in.old 2013-07-28 08:55:47.825946239 +0200 ++++ util/grub.d/10_linux.in 2013-07-28 08:56:14.082201512 +0200 +@@ -138,7 +138,7 @@ + message="$(gettext_printf "Loading Linux %s ..." "${version}")" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' +- linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} ++ linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} rw ${args} + EOF + if test -n "${initrd}" ; then + # TRANSLATORS: ramdisk isn't identifier. Should be translated. diff --git a/abs/core/grub/grub-2.00.5086-fix-lvm-parsing.patch b/abs/core/grub/grub-2.00.5086-fix-lvm-parsing.patch new file mode 100644 index 0000000..60128ba --- /dev/null +++ b/abs/core/grub/grub-2.00.5086-fix-lvm-parsing.patch @@ -0,0 +1,54 @@ +There is no explicit option to turn off alignment; it is implicitly +disabled if one of --separator or --nameprefixes option is used. + +--separator was added in 2007, --nameprefixes - in 2009. So let's use +--separator to extend range of versions we are compatible with. Note that +one or another must be used, current parsing is broken otherwise. + +Signed-off-by: Andrey Borzenkov + +--- + util/getroot.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/util/getroot.c b/util/getroot.c +index 2ad8a55..3afcf96 100644 +--- a/util/getroot.c ++++ b/util/getroot.c +@@ -1322,7 +1322,7 @@ grub_util_get_dev_abstraction (const char *os_dev) + static void + pull_lvm_by_command (const char *os_dev) + { +- char *argv[6]; ++ char *argv[8]; + int fd; + pid_t pid; + FILE *mdadm; +@@ -1351,12 +1351,17 @@ pull_lvm_by_command (const char *os_dev) + + /* execvp has inconvenient types, hence the casts. None of these + strings will actually be modified. */ ++ /* by default PV name is left aligned in 10 character field, meaning that ++ we do not know where name ends. Using dummy --separator disables ++ alignment. We have a single field, so separator itself is not output */ + argv[0] = (char *) "vgs"; + argv[1] = (char *) "--options"; + argv[2] = (char *) "pv_name"; + argv[3] = (char *) "--noheadings"; +- argv[4] = vgname; +- argv[5] = NULL; ++ argv[4] = (char *) "--separator"; ++ argv[5] = (char *) ":"; ++ argv[6] = vgname; ++ argv[7] = NULL; + + pid = exec_pipe (argv, &fd); + free (vgname); +@@ -1376,6 +1381,7 @@ pull_lvm_by_command (const char *os_dev) + while (getline (&buf, &len, mdadm) > 0) + { + char *ptr; ++ /* LVM adds two spaces as standard prefix */ + for (ptr = buf; ptr < buf + 2 && *ptr == ' '; ptr++); + if (*ptr == '\0') + continue; \ No newline at end of file diff --git a/abs/core/grub/grub-add-GRUB_COLOR_variables.patch b/abs/core/grub/grub-add-GRUB_COLOR_variables.patch new file mode 100644 index 0000000..c113a81 --- /dev/null +++ b/abs/core/grub/grub-add-GRUB_COLOR_variables.patch @@ -0,0 +1,32 @@ +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index 3390ba9..c416489 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -218,6 +218,8 @@ export GRUB_DEFAULT \ + GRUB_THEME \ + GRUB_GFXPAYLOAD_LINUX \ + GRUB_DISABLE_OS_PROBER \ ++ GRUB_COLOR_NORMAL \ ++ GRUB_COLOR_HIGHLIGHT \ + GRUB_INIT_TUNE \ + GRUB_SAVEDEFAULT \ + GRUB_ENABLE_CRYPTODISK \ +diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in +index d2e7252..8259f45 100644 +--- a/util/grub.d/00_header.in ++++ b/util/grub.d/00_header.in +@@ -125,6 +125,14 @@ cat <&2 ++ intel_ucode="$(make_system_path_relative_to_its_root /boot/intel-ucode.img)" ++fi ++ + title_correction_code= + + linux_entry () +@@ -136,7 +142,7 @@ EOF + message="$(gettext_printf "Loading initial ramdisk ...")" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' +- initrd ${rel_dirname}/${initrd} ++ initrd ${intel_ucode} ${rel_dirname}/${initrd} + EOF + fi + sed "s/^/$submenu_indentation/" << EOF diff --git a/abs/core/grub/grub.cfg b/abs/core/grub/grub.cfg index 1f08102..9d9144f 100644 --- a/abs/core/grub/grub.cfg +++ b/abs/core/grub/grub.cfg @@ -78,7 +78,7 @@ set timeout=5 ### END /etc/grub.d/00_header ### ### BEGIN /etc/grub.d/10_linux ### -menuentry 'Arch GNU/Linux, with Linux core repo kernel' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-true-ad4103fa-d940-47ca-8506-301d8071d467' { +menuentry 'Arch Linux, with Linux core repo kernel' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-true-ad4103fa-d940-47ca-8506-301d8071d467' { load_video set gfxpayload=keep insmod gzio @@ -91,11 +91,11 @@ menuentry 'Arch GNU/Linux, with Linux core repo kernel' --class arch --class gnu search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467 fi echo 'Loading Linux core repo kernel ...' - linux /boot/vmlinuz-linux root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 ro quiet + linux /boot/vmlinuz-linux root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 rw quiet echo 'Loading initial ramdisk ...' initrd /boot/initramfs-linux.img } -menuentry 'Arch GNU/Linux, with Linux core repo kernel (Fallback initramfs)' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-fallback-ad4103fa-d940-47ca-8506-301d8071d467' { +menuentry 'Arch Linux, with Linux core repo kernel (Fallback initramfs)' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-fallback-ad4103fa-d940-47ca-8506-301d8071d467' { load_video set gfxpayload=keep insmod gzio @@ -108,7 +108,7 @@ menuentry 'Arch GNU/Linux, with Linux core repo kernel (Fallback initramfs)' --c search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467 fi echo 'Loading Linux core repo kernel ...' - linux /boot/vmlinuz-linux root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 ro quiet + linux /boot/vmlinuz-linux root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 rw quiet echo 'Loading initial ramdisk ...' initrd /boot/initramfs-linux-fallback.img } diff --git a/abs/core/grub/grub_bzr_export.sh b/abs/core/grub/grub_bzr_export.sh deleted file mode 100644 index ff8f99e..0000000 --- a/abs/core/grub/grub_bzr_export.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/bin/env bash - -## For actual repos - -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/lua lua -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/gpxe gpxe -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img ntldr-img -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/915resolution 915resolution - -## For launchpad mirror - -# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-lua lua -# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-gpxe gpxe -# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-ntldr-img ntldr-img -# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-915resolution 915resolution - -## grub-extras zfs is integrated into grub bzr main repo and is no longer needed separately. - -_WD="${PWD}/" -_OUTPUT_DIR="${_WD}/" - -_ACTUAL_PKGVER="2.00" - -_GRUB_BZR_REPO_DIR="${_WD}/grub_mainline_BZR/" -_GRUB_BZR_EXP_REPO_DIR="${_WD}/grub_experimental_BZR/" -_GRUB_EXTRAS_REPOS_DIR="${_WD}/grub_extras_BZR/" - -_MAIN_SNAPSHOT() { - - cd "${_GRUB_BZR_REPO_DIR}/" - echo - - _REVNUM="$(bzr revno ${_GRUB_BZR_REPO_DIR})" - bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - - xz -9 "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar" - echo - -} - -_EXP_SNAPSHOT() { - - cd "${_GRUB_BZR_EXP_REPO_DIR}/" - echo - - _REVNUM="$(bzr revno ${_GRUB_BZR_EXP_REPO_DIR})" - bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - - xz -9 "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar" - echo - -} - -_EXTRAS_SNAPSHOT() { - - cd "${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME}/" - echo - - _REVNUM="$(bzr revno ${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME})" - bzr export --root="${_GRUB_EXTRAS_NAME}" --format="tar" "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - echo - - xz -9 "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar" - echo - -} - -echo - -set -x -e - -echo - -_MAIN_SNAPSHOT - -echo - -# _EXP_SNAPSHOT - -echo - -_GRUB_EXTRAS_NAME="lua" -_EXTRAS_SNAPSHOT - -# _GRUB_EXTRAS_NAME="gpxe" -# _EXTRAS_SNAPSHOT - -_GRUB_EXTRAS_NAME="ntldr-img" -_EXTRAS_SNAPSHOT - -_GRUB_EXTRAS_NAME="915resolution" -_EXTRAS_SNAPSHOT - -echo - -set +x +e - -echo - -unset _WD -unset _OUTPUT_DIR -unset _GRUB_BZR_REPO_DIR -unset _GRUB_EXTRAS_REPOS_DIR -unset _GRUB_EXTRAS_NAME -- cgit v0.12 From 71c8743dd4aefcb36f785b7438c0149d2787d7e4 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 16 Jan 2016 22:17:19 +0000 Subject: rsync: update to 3.1.2 --- abs/extra/rsync/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/extra/rsync/PKGBUILD b/abs/extra/rsync/PKGBUILD index d94f712..a0bf281 100644 --- a/abs/extra/rsync/PKGBUILD +++ b/abs/extra/rsync/PKGBUILD @@ -1,8 +1,8 @@ # $Id$ pkgname=rsync -pkgver=3.1.1 -pkgrel=4 +pkgver=3.1.2 +pkgrel=1 pkgdesc="A file transfer program to keep remote files in sync" arch=('i686' 'x86_64') url="http://rsync.samba.org/" @@ -13,7 +13,7 @@ source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz" "http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz.asc" 'rsyncd.conf' 'rsync.xinetd' 'rsyncd.service' 'rsyncd.socket' 'rsyncd@.service') -md5sums=('43bd6676f0b404326eee2d63be3cdcfe' +md5sums=('0f758d7e000c0f7f7d3792610fad70cb' 'SKIP' 'bce64d122a8e0f86872a4a21a03bc7f3' 'ea3e9277dc908bc51f9eddc0f6b935c1' -- cgit v0.12 From 47cb2ab644747817c1e70a39d1264726b03cf423 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 16 Jan 2016 22:21:27 +0000 Subject: openssh: update to 7.1p2 --- abs/core/openssh/PKGBUILD | 13 ++------ abs/core/openssh/keyboard-interactive.patch | 52 ----------------------------- 2 files changed, 3 insertions(+), 62 deletions(-) delete mode 100644 abs/core/openssh/keyboard-interactive.patch diff --git a/abs/core/openssh/PKGBUILD b/abs/core/openssh/PKGBUILD index 6f891ae..3e605ea 100644 --- a/abs/core/openssh/PKGBUILD +++ b/abs/core/openssh/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: judd pkgname=openssh -pkgver=6.9p1 -pkgrel=2 +pkgver=7.1p2 +pkgrel=1 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' license=('custom:BSD') @@ -16,15 +16,13 @@ optdepends=('xorg-xauth: X11 forwarding' 'x11-ssh-askpass: input passphrase in X') validpgpkeys=('59C2118ED206D927E667EBE3D3E5F56B6D920D30') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"{,.asc} - 'keyboard-interactive.patch' 'sshdgenkeys.service' 'sshd@.service' 'sshd.service' 'sshd.socket' 'sshd.conf' 'sshd.pam') -sha1sums=('86ab57f00d0fd9bf302760f2f6deac1b6e9df265' 'SKIP' - 'ef9e9327a943839abb3d202783b318e9cd2bdcd5' +sha1sums=('9202f5a2a50c8a55ecfb830609df1e1fde97f758' 'SKIP' 'cc1ceec606c98c7407e7ac21ade23aed81e31405' '6a0ff3305692cf83aca96e10f3bb51e1c26fccda' 'ec49c6beba923e201505f5669cea48cad29014db' @@ -36,11 +34,6 @@ backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') install=install -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../keyboard-interactive.patch -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/abs/core/openssh/keyboard-interactive.patch b/abs/core/openssh/keyboard-interactive.patch deleted file mode 100644 index 4adafeb..0000000 --- a/abs/core/openssh/keyboard-interactive.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5b64f85bb811246c59ebab70aed331f26ba37b18 Mon Sep 17 00:00:00 2001 -From: "djm@openbsd.org" -Date: Sat, 18 Jul 2015 07:57:14 +0000 -Subject: upstream commit - -only query each keyboard-interactive device once per - authentication request regardless of how many times it is listed; ok markus@ - -Upstream-ID: d73fafba6e86030436ff673656ec1f33d9ffeda1 ---- - auth2-chall.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/auth2-chall.c b/auth2-chall.c -index ddabe1a..4aff09d 100644 ---- a/auth2-chall.c -+++ b/auth2-chall.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: auth2-chall.c,v 1.42 2015/01/19 20:07:45 markus Exp $ */ -+/* $OpenBSD: auth2-chall.c,v 1.43 2015/07/18 07:57:14 djm Exp $ */ - /* - * Copyright (c) 2001 Markus Friedl. All rights reserved. - * Copyright (c) 2001 Per Allansson. All rights reserved. -@@ -83,6 +83,7 @@ struct KbdintAuthctxt - void *ctxt; - KbdintDevice *device; - u_int nreq; -+ u_int devices_done; - }; - - #ifdef USE_PAM -@@ -169,11 +170,15 @@ kbdint_next_device(Authctxt *authctxt, KbdintAuthctxt *kbdintctxt) - if (len == 0) - break; - for (i = 0; devices[i]; i++) { -- if (!auth2_method_allowed(authctxt, -+ if ((kbdintctxt->devices_done & (1 << i)) != 0 || -+ !auth2_method_allowed(authctxt, - "keyboard-interactive", devices[i]->name)) - continue; -- if (strncmp(kbdintctxt->devices, devices[i]->name, len) == 0) -+ if (strncmp(kbdintctxt->devices, devices[i]->name, -+ len) == 0) { - kbdintctxt->device = devices[i]; -+ kbdintctxt->devices_done |= 1 << i; -+ } - } - t = kbdintctxt->devices; - kbdintctxt->devices = t[len] ? xstrdup(t+len+1) : NULL; --- -cgit v0.11.2 - -- cgit v0.12 From 8efd79e0c0396c7b4289acb37f1304ee4583557b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 16 Jan 2016 22:31:51 +0000 Subject: openssl: update to 1.0.2e --- abs/core/openssl/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/openssl/PKGBUILD b/abs/core/openssl/PKGBUILD index 92c9224..95f83f1 100644 --- a/abs/core/openssl/PKGBUILD +++ b/abs/core/openssl/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Pierre Schmitz pkgname=openssl -_ver=1.0.2d +_ver=1.0.2e # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} #pkgver=$_ver @@ -19,7 +19,7 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc" 'no-rpath.patch' 'ca-dir.patch') -md5sums=('38dd619b2e77cbac69b99f52a053d25a' +md5sums=('5262bfa25b60ed9de9f28d5d52d77fc5' 'SKIP' 'dc78d3d06baffc16217519242ce92478' '3bf51be3a1bbd262be46dc619f92aa90') -- cgit v0.12 From 7c730c71be7dd5f79d115d9edf570bea7dd475ec Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 16 Jan 2016 22:34:00 +0000 Subject: gawk: update to 4.1.3 --- abs/core/gawk/PKGBUILD | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/abs/core/gawk/PKGBUILD b/abs/core/gawk/PKGBUILD index e2a39ed..071d2ec 100644 --- a/abs/core/gawk/PKGBUILD +++ b/abs/core/gawk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197682 2013-10-28 10:54:43Z tpowa $ +# $Id$ # Maintainer: # Contributor: Tom Newsom pkgname=gawk -pkgver=4.1.0 -pkgrel=2 +pkgver=4.1.3 +pkgrel=1 pkgdesc="GNU version of awk" arch=('i686' 'x86_64') url="http://www.gnu.org/software/gawk/" @@ -14,6 +14,9 @@ depends=('sh' 'glibc' 'mpfr') provides=('awk') install=gawk.install source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('55d37f4069502677f25d1340df8eec97' + 'SKIP') +validpgpkeys=('D1967C63788713177D861ED7DF597815937EC0D2') # Arnold Robbins build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -34,5 +37,3 @@ package() { #ln -sf /usr/bin/gawk ${pkgdir}/bin/ #ln -sf gawk ${pkgdir}/bin/awk } -md5sums=('13e02513105417818a31ef375f9f9f42' - 'SKIP') -- cgit v0.12 From d62e2577add650f603546a013d65400e4e37de4a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 16 Jan 2016 22:42:03 +0000 Subject: sdl_sound: initial inclusion. dep of openal --- abs/extra/sdl_sound/PKGBUILD | 32 +++++++++++ abs/extra/sdl_sound/flac.patch | 126 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+) create mode 100644 abs/extra/sdl_sound/PKGBUILD create mode 100644 abs/extra/sdl_sound/flac.patch diff --git a/abs/extra/sdl_sound/PKGBUILD b/abs/extra/sdl_sound/PKGBUILD new file mode 100644 index 0000000..28ee210 --- /dev/null +++ b/abs/extra/sdl_sound/PKGBUILD @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Tom Newsom + +pkgname=sdl_sound +pkgver=1.0.3 +pkgrel=5 +pkgdesc="A library to decode several popular sound file formats, such as .WAV and .MP3" +arch=('i686' 'x86_64') +url="http://icculus.org/SDL_sound/" +license=('LGPL') +depends=('sdl' 'libmikmod' 'libvorbis' 'flac' 'speex' 'smpeg') +source=(http://icculus.org/SDL_sound/downloads/SDL_sound-$pkgver.tar.gz + flac.patch) +md5sums=('aa09cd52df85d29bee87a664424c94b5' + '302aa9dc94cc71dd3339ca3177d36e1c') + +build() { + cd ${srcdir}/SDL_sound-${pkgver} + + CFLAGS="$CFLAGS -I/usr/include/smpeg" \ + CXXFLAGS="$CXXFLAGS -I/usr/include/smpeg" \ + ./configure --prefix=/usr --disable-static + + make +} + +package() { + cd ${srcdir}/SDL_sound-${pkgver} + make DESTDIR=${pkgdir} install +} + diff --git a/abs/extra/sdl_sound/flac.patch b/abs/extra/sdl_sound/flac.patch new file mode 100644 index 0000000..d0ed491 --- /dev/null +++ b/abs/extra/sdl_sound/flac.patch @@ -0,0 +1,126 @@ +diff -u -r SDL_sound-1.0.1/configure.in SDL_sound-1.0.1-flac/configure.in +--- SDL_sound-1.0.1/configure.in 2003-10-12 20:49:54.000000000 +0200 ++++ SDL_sound-1.0.1-flac/configure.in 2006-12-11 20:43:46.546583251 +0100 +@@ -155,9 +155,12 @@ + dnl FLAC developers tend to break their API with every release, so we're + dnl checking for the latest-and-greatest here so we don't have to support + dnl obsolete versions. ++dnl Starting with FLAC 1.1.3: ++dnl libFLAC supports Ogg FLAC (no more libOggFLAC) so we also need -logg ++dnl the libFLAC .so version is also #defined in FLAC/export.h + + dnl Hooray for shitty autoconf bugs! +-x="C__seekable_stream_decoder_process_single" ++x="C__stream_decoder_process_single" + flcsym="FLA$x" + dnl Check for libFLAC + AC_ARG_ENABLE(flac, +@@ -167,7 +170,7 @@ + AC_CHECK_HEADER(FLAC/stream_decoder.h, have_flac_hdr=yes) + AC_CHECK_LIB(FLAC, $flcsym, have_flac_lib=yes) + if test x$have_flac_hdr = xyes -a x$have_flac_lib = xyes; then +- LIBS="$LIBS -lFLAC" ++ LIBS="$LIBS -lFLAC -logg" + AC_DEFINE(SOUND_SUPPORTS_FLAC) + fi + fi +diff -u -r SDL_sound-1.0.1/decoders/flac.c SDL_sound-1.0.1-flac/decoders/flac.c +--- SDL_sound-1.0.1/decoders/flac.c 2003-03-10 23:44:14.000000000 +0100 ++++ SDL_sound-1.0.1-flac/decoders/flac.c 2006-12-11 20:43:57.880097062 +0100 +@@ -44,6 +44,16 @@ + #define __SDL_SOUND_INTERNAL__ + #include "SDL_sound_internal.h" + ++#include ++ ++/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */ ++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 ++#define LEGACY_FLAC ++#else ++#undef LEGACY_FLAC ++#endif ++ ++#ifdef LEGACY_FLAC + #include + + #define D_END_OF_STREAM FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM +@@ -80,6 +90,34 @@ + typedef FLAC__SeekableStreamDecoderSeekStatus d_seek_status_t; + typedef FLAC__SeekableStreamDecoderTellStatus d_tell_status_t; + typedef FLAC__SeekableStreamDecoderLengthStatus d_length_status_t; ++#else ++#include ++ ++#define D_END_OF_STREAM FLAC__STREAM_DECODER_END_OF_STREAM ++ ++#define d_new() FLAC__stream_decoder_new() ++#define d_process_metadata(x) FLAC__stream_decoder_process_until_end_of_metadata(x) ++#define d_process_one_frame(x) FLAC__stream_decoder_process_single(x) ++#define d_get_state(x) FLAC__stream_decoder_get_state(x) ++#define d_finish(x) FLAC__stream_decoder_finish(x) ++#define d_delete(x) FLAC__stream_decoder_delete(x) ++ ++typedef FLAC__StreamDecoder decoder_t; ++typedef FLAC__StreamDecoderReadStatus d_read_status_t; ++ ++#define D_SEEK_STATUS_OK FLAC__STREAM_DECODER_SEEK_STATUS_OK ++#define D_SEEK_STATUS_ERROR FLAC__STREAM_DECODER_SEEK_STATUS_ERROR ++#define D_TELL_STATUS_OK FLAC__STREAM_DECODER_TELL_STATUS_OK ++#define D_TELL_STATUS_ERROR FLAC__STREAM_DECODER_TELL_STATUS_ERROR ++#define D_LENGTH_STATUS_OK FLAC__STREAM_DECODER_LENGTH_STATUS_OK ++#define D_LENGTH_STATUS_ERROR FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR ++ ++#define d_seek_absolute(x, y) FLAC__stream_decoder_seek_absolute(x, y) ++ ++typedef FLAC__StreamDecoderSeekStatus d_seek_status_t; ++typedef FLAC__StreamDecoderTellStatus d_tell_status_t; ++typedef FLAC__StreamDecoderLengthStatus d_length_status_t; ++#endif + + #define D_WRITE_CONTINUE FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE + #define D_READ_END_OF_STREAM FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM +@@ -141,9 +179,15 @@ + } /* free_flac */ + + ++#ifdef LEGACY_FLAC + static d_read_status_t read_callback( + const decoder_t *decoder, FLAC__byte buffer[], + unsigned int *bytes, void *client_data) ++#else ++static d_read_status_t read_callback( ++ const decoder_t *decoder, FLAC__byte buffer[], ++ size_t *bytes, void *client_data) ++#endif + { + flac_t *f = (flac_t *) client_data; + Uint32 retval; +@@ -400,6 +444,7 @@ + BAIL_MACRO(ERR_OUT_OF_MEMORY, 0); + } /* if */ + ++#ifdef LEGACY_FLAC + d_set_read_callback(decoder, read_callback); + d_set_write_callback(decoder, write_callback); + d_set_metadata_callback(decoder, metadata_callback); +@@ -410,6 +455,7 @@ + d_set_eof_callback(decoder, eof_callback); + + d_set_client_data(decoder, f); ++#endif + + f->rw = internal->rw; + f->sample = sample; +@@ -418,7 +464,12 @@ + f->is_flac = 0 /* !!! FIXME: should be "has_extension", not "0". */; + + internal->decoder_private = f; ++ /* really should check the init return value here: */ ++#ifdef LEGACY_FLAC + d_init(decoder); ++#else ++ FLAC__stream_decoder_init_stream(decoder, read_callback, seek_callback, tell_callback, length_callback, eof_callback, write_callback, metadata_callback, error_callback, f); ++#endif + + sample->flags = SOUND_SAMPLEFLAG_NONE; + -- cgit v0.12 From edc30b39bde05f6394b0f1efd7673d400f017074 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 16 Jan 2016 22:45:13 +0000 Subject: portaudio: initial inclusion. dep of openal --- abs/extra/portaudio/PKGBUILD | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 abs/extra/portaudio/PKGBUILD diff --git a/abs/extra/portaudio/PKGBUILD b/abs/extra/portaudio/PKGBUILD new file mode 100644 index 0000000..91903f5 --- /dev/null +++ b/abs/extra/portaudio/PKGBUILD @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Lukas Fleischer +# Contributor: Eric Belanger +# Contributor: Darwin Bautista +# Contributor: Bob Finch + +pkgname=portaudio +pkgver=19_20140130 +pkgrel=3 +pkgdesc='A free, cross-platform, open source, audio I/O library.' +arch=('i686' 'x86_64') +url='http://www.portaudio.com/' +license=('custom') +depends=('gcc-libs') +conflicts=('portaudio_cpp') +provides=('portaudio_cpp') +replaces=('portaudio_cpp') +options=('!makeflags') +source=("http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz") +md5sums=('7f220406902af9dca009668e198cbd23') + +build() { + cd "$srcdir/$pkgname" + + ./configure --prefix=/usr --enable-cxx + make +} + +package() { + cd "$srcdir/$pkgname" + + make DESTDIR="$pkgdir" install + install -Dm0644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" +} -- cgit v0.12 From 9ae850b6f7df994c9a2c9bd82ee5766d6fb076c6 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 16 Jan 2016 22:49:53 +0000 Subject: portaudio: add __changelog --- abs/extra/portaudio/__changelog | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 abs/extra/portaudio/__changelog diff --git a/abs/extra/portaudio/__changelog b/abs/extra/portaudio/__changelog new file mode 100644 index 0000000..f2d307a --- /dev/null +++ b/abs/extra/portaudio/__changelog @@ -0,0 +1,2 @@ +PKGBUILD: +- remove dep jack -- cgit v0.12 From f791fb8677c31ebd7c9224e7659aef0eb3fb9875 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 16 Jan 2016 22:50:48 +0000 Subject: openal: update to 1.17.1 --- abs/extra/openal/PKGBUILD | 47 +++++++++++++++++++++++++++++++------------- abs/extra/openal/__changelog | 4 ++-- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/abs/extra/openal/PKGBUILD b/abs/extra/openal/PKGBUILD index 6d6c669..9721c5c 100644 --- a/abs/extra/openal/PKGBUILD +++ b/abs/extra/openal/PKGBUILD @@ -1,29 +1,48 @@ -# $Id: PKGBUILD 149424 2012-02-07 16:51:11Z heftig $ +# $Id$ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae -# Contributer: Jason Chu +# Contributor: Jason Chu -pkgname=openal -pkgver=1.13 -pkgrel=4 +pkgbase=openal +pkgname=(openal openal-examples) +pkgver=1.17.1 +pkgrel=1 pkgdesc="A cross-platform 3D audio library" arch=(i686 x86_64) url="http://www.openal.org/" license=(LGPL) depends=(glibc) -makedepends=(alsa-lib sdl pkgconfig cmake) -options=('!libtool') -source=(http://kcat.strangesoft.net/openal-releases/openal-soft-$pkgver.tar.bz2) -md5sums=('58b7d2809790c70681b825644c5f3614') +makedepends=(alsa-lib pkgconfig cmake qt4 fluidsynth portaudio sdl2 sdl_sound ffmpeg + git) +_commit=14df326876d92f63c9c007da3c0434fba47c30b8 +source=("git+https://github.com/kcat/openal-soft#commit=$_commit") +sha256sums=('SKIP') + +prepare() { + mkdir build examples +} build() { - cd "$srcdir/$pkgname-soft-$pkgver/build" - cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release .. + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release ../$pkgbase-soft make } -package() { - cd "$srcdir/$pkgname-soft-$pkgver" +package_openal() { + optdepends=('qt4: alsoft-config GUI Configurator' + 'fluidsynth: MIDI rendering') + make -C build DESTDIR="$pkgdir/" install - install -Dm644 alsoftrc.sample "$pkgdir/etc/openal/alsoft.conf.sample" + install -m644 $pkgbase-soft/{env-vars,hrtf}.txt "$pkgdir/usr/share/openal/" + +### Split openal-examples + mv "$pkgdir"/usr/bin/al{ffplay,hrtf,latency,loopback,reverb,stream} examples/ +} + +package_openal-examples() { + pkgdesc+=" (example programs)" + depends=("openal=$pkgver-$pkgrel" sdl2 sdl_sound ffmpeg) + + mkdir -p "$pkgdir/usr/bin" + mv examples/* "$pkgdir/usr/bin/" } diff --git a/abs/extra/openal/__changelog b/abs/extra/openal/__changelog index 7f47556..31ac229 100644 --- a/abs/extra/openal/__changelog +++ b/abs/extra/openal/__changelog @@ -1,2 +1,2 @@ -4/25/12 - chw - -Removed libpulse as a dep. +PKGBUILD: +- Removed libpulse and jack as a dep. -- cgit v0.12 From 34e3c3f19af2ce74ef4361b691abae2c34df8398 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 16 Jan 2016 23:00:23 +0000 Subject: gperftools: initial inclusion. dep of leveldb --- abs/extra/gperftools/PKGBUILD | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 abs/extra/gperftools/PKGBUILD diff --git a/abs/extra/gperftools/PKGBUILD b/abs/extra/gperftools/PKGBUILD new file mode 100644 index 0000000..fbdb440 --- /dev/null +++ b/abs/extra/gperftools/PKGBUILD @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Dave Reisner +# Contributor: Alexander Rødseth +# Contributor: Thomas Jost +# Contributor: JaDa +# Contributor: Joaquim Pedro +# Contributor: Jan Rüegg + +pkgname=gperftools +pkgver=2.4 +pkgrel=2 +pkgdesc="Fast, multi-threaded malloc and nifty performance analysis tools" +arch=('i686' 'x86_64') +url="http://code.google.com/p/gperftools/" +license=('BSD') +depends=('perl') +provides=('libtcmalloc.so' + 'libprofiler.so' + 'libtcmalloc_debug.so' + 'libtcmalloc_and_profiler.so' + 'libtcmalloc_minimal.so' + 'libtcmalloc_minimal_debug.so') +optdepends=('graphviz: pprof graph generation' + 'gv: pprof postscript generation') +source=("https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/$pkgname-$pkgver.tar.gz") +md5sums=('2171cea3bbe053036fb5d5d25176a160') + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr --enable-frame-pointers + make +} + +package() { + cd "$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 1d82e9803e355eefc7f4db47ecc4b0a2c88ea27f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 16 Jan 2016 23:05:34 +0000 Subject: leveldb: initial inclusion. dep of qt5 --- abs/extra/leveldb/PKGBUILD | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 abs/extra/leveldb/PKGBUILD diff --git a/abs/extra/leveldb/PKGBUILD b/abs/extra/leveldb/PKGBUILD new file mode 100644 index 0000000..9c6b59f --- /dev/null +++ b/abs/extra/leveldb/PKGBUILD @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Dave Reisner +# Contributor: feydaykyn + +pkgname=leveldb +pkgver=1.18 +pkgrel=2 +pkgdesc="A fast and lightweight key/value database library" +arch=('i686' 'x86_64') +url="https://code.google.com/p/leveldb/" +license=('BSD') +depends=('gperftools' 'snappy') +makedepends=('git') +source=("$pkgname-$pkgver.tar.gz::https://github.com/google/leveldb/archive/v$pkgver.tar.gz") +sha1sums=('18684a0ad7a07920d10f5295b171fbf5eeec7337') + +build() { + make -C "$pkgname-$pkgver" +} + +check() { + make -C "$pkgname-$pkgver" check +} + +package() { + cd "$pkgname-$pkgver" + + install -dm755 \ + "$pkgdir"/usr/{include/leveldb,lib} \ + "$pkgdir"/usr/share/doc/"$pkgname" + + # libraries + install -m644 -t "$pkgdir/usr/lib" "libleveldb.so.${pkgver%.?*}" libleveldb.a + cp -P libleveldb.so* "$pkgdir/usr/lib" + + # headers + install -m644 -t "$pkgdir/usr/include/leveldb" include/leveldb/* + + # documentation + cp -r doc/* "$pkgdir/usr/share/doc/$pkgname" + + # license + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} -- cgit v0.12 From b8bd809fca6627a65c435b3322c7b4a7859e0d04 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 16 Jan 2016 23:07:43 +0000 Subject: libinput: initial inclusion. dep of qt5 --- abs/extra/libinput/PKGBUILD | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 abs/extra/libinput/PKGBUILD diff --git a/abs/extra/libinput/PKGBUILD b/abs/extra/libinput/PKGBUILD new file mode 100644 index 0000000..1d39dd9 --- /dev/null +++ b/abs/extra/libinput/PKGBUILD @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Andreas Radke +# Maintainer: Jan de Groot + +pkgname=libinput +pkgver=1.1.4 +pkgrel=1 +pkgdesc="library that handles input devices for display servers and other applications that need to directly deal with input devices." +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/libinput/" +license=(custom:X11) +depends=('mtdev' 'systemd' 'libevdev') +install=libinput.install +options=('!libtool') +source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) +sha256sums=('302cb76209b9c57a5a318e178f9bc446eede8ea79386103b5291cbfaa5fab5b6' + 'SKIP') +validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) + +prepare() { + cd $pkgname-$pkgver +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} -- cgit v0.12 From 15d157d906b5250025565d8f590de6e6ba8aa2a7 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 17 Jan 2016 00:09:09 +0000 Subject: libfbclient: initial inclusion. dep of qt5 --- abs/extra/libfbclient/ChangeLog | 26 +++++++++++++++++++++++ abs/extra/libfbclient/LICENSE | 44 ++++++++++++++++++++++++++++++++++++++ abs/extra/libfbclient/PKGBUILD | 47 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 abs/extra/libfbclient/ChangeLog create mode 100644 abs/extra/libfbclient/LICENSE create mode 100644 abs/extra/libfbclient/PKGBUILD diff --git a/abs/extra/libfbclient/ChangeLog b/abs/extra/libfbclient/ChangeLog new file mode 100644 index 0000000..f02bd5f --- /dev/null +++ b/abs/extra/libfbclient/ChangeLog @@ -0,0 +1,26 @@ + +2009-06-08 Douglas Soares de Andrade + + * Rebuilt for the new icu + +2009-04-09 Douglas Soares de Andrade + + * Updated for i686: 2.1.2 + +2008-08-10 Douglas Soares de Andrade + + * Updated for i686: 2.1.1 + +2008-05-10 Mateusz Herych + + * Updated for x86_64 - 2.1.0 + +2008-04-28 Douglas Soares de Andrade + + * Updated for i686 - 2.1.0 + * Sure, firebird is the hell to build. Waiting contributions ;-) + +2007-07-06 tardo + + * Built for x86_64 + * This is the most fucked up pkg evar. diff --git a/abs/extra/libfbclient/LICENSE b/abs/extra/libfbclient/LICENSE new file mode 100644 index 0000000..e735b0c --- /dev/null +++ b/abs/extra/libfbclient/LICENSE @@ -0,0 +1,44 @@ + +LICENSES +-------- + +The applicable and approved licenses for the source files +of the Firebird RDBMS project are: + + 1) InterBase Public License (IPL), version 1.0 + http://bdn.borland.com/article/0,1410,30198,00.html + + 2) Initial Developer's Public License (IDPL), version 1.0 + http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl + +The IPL is copyright of Borland Corp., the other licenses are copyright +by the source code authors and contributors. + + +USAGE RULES +----------- + +1) The source code which was released under the IPL must keep this license. + All modifications / adaptations of this code are still subjects of the IPL. + +2) The files that are derived from the IPL covered code, must also keep + this license. It means that if any new file contains some code covered by + the IPL, then this file should be released under the IPL too. + +3) The new files developed by the members of the Firebird project should + be released under the IDPL. + +4) The new files contributed by people who are not members of the Firebird + project should follow the rule #3. If an author (initial developer) doesn't + specify the license to be used, the person who applies the contributed code + to the CVS tree (a committer) becomes responsible for the license assigned + to the contributed code. + +5) Every non-binary file that exists in the CVS tree, should have a header + section which describes the license this code is released under. If a file + contains no header, it means that this code is freeware and nobody owns the + appropriate copyrights. + + +You may find the exhibits for the approved licenses in /doc/license directory +of the CVS tree. diff --git a/abs/extra/libfbclient/PKGBUILD b/abs/extra/libfbclient/PKGBUILD new file mode 100644 index 0000000..56c80b2 --- /dev/null +++ b/abs/extra/libfbclient/PKGBUILD @@ -0,0 +1,47 @@ +# $Id$ +# Maintainer: Carlier Laurent +# Contributor: Douglas Soares de Andrade + +pkgname=libfbclient +pkgver=2.5.4.26856 +pkgrel=3 +pkgdesc="Client library for Firebird." +arch=('i686' 'x86_64') +url="http://www.firebirdsql.org/" +license=('custom') +depends=('gcc-libs' 'icu') +options=('!makeflags') +source=(http://downloads.sourceforge.net/firebird/Firebird-$pkgver-0.tar.bz2 + LICENSE) +md5sums=('7a17ec9889424b98baa29e001a054434' + '0d61798861e159c85dbdf0f30fe2f2ce') + +build() { + cd $srcdir/Firebird-$pkgver-0 + + ./configure --prefix=/usr --with-system-icu --without-fbudf \ + --without-fbsbin --without-fbconf --without-fbdoc --without-fbsample \ + --without-fbsample-db --without-fbintl --without-fbmisc --without-fbhelp \ + --without-fbsecure-db --with-fbmsg=/usr/share/firebird --without-fblog \ + --without-fbglock --without-fbplugins + + make +} + +package() { + cd $srcdir/Firebird-$pkgver-0 + + mkdir -p $pkgdir/usr/{bin,share/{firebird,licenses/$pkgname}} + + cp -R gen/firebird/{lib,include} $pkgdir/usr + rm -f $pkgdir/usr/lib/libedit.a + + install -m644 gen/firebird/*.msg $pkgdir/usr/share/firebird + install -m755 gen/firebird/bin/fb_config $pkgdir/usr/bin + install -m644 ${srcdir}/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + + # Add libgds support FS#30062 FS#30282 + cd $pkgdir/usr/lib + ln -s libfbclient.so libgds.so.0 + ln -s libfbclient.so libgds.so +} -- cgit v0.12 From d234301a1a4623a4570242aba57cfdfbf13e8738 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 17 Jan 2016 00:09:47 +0000 Subject: libinput: add libinput.install --- abs/extra/libinput/libinput.install | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 abs/extra/libinput/libinput.install diff --git a/abs/extra/libinput/libinput.install b/abs/extra/libinput/libinput.install new file mode 100644 index 0000000..b9d5d0e --- /dev/null +++ b/abs/extra/libinput/libinput.install @@ -0,0 +1,11 @@ +post_install() { + udevadm hwdb --update >/dev/null 2>&1 +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} -- cgit v0.12 From b26880134f7390c9ad6fb225b04eda44341a0dea Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 18 Jan 2016 00:05:46 +0000 Subject: curl: update to 7.46.0 --- ...-all-addresses-in-first-connection-attemp.patch | 47 ---------------------- abs/core/curl/PKGBUILD | 6 +-- 2 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 abs/core/curl/0001-connect-Try-all-addresses-in-first-connection-attemp.patch diff --git a/abs/core/curl/0001-connect-Try-all-addresses-in-first-connection-attemp.patch b/abs/core/curl/0001-connect-Try-all-addresses-in-first-connection-attemp.patch deleted file mode 100644 index f3428c7..0000000 --- a/abs/core/curl/0001-connect-Try-all-addresses-in-first-connection-attemp.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4e1ece2e44f432c2614f2090155c0aaf2226ea80 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= -Date: Sat, 28 Dec 2013 13:42:57 +0100 -Subject: [PATCH] connect: Try all addresses in first connection attempt -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes a bug when all addresses in the first family fail immediately, due -to "Network unreachable" for example, curl would hang and never try the -next address family. - -Iterate through all address families when to trying establish the first -connection attempt. - -Bug: http://curl.haxx.se/bug/view.cgi?id=1315 -Reported-by: Michal Górny and Anthony G. Basile ---- - lib/connect.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/lib/connect.c b/lib/connect.c -index 4b6ee00..588ac28 100644 ---- a/lib/connect.c -+++ b/lib/connect.c -@@ -1104,12 +1104,12 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ - conn->tempaddr[0]->ai_next == NULL ? timeout_ms : timeout_ms / 2; - - /* start connecting to first IP */ -- res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0])); -- while(res != CURLE_OK && -- conn->tempaddr[0] && -- conn->tempaddr[0]->ai_next && -- conn->tempsock[0] == CURL_SOCKET_BAD) -- res = trynextip(conn, FIRSTSOCKET, 0); -+ while(conn->tempaddr[0]) { -+ res = singleipconnect(conn, conn->tempaddr[0], &(conn->tempsock[0])); -+ if(res == CURLE_OK) -+ break; -+ conn->tempaddr[0] = conn->tempaddr[0]->ai_next; -+ } - - if(conn->tempsock[0] == CURL_SOCKET_BAD) - return res; --- -1.8.5.2 - diff --git a/abs/core/curl/PKGBUILD b/abs/core/curl/PKGBUILD index 29d6892..90fc700 100644 --- a/abs/core/curl/PKGBUILD +++ b/abs/core/curl/PKGBUILD @@ -6,18 +6,18 @@ # Contributor: Daniel J Griffiths pkgname=curl -pkgver=7.39.0 +pkgver=7.46.0 pkgrel=1 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" license=('MIT') -depends=('ca-certificates' 'krb5' 'libssh2' 'libidn' 'openssl' 'zlib') +depends=('ca-certificates' 'krb5' 'libidn' 'libssh2' 'openssl' 'zlib') provides=('libcurl.so') options=('strip' 'debug') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} curlbuild.h) -md5sums=('88c5650122873712296d4b1db3f12e6c' +md5sums=('230e682d59bf8ab6eca36da1d39ebd75' 'SKIP' '751bd433ede935c8fae727377625a8ae') validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91') # Daniel Stenberg -- cgit v0.12 From 4c44c66c79cc7ca470244a65afceb593ee46dfab Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 18 Jan 2016 17:23:57 +0000 Subject: linux-api-headers: update to 4.1.4 --- abs/core/linux-api-headers/PKGBUILD | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/abs/core/linux-api-headers/PKGBUILD b/abs/core/linux-api-headers/PKGBUILD index a9b1ea6..9435544 100644 --- a/abs/core/linux-api-headers/PKGBUILD +++ b/abs/core/linux-api-headers/PKGBUILD @@ -4,30 +4,27 @@ # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-api-headers -pkgver=3.16.2 -_basever=3.16 +pkgver=4.1.4 +_basever=4.1 pkgrel=1 pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" license=('GPL2') -source=(http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.xz - http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz) - - # NOTE: signatures are not automatically verified until pacman-4.2 - #http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.sign - #http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.sign - -md5sums=('5c569ed649a0c9711879f333e90c5386' - '926e6e2ee0634ce53730701da749b040') +source=(http://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basever}.tar.xz + http://www.kernel.org/pub/linux/kernel/v4.x/linux-${_basever}.tar.sign + http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz + http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign) +md5sums=('fe9dc0f6729f36400ea81aa41d614c37' + 'SKIP' + 'd7e306b17b0b5d49120adeee1a6bf4a8' + 'SKIP') +validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds + '647F28654894E3BD457199BE38DBBDC86092693E') # Greg Kroah-Hartman prepare() { cd ${srcdir}/linux-${_basever} - [[ $pkgver != $_basever ]] && patch -p1 -i ${srcdir}/patch-${pkgver} - - # fix xattr.h dual inclusion issues - # https://github.com/torvalds/linux/commit/bfcfd44c - sed -i "/__UAPI_DEF_XATTR/s/ifdef/if/" include/uapi/linux/xattr.h + [[ $pkgver != $_basever ]] && patch -p1 -i ${srcdir}/patch-${pkgver} || true } build() { -- cgit v0.12 From e4edea99d9ef9737e5e257dcec09c7f9e6cbeba7 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 19 Jan 2016 16:33:12 +0000 Subject: binutils: update to 2.25.1 --- abs/core/binutils/PKGBUILD | 44 ++-- .../binutils-2.24-gold-testsuite-plugin.patch | 229 --------------------- .../binutils/binutils-2.24-lto-testsuite.patch | 78 ------- abs/core/binutils/binutils-2.24-shared-pie.patch | 99 --------- abs/core/binutils/binutils-e9c1bdad.patch | 78 +++++++ 5 files changed, 96 insertions(+), 432 deletions(-) delete mode 100644 abs/core/binutils/binutils-2.24-gold-testsuite-plugin.patch delete mode 100644 abs/core/binutils/binutils-2.24-lto-testsuite.patch delete mode 100644 abs/core/binutils/binutils-2.24-shared-pie.patch create mode 100644 abs/core/binutils/binutils-e9c1bdad.patch diff --git a/abs/core/binutils/PKGBUILD b/abs/core/binutils/PKGBUILD index 26ba4f9..ad4a71e 100644 --- a/abs/core/binutils/PKGBUILD +++ b/abs/core/binutils/PKGBUILD @@ -3,58 +3,51 @@ # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc +# build from head of release branch as bug fix releases are rare + pkgname=binutils -pkgver=2.24 -pkgrel=7 +pkgver=2.25.1 +pkgrel=3 +_commit=2bd25930 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/binutils/" license=('GPL') groups=('base-devel') -depends=('glibc>=2.20' 'zlib') +depends=('glibc>=2.22' 'zlib') +makedepends=('git') checkdepends=('dejagnu' 'bc') conflicts=('binutils-multilib') replaces=('binutils-multilib') options=('staticlibs' '!distcc' '!ccache') install=binutils.install -source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig} - binutils-2.24-lto-testsuite.patch - binutils-2.24-gold-testsuite-plugin.patch - binutils-2.24-shared-pie.patch) -md5sums=('e0f71a7b2ddab0f8612336ac81d9636b' - 'SKIP' - 'e68a1f221545f082baa5bd417cd077af' - 'e46bbb03abaa5db58c12247644dc4857' - 'ec59461c4febab9cfe1c1ef33326bc50') -validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93') +source=(git://sourceware.org/git/binutils-gdb.git#commit=${_commit} + binutils-e9c1bdad.patch) +md5sums=('SKIP' + 'eb3aceaab8ed26e06d505f82beb30f8f') prepare() { - cd ${srcdir}/binutils-${pkgver} + cd ${srcdir}/binutils-gdb + + # https://sourceware.org/bugzilla/show_bug.cgi?id=16992 + patch -p1 -i ${srcdir}/binutils-e9c1bdad.patch # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure - # fix lto testsuite with gcc-4.9 - commits b35d44f1 and 37a6ac44 - patch -p1 -i $srcdir/binutils-2.24-lto-testsuite.patch - - # fix gold testsuite with gcc-4.9 - commit ae447ddd - patch -p1 -i $srcdir/binutils-2.24-gold-testsuite-plugin.patch - - # fix issues with -static -fPIE -pie - commit 4199e3b8 - patch -p1 -i $srcdir/binutils-2.24-shared-pie.patch - mkdir ${srcdir}/binutils-build } build() { cd ${srcdir}/binutils-build - ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \ + ${srcdir}/binutils-gdb/configure --prefix=/usr \ --with-lib-path=/usr/lib:/usr/local/lib \ --with-bugurl=https://bugs.archlinux.org/ \ --enable-threads --enable-shared --with-pic \ --enable-ld=default --enable-gold --enable-plugins \ - --disable-werror + --enable-deterministic-archives \ + --disable-werror --disable-gdb # check the host environment and makes sure all the necessary tools are available make configure-host @@ -76,7 +69,6 @@ package() { # Remove unwanted files rm ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* - rm ${pkgdir}/usr/share/info/{configure,standards}.info # No shared linking to these files outside binutils rm ${pkgdir}/usr/lib/lib{bfd,opcodes}.so diff --git a/abs/core/binutils/binutils-2.24-gold-testsuite-plugin.patch b/abs/core/binutils/binutils-2.24-gold-testsuite-plugin.patch deleted file mode 100644 index 9f5acad..0000000 --- a/abs/core/binutils/binutils-2.24-gold-testsuite-plugin.patch +++ /dev/null @@ -1,229 +0,0 @@ -diff --git a/gold/configure b/gold/configure -index 2257324..f61307b 100755 ---- a/gold/configure -+++ b/gold/configure -@@ -594,10 +594,12 @@ LTLIBOBJS - MAINT - MAINTAINER_MODE_FALSE - MAINTAINER_MODE_TRUE --HAVE_PUBNAMES_FALSE --HAVE_PUBNAMES_TRUE - DLOPEN_LIBS - CXXCPP -+HAVE_NO_USE_LINKER_PLUGIN_FALSE -+HAVE_NO_USE_LINKER_PLUGIN_TRUE -+HAVE_PUBNAMES_FALSE -+HAVE_PUBNAMES_TRUE - HAVE_ZLIB_FALSE - HAVE_ZLIB_TRUE - LIBOBJS -@@ -6991,6 +6993,50 @@ cat >>confdefs.h <<_ACEOF - _ACEOF - - -+save_CFLAGS="$CFLAGS" -+CFLAGS="$CFLAGS -Werror -gpubnames" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+int i; -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ have_pubnames=yes -+else -+ have_pubnames=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+CFLAGS="$save_CFLAGS" -+ if test "$have_pubnames" = "yes"; then -+ HAVE_PUBNAMES_TRUE= -+ HAVE_PUBNAMES_FALSE='#' -+else -+ HAVE_PUBNAMES_TRUE='#' -+ HAVE_PUBNAMES_FALSE= -+fi -+ -+ -+save_CFLAGS="$CFLAGS" -+CFLAGS="$CFLAGS -Werror -fno-use-linker-plugin" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+int i; -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ have_no_use_linker_plugin=yes -+else -+ have_no_use_linker_plugin=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+CFLAGS="$save_CFLAGS" -+ if test "$have_no_use_linker_plugin" = "yes"; then -+ HAVE_NO_USE_LINKER_PLUGIN_TRUE= -+ HAVE_NO_USE_LINKER_PLUGIN_FALSE='#' -+else -+ HAVE_NO_USE_LINKER_PLUGIN_TRUE='#' -+ HAVE_NO_USE_LINKER_PLUGIN_FALSE= -+fi -+ -+ - ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -7515,28 +7561,6 @@ $as_echo "#define HAVE_STAT_ST_MTIM 1" >>confdefs.h - - fi - --save_CXXFLAGS="$CXXFLAGS" --CXXFLAGS="$CXXFLAGS -Werror -gpubnames" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --int i; --_ACEOF --if ac_fn_cxx_try_compile "$LINENO"; then : -- have_pubnames=yes --else -- have_pubnames=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --CXXFLAGS="$save_CXXFLAGS" -- if test "$have_pubnames" = "yes"; then -- HAVE_PUBNAMES_TRUE= -- HAVE_PUBNAMES_FALSE='#' --else -- HAVE_PUBNAMES_TRUE='#' -- HAVE_PUBNAMES_FALSE= --fi -- -- - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -7837,6 +7861,10 @@ if test -z "${HAVE_PUBNAMES_TRUE}" && test -z "${HAVE_PUBNAMES_FALSE}"; then - as_fn_error "conditional \"HAVE_PUBNAMES\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi -+if test -z "${HAVE_NO_USE_LINKER_PLUGIN_TRUE}" && test -z "${HAVE_NO_USE_LINKER_PLUGIN_FALSE}"; then -+ as_fn_error "conditional \"HAVE_NO_USE_LINKER_PLUGIN\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 -diff --git a/gold/configure.ac b/gold/configure.ac -index 803cf46..7ad7302 100644 ---- a/gold/configure.ac -+++ b/gold/configure.ac -@@ -520,6 +520,25 @@ dnl multiple declarations of functions like basename when compiling - dnl with C++. - AC_CHECK_DECLS([basename, ffs, asprintf, vasprintf, snprintf, vsnprintf, strverscmp]) - -+dnl Check if gcc supports the -gpubnames option. -+dnl Use -Werror in case of compilers that make unknown -g options warnings. -+dnl They would pass the test here, but fail in actual use when $WARN_CFLAGS -+dnl gets set later by default Autoconf magic to include -Werror. (We are -+dnl assuming here that there is no compiler that groks -gpubnames -+dnl but does not grok -Werror.) -+save_CFLAGS="$CFLAGS" -+CFLAGS="$CFLAGS -Werror -gpubnames" -+AC_COMPILE_IFELSE([int i;], [have_pubnames=yes], [have_pubnames=no]) -+CFLAGS="$save_CFLAGS" -+AM_CONDITIONAL(HAVE_PUBNAMES, test "$have_pubnames" = "yes") -+ -+dnl Check if gcc supports the -fno-use-linker-plugin option. -+save_CFLAGS="$CFLAGS" -+CFLAGS="$CFLAGS -Werror -fno-use-linker-plugin" -+AC_COMPILE_IFELSE([int i;], [have_no_use_linker_plugin=yes], [have_no_use_linker_plugin=no]) -+CFLAGS="$save_CFLAGS" -+AM_CONDITIONAL(HAVE_NO_USE_LINKER_PLUGIN, test "$have_no_use_linker_plugin" = "yes") -+ - AC_LANG_PUSH(C++) - - AC_CHECK_HEADERS(unordered_set unordered_map) -@@ -601,18 +620,6 @@ if test "$gold_cv_stat_st_mtim" = "yes"; then - [Define if struct stat has a field st_mtim with timespec for mtime]) - fi - --dnl Check if gcc supports the -gpubnames option. --dnl Use -Werror in case of compilers that make unknown -g options warnings. --dnl They would pass the test here, but fail in actual use when $WARN_CFLAGS --dnl gets set later by default Autoconf magic to include -Werror. (We are --dnl assuming here that there is no compiler that groks -gpubnames --dnl but does not grok -Werror.) --save_CXXFLAGS="$CXXFLAGS" --CXXFLAGS="$CXXFLAGS -Werror -gpubnames" --AC_COMPILE_IFELSE([int i;], [have_pubnames=yes], [have_pubnames=no]) --CXXFLAGS="$save_CXXFLAGS" --AM_CONDITIONAL(HAVE_PUBNAMES, test "$have_pubnames" = "yes") -- - AC_LANG_POP(C++) - - AC_CHECK_HEADERS(locale.h) -diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am -index aa41290..52cc05e 100644 ---- a/gold/testsuite/Makefile.am -+++ b/gold/testsuite/Makefile.am -@@ -19,18 +19,25 @@ AM_CPPFLAGS = \ - -DLOCALEDIR="\"$(datadir)/locale\"" \ - @INCINTL@ - -+# Some versions of GCC now automatically enable linker plugins, -+# but we want to run our tests without GCC's plugins. -+if HAVE_NO_USE_LINKER_PLUGIN -+OPT_NO_PLUGINS = -fno-use-linker-plugin -+endif -+ - # COMPILE1, LINK1, CXXCOMPILE1, CXXLINK1 are renamed from COMPILE, LINK, - # CXXCOMPILE and CXXLINK generated by automake 1.11.1. FIXME: they should - # be updated if they are different from automake used by gold. - COMPILE1 = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(OPT_NO_PLUGINS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXCOMPILE1 = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -- -o $@ -+CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(OPT_NO_PLUGINS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - --# Strip out -Wp,-D_FORTIFY_SOURCE=, which is rrelevant for the gold -+# Strip out -Wp,-D_FORTIFY_SOURCE=, which is irrelevant for the gold - # testsuite and incompatible with -O0 used in gold tests, from - # COMPILE, LINK, CXXCOMPILE and CXXLINK. - COMPILE = `echo $(COMPILE1) | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[0-9[0-9]]*//'` -diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in -index 60c2c10..da0a338 100644 ---- a/gold/testsuite/Makefile.in -+++ b/gold/testsuite/Makefile.in -@@ -2096,21 +2096,27 @@ AM_CPPFLAGS = \ - @INCINTL@ - - -+# Some versions of GCC now automatically enable linker plugins, -+# but we want to run our tests without GCC's plugins. -+@HAVE_NO_USE_LINKER_PLUGIN_TRUE@OPT_NO_PLUGINS = -fno-use-linker-plugin -+ - # COMPILE1, LINK1, CXXCOMPILE1, CXXLINK1 are renamed from COMPILE, LINK, - # CXXCOMPILE and CXXLINK generated by automake 1.11.1. FIXME: they should - # be updated if they are different from automake used by gold. - COMPILE1 = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - --LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(OPT_NO_PLUGINS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+ - CXXCOMPILE1 = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - --CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -- -o $@ -+CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(OPT_NO_PLUGINS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - - --# Strip out -Wp,-D_FORTIFY_SOURCE=, which is rrelevant for the gold -+# Strip out -Wp,-D_FORTIFY_SOURCE=, which is irrelevant for the gold - # testsuite and incompatible with -O0 used in gold tests, from - # COMPILE, LINK, CXXCOMPILE and CXXLINK. - COMPILE = `echo $(COMPILE1) | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[0-9[0-9]]*//'` diff --git a/abs/core/binutils/binutils-2.24-lto-testsuite.patch b/abs/core/binutils/binutils-2.24-lto-testsuite.patch deleted file mode 100644 index 0f34726..0000000 --- a/abs/core/binutils/binutils-2.24-lto-testsuite.patch +++ /dev/null @@ -1,78 +0,0 @@ -index c5249f0..69946de 100644 ---- a/ld/testsuite/ld-plugin/lto.exp -+++ b/ld/testsuite/ld-plugin/lto.exp -@@ -57,7 +57,7 @@ set lto_link_tests { - "" "-O2" - {lto-3c.c} {} "libdummy.a"} - {"Build liblto-3.a" -- "" "-flto" -+ "" "-flto -ffat-lto-objects" - {lto-3b.c} {} "liblto-3.a"} - {"Build libdummy.a 5a" - "" "-flto" -@@ -111,7 +111,7 @@ set lto_link_tests { - "" "" - {pr12758a.s} {} "libdummy.a"} - {"Build libpr12758.a" -- "" "-flto -O2" -+ "" "-flto -O2 -ffat-lto-objects" - {pr12758b.c} {} "libpr12758.a"} - {"PR ld/12758" - "-O2 -Wl,-e,foo -nostdlib -flto -fuse-linker-plugin tmpdir/pr12758a.o -Wl,--start-group tmpdir/libpr12758.a -Wl,--end-group" "" -@@ -120,13 +120,13 @@ set lto_link_tests { - "" "" - {pr12760a.c} {} "libdummy.a"} - {"Build libpr12760.a" -- "" "-flto -O2" -+ "" "-flto -O2 -ffat-lto-objects" - {pr12760b.c} {} "libpr12760.a"} - {"PR ld/12760" - "-O2 -Wl,-e,foo -nostdlib -flto -fuse-linker-plugin tmpdir/pr12760a.o -Wl,--start-group tmpdir/libpr12760.a -Wl,--end-group" "" - {dummy.c} {} "pr12760.exe" "c" "warning: Bad bar"} - {"Build libpr13183.a" -- "-T" "-flto -O2" -+ "-T" "-flto -O2 -ffat-lto-objects" - {pr13183a.c} {} "libpr13183.a"} - {"Build libdummy.a PR ld/13183" - "" "-flto -O2" -diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp -index 8df42ae..175449a 100644 ---- a/ld/testsuite/lib/ld-lib.exp -+++ b/ld/testsuite/lib/ld-lib.exp -@@ -1643,7 +1643,7 @@ proc check_lto_available { } { - set f [open $src "w"] - puts $f "" - close $f -- set status [remote_exec host $CC "-shared -B[pwd]/tmpdir/ld/ -flto -fuse-linker-plugin $src -o $output"] -+ set status [remote_exec host $CC "-shared -B[pwd]/tmpdir/ld/ -flto -ffat-lto-objects -fuse-linker-plugin $src -o $output"] - if { [lindex $status 0] == 0 } { - set lto_available_saved 1 - } else { -diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp -index b14f13c..765d85f 100644 ---- a/ld/testsuite/ld-plugin/lto.exp -+++ b/ld/testsuite/ld-plugin/lto.exp -@@ -324,7 +324,20 @@ if { [is_elf_format] && [check_lto_shared_available] } { - - set testname "Build liblto-11.a" - remote_file host delete "tmpdir/liblto-11.a" --set catch_output [run_host_cmd "$ar" "rc tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"] -+set plugin_names { -+ liblto_plugin.so -+ liblto_plugin-0.dll -+ cyglto_plugin-0.dll -+} -+set plug_opt "" -+foreach plug $plugin_names { -+ set plug_so [run_host_cmd $CC "--print-prog-name $plug"] -+ if { $plug_so ne $plug } then { -+ set plug_opt "--plugin $plug_so" -+ break -+ } -+} -+set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"] - if {![string match "" $catch_output]} { - unresolved $testname - restore_notify - - diff --git a/abs/core/binutils/binutils-2.24-shared-pie.patch b/abs/core/binutils/binutils-2.24-shared-pie.patch deleted file mode 100644 index d40aa47..0000000 --- a/abs/core/binutils/binutils-2.24-shared-pie.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em -index 9a2fe89..13f86f0 100644 ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1480,6 +1480,8 @@ gld${EMULATION_NAME}_before_allocation (void) - const char *rpath; - asection *sinterp; - bfd *abfd; -+ struct elf_link_hash_entry *ehdr_start = NULL; -+ struct bfd_link_hash_entry ehdr_start_save; - - if (is_elf_hash_table (link_info.hash)) - { -@@ -1504,6 +1506,16 @@ gld${EMULATION_NAME}_before_allocation (void) - _bfd_elf_link_hash_hide_symbol (&link_info, h, TRUE); - if (ELF_ST_VISIBILITY (h->other) != STV_INTERNAL) - h->other = (h->other & ~ELF_ST_VISIBILITY (-1)) | STV_HIDDEN; -+ /* Don't leave the symbol undefined. Undefined hidden -+ symbols typically won't have dynamic relocations, but -+ we most likely will need dynamic relocations for -+ __ehdr_start if we are building a PIE or shared -+ library. */ -+ ehdr_start = h; -+ ehdr_start_save = h->root; -+ h->root.type = bfd_link_hash_defined; -+ h->root.u.def.section = bfd_abs_section_ptr; -+ h->root.u.def.value = 0; - } - } - -@@ -1620,6 +1632,14 @@ ${ELF_INTERPRETER_SET_DEFAULT} - - if (!bfd_elf_size_dynsym_hash_dynstr (link_info.output_bfd, &link_info)) - einfo ("%P%F: failed to set dynamic section sizes: %E\n"); -+ -+ if (ehdr_start != NULL) -+ { -+ /* If we twiddled __ehdr_start to defined earlier, put it back -+ as it was. */ -+ ehdr_start->root.type = ehdr_start_save.type; -+ ehdr_start->root.u = ehdr_start_save.u; -+ } - } - - EOF -diff --git a/ld/testsuite/ld-elf/ehdr_start-shared.d b/ld/testsuite/ld-elf/ehdr_start-shared.d -new file mode 100644 -index 0000000..c17516a ---- /dev/null -+++ b/ld/testsuite/ld-elf/ehdr_start-shared.d -@@ -0,0 +1,9 @@ -+#source: ehdr_start.s -+#ld: -e _start -shared -+#nm: -n -+#target: *-*-linux* *-*-gnu* *-*-nacl* -+#xfail: cris*-*-* frv-*-* -+ -+#... -+[0-9a-f]*000 [Adrt] __ehdr_start -+#pass -diff --git a/ld/testsuite/ld-elf/ehdr_start-userdef.d b/ld/testsuite/ld-elf/ehdr_start-userdef.d -index 2a88e98..b58ae3f 100644 ---- a/ld/testsuite/ld-elf/ehdr_start-userdef.d -+++ b/ld/testsuite/ld-elf/ehdr_start-userdef.d -@@ -2,6 +2,7 @@ - #ld: -e _start -T ehdr_start-userdef.t - #readelf: -Ws - #target: *-*-linux* *-*-gnu* *-*-nacl* -+#xfail: frv-*-* - - #... - Symbol table '\.symtab' contains [0-9]+ entries: -diff --git a/ld/testsuite/ld-elf/ehdr_start-weak.d b/ld/testsuite/ld-elf/ehdr_start-weak.d -index 8bd9035..24ae34c 100644 ---- a/ld/testsuite/ld-elf/ehdr_start-weak.d -+++ b/ld/testsuite/ld-elf/ehdr_start-weak.d -@@ -2,6 +2,7 @@ - #ld: -e _start -T ehdr_start-missing.t - #nm: -n - #target: *-*-linux* *-*-gnu* *-*-nacl* -+#xfail: frv-*-* - - #... - \s+[wU] __ehdr_start -diff --git a/ld/testsuite/ld-elf/ehdr_start.d b/ld/testsuite/ld-elf/ehdr_start.d -index 52e5b54..d538b66 100644 ---- a/ld/testsuite/ld-elf/ehdr_start.d -+++ b/ld/testsuite/ld-elf/ehdr_start.d -@@ -2,6 +2,7 @@ - #ld: -e _start - #nm: -n - #target: *-*-linux* *-*-gnu* *-*-nacl* -+#xfail: frv-*-* - - #... - [0-9a-f]*000 [Adrt] __ehdr_start --- -1.7.1 - diff --git a/abs/core/binutils/binutils-e9c1bdad.patch b/abs/core/binutils/binutils-e9c1bdad.patch new file mode 100644 index 0000000..6ef9f52 --- /dev/null +++ b/abs/core/binutils/binutils-e9c1bdad.patch @@ -0,0 +1,78 @@ +diff --git a/gold/layout.cc b/gold/layout.cc +index bcdaac8..7836640 100644 +--- a/gold/layout.cc ++++ b/gold/layout.cc +@@ -4873,7 +4873,8 @@ Layout::finish_dynamic_section(const Input_objects* input_objects, + flags |= elfcpp::DF_STATIC_TLS; + if (parameters->options().origin()) + flags |= elfcpp::DF_ORIGIN; +- if (parameters->options().Bsymbolic()) ++ if (parameters->options().Bsymbolic() ++ && !parameters->options().have_dynamic_list()) + { + flags |= elfcpp::DF_SYMBOLIC; + // Add DT_SYMBOLIC for compatibility with older loaders. +diff --git a/gold/options.cc b/gold/options.cc +index 7eb8f27..7f1f69e 100644 +--- a/gold/options.cc ++++ b/gold/options.cc +@@ -1200,13 +1200,6 @@ General_options::finalize() + // in the path, as appropriate. + this->add_sysroot(); + +- // --dynamic-list overrides -Bsymbolic and -Bsymbolic-functions. +- if (this->have_dynamic_list()) +- { +- this->set_Bsymbolic(false); +- this->set_Bsymbolic_functions(false); +- } +- + // Now that we've normalized the options, check for contradictory ones. + if (this->shared() && this->is_static()) + gold_fatal(_("-shared and -static are incompatible")); +diff --git a/gold/symtab.h b/gold/symtab.h +index aa0cb68..9413360 100644 +--- a/gold/symtab.h ++++ b/gold/symtab.h +@@ -604,10 +604,8 @@ class Symbol + if (parameters->options().in_dynamic_list(this->name())) + return true; + +- // If the user used -Bsymbolic or provided a --dynamic-list script, +- // then nothing (else) is preemptible. +- if (parameters->options().Bsymbolic() +- || parameters->options().have_dynamic_list()) ++ // If the user used -Bsymbolic, then nothing (else) is preemptible. ++ if (parameters->options().Bsymbolic()) + return false; + + // If the user used -Bsymbolic-functions, then functions are not +diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am +index f767c21..7b73f9d 100644 +--- a/gold/testsuite/Makefile.am ++++ b/gold/testsuite/Makefile.am +@@ -1518,7 +1518,7 @@ dynamic_list_lib1.o: dynamic_list_lib1.cc + $(CXXCOMPILE) -c -fpic -o $@ $< + + dynamic_list_lib2.so: gcctestdir/ld dynamic_list_lib2.o $(srcdir)/dynamic_list_2.t +- $(CXXLINK) -Bgcctestdir/ -shared -Wl,--dynamic-list,$(srcdir)/dynamic_list_2.t dynamic_list_lib2.o ++ $(CXXLINK) -Bgcctestdir/ -shared -Wl,-Bsymbolic-functions -Wl,--dynamic-list,$(srcdir)/dynamic_list_2.t dynamic_list_lib2.o + dynamic_list_lib2.o: dynamic_list_lib2.cc + $(CXXCOMPILE) -c -fpic -o $@ $< + +diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in +index 217e472..b4ae3fd 100644 +--- a/gold/testsuite/Makefile.in ++++ b/gold/testsuite/Makefile.in +@@ -5319,7 +5319,7 @@ uninstall-am: + @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -fpic -o $@ $< + + @GCC_TRUE@@NATIVE_LINKER_TRUE@dynamic_list_lib2.so: gcctestdir/ld dynamic_list_lib2.o $(srcdir)/dynamic_list_2.t +-@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXLINK) -Bgcctestdir/ -shared -Wl,--dynamic-list,$(srcdir)/dynamic_list_2.t dynamic_list_lib2.o ++@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXLINK) -Bgcctestdir/ -shared -Wl,-Bsymbolic-functions -Wl,--dynamic-list,$(srcdir)/dynamic_list_2.t dynamic_list_lib2.o + @GCC_TRUE@@NATIVE_LINKER_TRUE@dynamic_list_lib2.o: dynamic_list_lib2.cc + @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -fpic -o $@ $< + +-- +1.9.4 + -- cgit v0.12 From 0fb4f371d0aa0ecd295a587cbd7dc1205f66fb24 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 19 Jan 2016 16:35:17 +0000 Subject: elfutils: update to 0.165 --- abs/core/elfutils/PKGBUILD | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/abs/core/elfutils/PKGBUILD b/abs/core/elfutils/PKGBUILD index b971e94..059bdae 100644 --- a/abs/core/elfutils/PKGBUILD +++ b/abs/core/elfutils/PKGBUILD @@ -1,38 +1,50 @@ # $Id$ -# Maintainer: Stéphane Gaudreault +# Maintainer: Laurent Carlier +# Contributor: Stéphane Gaudreault # Contributor: Andrej Gelenberg -pkgname=elfutils -pkgver=0.163 +pkgbase=elfutils +pkgname=(elfutils libelf) +pkgver=0.165 pkgrel=1 -pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information" +pkgdesc="Utilities to handle ELF object files and DWARF debugging information" arch=('i686' 'x86_64') url="https://fedorahosted.org/elfutils/" license=('LGPL3' 'GPL' 'GPL3') depends=('gcc-libs' 'zlib' 'bzip2' 'xz') -source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}) options=('staticlibs') -sha1sums=('7931b4961364a8a17c708138c70c552ae2881227' +source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}) +sha1sums=('b994f2f31e6638415d7f8a3c0c7e04e6bc4ca4a9' 'SKIP') validpgpkeys=('47CC0331081B8BC6D0FD4DA08370665B57816A6A') # Mark J. Wielaard build() { - cd ${pkgname}-${pkgver} + cd ${pkgbase}-${pkgver} CFLAGS+=" -g" # required for test-suite success - ./configure --prefix=/usr --program-prefix="eu-" + ./configure --prefix=/usr --program-prefix="eu-" --enable-deterministic-archives make } check() { - cd ${pkgname}-${pkgver} + cd ${pkgbase}-${pkgver} make check } -package() { - cd ${pkgname}-${pkgver} +package_elfutils() { + depends=("libelf=$pkgver-$pkgrel") + + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install + + mkdir "${srcdir}"/libelf + mv "${pkgdir}"/usr/{lib,include} "${srcdir}/libelf" +} + +package_libelf() { + pkgdesc="Libraries to handle ELF object files and DWARF debugging information" + mv libelf "${pkgdir}/usr" } -- cgit v0.12 From 6bd1f514c521b6d9a6d12f4b1a1e375f6ea75766 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 19 Jan 2016 17:03:39 +0000 Subject: glib2: update to 2.46.2 --- abs/core/glib2/PKGBUILD | 16 +++++++++------- abs/core/glib2/memleak.patch | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 abs/core/glib2/memleak.patch diff --git a/abs/core/glib2/PKGBUILD b/abs/core/glib2/PKGBUILD index ee1ccf0..3498bde 100644 --- a/abs/core/glib2/PKGBUILD +++ b/abs/core/glib2/PKGBUILD @@ -3,20 +3,22 @@ pkgbase=glib2 pkgname=(glib2 glib2-docs) -pkgver=2.42.1 -pkgrel=1 +pkgver=2.46.2 +pkgrel=2 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64) -makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils') +makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'libelf') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver:0:4}/glib-$pkgver.tar.xz - revert-warn-glib-compile-schemas.patch) -sha256sums=('8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a' - '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') + revert-warn-glib-compile-schemas.patch memleak.patch) +sha256sums=('5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db' + '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97' + '8337eeba4a32133d41575c8338fca32ac6a867e6e4a4e021355fcdeb606420a6') prepare() { cd glib-$pkgver patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch + patch -Np1 -i ../memleak.patch } build() { @@ -36,7 +38,7 @@ check() { package_glib2() { depends=('pcre' 'libffi') optdepends=('python2: for gdbus-codegen and gtester-report' - 'elfutils: gresource inspection tool') + 'libelf: gresource inspection tool') options=('!docs' '!emptydirs') license=('LGPL') diff --git a/abs/core/glib2/memleak.patch b/abs/core/glib2/memleak.patch new file mode 100644 index 0000000..2b927a1 --- /dev/null +++ b/abs/core/glib2/memleak.patch @@ -0,0 +1,25 @@ +From db641e32920ee8b553ab6f2d318aafa156e4390c Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras +Date: Wed, 25 Nov 2015 23:29:18 +0200 +Subject: GDBusProxy: Fix a memory leak during initialization + +https://bugzilla.gnome.org/show_bug.cgi?id=758641 +--- + gio/gdbusproxy.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c +index 52a22fb..7b1140f 100644 +--- a/gio/gdbusproxy.c ++++ b/gio/gdbusproxy.c +@@ -1720,6 +1720,7 @@ async_initable_init_second_finish (GAsyncInitable *initable, + if (result != NULL) + { + process_get_all_reply (proxy, result); ++ g_variant_unref (result); + } + + proxy->priv->initialized = TRUE; +-- +cgit v0.11.2 + -- cgit v0.12 From 428e2dc7edc26c053a1aa4f0f378cb9722535356 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 19 Jan 2016 17:04:41 +0000 Subject: libtool: update to 2.4.6 --- abs/core/libtool/PKGBUILD | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/abs/core/libtool/PKGBUILD b/abs/core/libtool/PKGBUILD index 493c799..07fcee8 100644 --- a/abs/core/libtool/PKGBUILD +++ b/abs/core/libtool/PKGBUILD @@ -4,23 +4,29 @@ # NOTE: requires rebuilt with each new gcc version -pkgname=('libtool' 'libltdl') -pkgver=2.4.2 -_gccver=4.9.2 -pkgrel=15 +pkgname=libtool +pkgver=2.4.6 +pkgrel=4 +_gccver=5.3.0 pkgdesc="A generic library support script" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libtool" license=('GPL') -makedepends=("gcc=${_gccver}") +groups=('base-devel') +depends=('sh' 'tar' 'glibc') +makedepends=("gcc=$_gccver") +provides=("libltdl=$pkgver" "libtool-multilib=$pkgver") +conflicts=('libltdl' 'libtool-multilib') +replaces=('libltdl' 'libtool-multilib') +install=libtool.install source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('2ec8997e0c07249eb4cbd072417d70fe' - '1e6ba57420c82c663c85e745d11c7eed') -validpgpkeys=('CFE2BE707B538E8B26757D84151308092983D606') +md5sums=('1bfb9b923f2c1339b4d2ce1807064aa5' + 'SKIP') +validpgpkeys=('CFE2BE707B538E8B26757D84151308092983D606') # Gary Vaughan build() { cd ${srcdir}/${pkgbase}-${pkgver} - ./configure --prefix=/usr + ./configure --prefix=/usr lt_cv_sys_lib_dlsearch_path_spec="/usr/lib /usr/lib32" make } @@ -29,23 +35,7 @@ check() { make check } -package_libtool() { - depends=('sh' "libltdl=$pkgver" 'tar' "gcc=${_gccver}") - groups=('base-devel') - install=libtool.install - - cd ${srcdir}/${pkgbase}-${pkgver} - - make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \ - install-data-local - rm -r ${pkgdir}/usr/share/libtool/libltdl/ -} - -package_libltdl() { - pkgdesc="A system independent dlopen wrapper for GNU libtool" - +package() { cd ${srcdir}/${pkgbase}-${pkgver} - make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \ - install-ltdlincludeHEADERS install-data-local - rm -r ${pkgdir}/usr/share/{aclocal,libtool/config} + make DESTDIR=${pkgdir} install } -- cgit v0.12 From 8daa636a59a942f62c80f650ff60cacca81f1daa Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 01:41:24 +0000 Subject: qt5: initial inclusion --- abs/core/qt5/PKGBUILD | 575 +++++++++++++++++++++ abs/core/qt5/__changelog | 3 + abs/core/qt5/assistant.desktop | 8 + abs/core/qt5/designer.desktop | 10 + ...play-number-when-screen-number-is-omitted.patch | 32 ++ abs/core/qt5/linguist.desktop | 9 + abs/core/qt5/qdbusviewer.desktop | 9 + abs/core/qt5/qt5-tools.install | 12 + abs/core/qt5/rebuild.list | 6 + 9 files changed, 664 insertions(+) create mode 100644 abs/core/qt5/PKGBUILD create mode 100644 abs/core/qt5/__changelog create mode 100644 abs/core/qt5/assistant.desktop create mode 100644 abs/core/qt5/designer.desktop create mode 100644 abs/core/qt5/ibus-get-display-number-when-screen-number-is-omitted.patch create mode 100644 abs/core/qt5/linguist.desktop create mode 100644 abs/core/qt5/qdbusviewer.desktop create mode 100644 abs/core/qt5/qt5-tools.install create mode 100644 abs/core/qt5/rebuild.list diff --git a/abs/core/qt5/PKGBUILD b/abs/core/qt5/PKGBUILD new file mode 100644 index 0000000..d16e001 --- /dev/null +++ b/abs/core/qt5/PKGBUILD @@ -0,0 +1,575 @@ +# $Id$ +# Maintainer: Felix Yan +# Contributor: Andrea Scarpino + +pkgbase=qt5 +pkgname=('qt5-3d' + 'qt5-base' + 'qt5-canvas3d' + 'qt5-connectivity' + 'qt5-declarative' + 'qt5-doc' + 'qt5-enginio' + 'qt5-graphicaleffects' + 'qt5-imageformats' + 'qt5-location' + 'qt5-multimedia' + 'qt5-quick1' + 'qt5-quickcontrols' + 'qt5-script' + 'qt5-sensors' + 'qt5-serialport' + 'qt5-svg' + 'qt5-tools' + 'qt5-translations' + 'qt5-wayland' + 'qt5-webchannel' + 'qt5-webengine' + 'qt5-webkit' + 'qt5-websockets' + 'qt5-x11extras' + 'qt5-xmlpatterns') +pkgver=5.5.1 +pkgrel=9 +arch=('i686' 'x86_64') +url='http://www.qt.io/developers' +license=('GPL3' 'LGPL' 'FDL' 'custom') +makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' + 'mesa' 'at-spi2-core' 'alsa-lib' 'gst-plugins-base-libs' 'libjpeg-turbo' 'cups' + 'hicolor-icon-theme' 'desktop-file-utils' 'postgresql-libs' 'nss' + 'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient' 'libmng' 'python2' 'ruby' + 'gperf' 'libxslt' 'libxcomposite' 'fontconfig' 'bluez-libs' 'openal' 'gtk2' + 'libxkbcommon-x11' 'mtdev' 'harfbuzz' 'libwebp' 'leveldb' 'geoclue' 'pciutils' + 'libinput' 'yasm' 'git') +groups=('qt' 'qt5') +_pkgfqn="qt-everywhere-opensource-src-${pkgver}" +source=("http://download.qt-project.org/official_releases/qt/${pkgver%.*}/${pkgver}/single/${_pkgfqn}.tar.xz" + 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop') +md5sums=('c2a249e8795d45200d997d96860d0353' + 'b2897dd6a2967bccf8f10e397aafee55' + '76e150b20178d2d43801f7367232e5f7' + '188da8f4c87316e730ebf1c6217bf5a0' + '322b419b16c75d4de0ee7ad0a246caa1') + +prepare() { + cd ${_pkgfqn} + + # Build qmake using Arch {C,LD}FLAGS + # This also sets default {C,CXX,LD}FLAGS for projects built using qmake + sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \ + qtbase/mkspecs/common/gcc-base.conf + sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \ + qtbase/mkspecs/common/g++-unix.conf + + # Use python2 for Python 2.x + find . -name '*.py' -exec sed -i \ + 's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} + + # in qtwebengine 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 + + # Try to enable proprietary_codecs and use some system yasm + sed -e 's/contains(WEBENGINE_CONFIG, proprietary_codecs): //' \ + -e '/use_system_ffmpeg=0"/a GYP_ARGS += "-Duse_system_yasm=1"' \ + -i qtwebengine/src/core/gyp_run.pro +} + +build() { + cd ${_pkgfqn} + + export QTDIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH="${QTDIR}"/qtbase/lib:"${QTDIR}"/qttools/lib:"${LD_LIBRARY_PATH}" + export QT_PLUGIN_PATH="${QTDIR}"/qtbase/plugins + + # python2 workaround + export PATH="${srcdir}/python2-path:$PATH" + + # FS#38796 + [[ "${CARCH}" = "i686" ]] && SSE2="-no-sse2" + + PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \ + -prefix /usr \ + -bindir /usr/lib/qt/bin \ + -docdir /usr/share/doc/qt \ + -headerdir /usr/include/qt \ + -archdatadir /usr/lib/qt \ + -datadir /usr/share/qt \ + -sysconfdir /etc/xdg \ + -examplesdir /usr/share/doc/qt/examples \ + -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \ + -system-sqlite \ + -openssl-linked \ + -nomake examples \ + -no-rpath \ + -optimized-qmake \ + -dbus-linked \ + -system-harfbuzz \ + -journald \ + -libinput ${SSE2} + + make + + # Fix docs build when qt is not installed + sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" \ + "${QTDIR}"/qtbase/qmake/Makefile.qmake-docs + find "${QTDIR}" -name Makefile \ + -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} + + sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" \ + "${QTDIR}"/qtbase/qmake/Makefile.qmake-docs + find "${QTDIR}" -name Makefile \ + -exec sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} + + sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" \ + qtwebkit/Source/Makefile.api + find "${QTDIR}" -name Makefile \ + -exec sed -i "s|/usr/lib/qt/bin/qmlplugindump|${QTDIR}/qtdeclarative/bin/qmlplugindump|g" {} + + + make docs +} + +package_qt5-3d() { + pkgdesc='C++ and QML APIs for easy inclusion of 3D graphics' + depends=('qt5-declarative') + license=('LGPL') + + cd ${_pkgfqn}/qt3d + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; +} + +package_qt5-base() { + pkgdesc='A cross-platform application and UI framework' + depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd' + 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' + 'qtchooser' 'libinput' 'libsm' 'libxkbcommon-x11') + optdepends=('qt5-svg: to use SVG icon themes' + 'postgresql-libs: PostgreSQL driver' + 'libmariadbclient: MariaDB driver' + 'unixodbc: ODBC driver' + 'libfbclient: Firebird/iBase driver' + 'mtdev: evdev plugin' + 'gtk2: GTK2 plugin') + conflicts=('qt') + + cd ${_pkgfqn}/qtbase + make INSTALL_ROOT="${pkgdir}" install + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + # Fix wrong qmake path in pri file + sed -i "s|${srcdir}/${_pkgfqn}/qtbase|/usr|" \ + "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done +} + +package_qt5-canvas3d() { + pkgdesc='A JavaScript 3D rendering API for Qt Quick' + depends=('qt5-declarative') + license=('LGPL') + + cd ${_pkgfqn}/qtcanvas3d + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; +} + +package_qt5-connectivity() { + pkgdesc='Provides access to Bluetooth hardware' + depends=('qt5-declarative' 'bluez-libs') + + cd ${_pkgfqn}/qtconnectivity + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-declarative() { + pkgdesc='Classes for QML and JavaScript languages' + depends=('qt5-xmlpatterns') + conflicts=('qt') + + cd ${_pkgfqn}/qtdeclarative + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-doc() { + pkgdesc='A cross-platform application and UI framework (Documentation)' + depends=('qt5-base') +# arch=('any') + conflicts=('qt-doc') + replaces=('qt-doc') + provides=('qt-doc') + options=('docs' '!emptydirs') + groups=() + + cd ${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install_docs + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-enginio() { + pkgdesc='A Backend-as-a-Service solution to ease the backend development for connected and data-driven application' + depends=('qt5-declarative') + + cd ${_pkgfqn}/qtenginio + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-graphicaleffects() { + pkgdesc='Graphical effects for use with Qt Quick 2' + depends=('qt5-declarative') + + cd ${_pkgfqn}/qtgraphicaleffects + make INSTALL_ROOT="${pkgdir}" install + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-imageformats() { + pkgdesc='Plugins for additional image formats: TIFF, MNG, TGA, WBMP' + depends=('qt5-base' 'jasper' 'libmng' 'libwebp') + conflicts=('qt') + + cd ${_pkgfqn}/qtimageformats + make INSTALL_ROOT="${pkgdir}" install + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-location() { + pkgdesc='Provides access to position, satellite and area monitoring classes' + depends=('qt5-declarative' 'geoclue') + + cd ${_pkgfqn}/qtlocation + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-multimedia() { + pkgdesc='Classes for audio, video, radio and camera functionality' + depends=('qt5-declarative' 'gst-plugins-base-libs' 'openal') + optdepends=('gst-plugins-bad: Qt MediaService plugin') + conflicts=('qt') + + cd ${_pkgfqn}/qtmultimedia + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-quick1() { + pkgdesc='Qt Declarative is provided for Qt 4 compatibility' + depends=('qt5-webkit' 'qt5-script') + conflicts=('qt') + + cd ${_pkgfqn}/qtquick1 + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-quickcontrols() { + pkgdesc='Reusable Qt Quick based UI controls to create classic desktop-style user interfaces' + depends=('qt5-declarative') + license=('LGPL') + + cd ${_pkgfqn}/qtquickcontrols + make INSTALL_ROOT="${pkgdir}" install +} + +package_qt5-script() { + pkgdesc='Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility' + depends=('qt5-base') + conflicts=('qt') + + cd ${_pkgfqn}/qtscript + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-sensors() { + pkgdesc='Provides access to sensor hardware and motion gesture recognition' + depends=('qt5-declarative') + + cd ${_pkgfqn}/qtsensors + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-serialport() { + pkgdesc='Provides access to hardware and virtual serial ports' + depends=('qt5-base') + + cd ${_pkgfqn}/qtserialport + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-svg() { + pkgdesc='Classes for displaying the contents of SVG files' + depends=('qt5-base') + conflicts=('qt') + + cd ${_pkgfqn}/qtsvg + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-tools() { + pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp)' + depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations' 'hicolor-icon-theme' + 'xdg-utils') + optdepends=('qt5-doc: documentation') + install='qt5-tools.install' + conflicts=('qt') + options=('staticlibs') # libQt5UiTools builds as static only$ + + cd ${_pkgfqn}/qttools + make INSTALL_ROOT="${pkgdir}" install + + # install missing icons and desktop files + for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -p -D -m644 ${icon} \ + "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" + done + + install -D -m644 src/assistant/assistant/images/assistant.png \ + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" + install -D -m644 src/assistant/assistant/images/assistant-128.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant.png" + install -D -m644 src/designer/src/designer/images/designer.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/QtProject-designer.png" + install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer.png \ + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/qdbusviewer.png" + install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/qdbusviewer.png" + install -d "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}"/{linguist,designer,assistant,qdbusviewer}.desktop \ + "${pkgdir}/usr/share/applications/" + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-translations() { + pkgdesc='A cross-platform application and UI framework (Translations)' + depends=('qt5-base') + conflicts=('qt') + + cd ${_pkgfqn}/qttranslations + make INSTALL_ROOT="${pkgdir}" install + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-wayland() { + pkgdesc='Provides APIs for Wayland' + depends=('qt5-base' 'libxcomposite') + + cd ${_pkgfqn}/qtwayland + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-webchannel() { + pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients' + depends=('qt5-declarative') + + cd ${_pkgfqn}/qtwebchannel + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-webengine() { + pkgdesc='Provides support for web applications using the Chromium browser project' + depends=('qt5-webchannel' 'qt5-location' 'nss' 'libxtst' 'libxcursor' 'libxrandr' 'alsa-lib' 'libxcomposite') + license=('LGPL') + + cd ${_pkgfqn}/qtwebengine + make INSTALL_ROOT="${pkgdir}" install + + rm -rf "${pkgdir}"/usr/share/doc +} + +package_qt5-webkit() { + pkgdesc='Classes for a WebKit2 based implementation and a new QML API' + depends=('qt5-sensors' 'qt5-location' 'qt5-webchannel' 'gst-plugins-base' 'libxslt' + 'libxcomposite' 'libwebp') + optdepends=('gst-plugins-good: Webm codec support') + license=('GPL3' 'LGPL' 'FDL') + + cd ${_pkgfqn}/qtwebkit + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + # Fix wrong path in pc file + perl -pi -e "s, -L${srcdir}/?\S+,,g" "${pkgdir}"/usr/lib/pkgconfig/Qt5WebKit.pc +} + +package_qt5-websockets() { + pkgdesc='Provides WebSocket communication compliant with RFC 6455' + depends=('qt5-declarative') + + cd ${_pkgfqn}/qtwebsockets + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-x11extras() { + pkgdesc='Provides platform-specific APIs for X11' + depends=('qt5-base') + + cd ${_pkgfqn}/qtx11extras + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} + +package_qt5-xmlpatterns() { + pkgdesc='Support for XPath, XQuery, XSLT and XML schema validation' + depends=('qt5-base') + conflicts=('qt') + + cd ${_pkgfqn}/qtxmlpatterns + make INSTALL_ROOT="${pkgdir}" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done + + install -D -m644 LGPL_EXCEPTION.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt +} diff --git a/abs/core/qt5/__changelog b/abs/core/qt5/__changelog new file mode 100644 index 0000000..5bdff6c --- /dev/null +++ b/abs/core/qt5/__changelog @@ -0,0 +1,3 @@ +PKGBUILD: +- remove dep libpulse +- remove dep libfbclient diff --git a/abs/core/qt5/assistant.desktop b/abs/core/qt5/assistant.desktop new file mode 100644 index 0000000..9d61004 --- /dev/null +++ b/abs/core/qt5/assistant.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Qt Assistant +Comment=Shows Qt documentation and examples +Exec=/usr/lib/qt/bin/assistant +Icon=assistant +Terminal=false +Type=Application +Categories=Qt;Development;Documentation; diff --git a/abs/core/qt5/designer.desktop b/abs/core/qt5/designer.desktop new file mode 100644 index 0000000..b39e77a --- /dev/null +++ b/abs/core/qt5/designer.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt applications +Exec=/usr/lib/qt/bin/designer +Icon=QtProject-designer +MimeType=application/x-designer; +Terminal=false +Type=Application +Categories=Qt;Development; diff --git a/abs/core/qt5/ibus-get-display-number-when-screen-number-is-omitted.patch b/abs/core/qt5/ibus-get-display-number-when-screen-number-is-omitted.patch new file mode 100644 index 0000000..54897e0 --- /dev/null +++ b/abs/core/qt5/ibus-get-display-number-when-screen-number-is-omitted.patch @@ -0,0 +1,32 @@ +From c72325d52575cb8a46cc8595c592c27581089dec Mon Sep 17 00:00:00 2001 +From: Takao Fujiwara +Date: Tue, 24 Mar 2015 19:08:34 +0900 +Subject: [PATCH] ibus: Get display number when screen number is omitted. + +QIBusPlatformInputContextPrivate::createConnection() parses DISPLAY +variable and it does not get the display number when the screen number +is omitted. E.g. DISPLAY=":1". + +Change-Id: I9f81d8114d4e0f654a27ada67c5dc110eb34cd64 +Reviewed-by: Gatis Paeglis +--- + .../ibus/qibusplatforminputcontext.cpp | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp +index d00435b..673942b 100644 +--- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp ++++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp +@@ -351,6 +351,8 @@ QDBusConnection *QIBusPlatformInputContextPrivate::createConnection() + int pos2 = display.indexOf('.', pos); + if (pos2 > 0) + displayNumber = display.mid(pos, pos2 - pos); ++ else ++ displayNumber = display.right(pos); + if (debug) + qDebug() << "host=" << host << "displayNumber" << displayNumber; + +-- +1.7.1 + + diff --git a/abs/core/qt5/linguist.desktop b/abs/core/qt5/linguist.desktop new file mode 100644 index 0000000..c6d1aa4 --- /dev/null +++ b/abs/core/qt5/linguist.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt Linguist +Comment=Add translations to Qt applications +Exec=/usr/lib/qt/bin/linguist +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; +Terminal=false +Type=Application +Categories=Qt;Development; diff --git a/abs/core/qt5/qdbusviewer.desktop b/abs/core/qt5/qdbusviewer.desktop new file mode 100644 index 0000000..9165b6f --- /dev/null +++ b/abs/core/qt5/qdbusviewer.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt QDbusViewer +GenericName=D-Bus Debugger +Comment=Debug D-Bus applications +Exec=/usr/lib/qt/bin/qdbusviewer +Icon=qdbusviewer +Terminal=false +Type=Application +Categories=Qt;Development;Debugger; diff --git a/abs/core/qt5/qt5-tools.install b/abs/core/qt5/qt5-tools.install new file mode 100644 index 0000000..5495fb1 --- /dev/null +++ b/abs/core/qt5/qt5-tools.install @@ -0,0 +1,12 @@ +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/core/qt5/rebuild.list b/abs/core/qt5/rebuild.list new file mode 100644 index 0000000..5519fd7 --- /dev/null +++ b/abs/core/qt5/rebuild.list @@ -0,0 +1,6 @@ +fcitx-qt5 +frameworkintegration +gcin +calibre +akonadi +skrooge -- cgit v0.12 From 326b374b35be3e422e1c09fce00f5a67fb4a3a17 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 16:39:42 +0000 Subject: util-linux: update to 2.27.1 --- abs/core/util-linux/PKGBUILD | 49 ++++++++++++++++------------------ abs/core/util-linux/__changelog | 1 - abs/core/util-linux/util-linux.install | 21 --------------- abs/core/util-linux/uuidd.tmpfiles | 1 - 4 files changed, 23 insertions(+), 49 deletions(-) mode change 100755 => 100644 abs/core/util-linux/PKGBUILD delete mode 100644 abs/core/util-linux/util-linux.install delete mode 100644 abs/core/util-linux/uuidd.tmpfiles diff --git a/abs/core/util-linux/PKGBUILD b/abs/core/util-linux/PKGBUILD old mode 100755 new mode 100644 index 0f8936d..64faa1a --- a/abs/core/util-linux/PKGBUILD +++ b/abs/core/util-linux/PKGBUILD @@ -5,25 +5,25 @@ pkgbase=util-linux pkgname=(util-linux libutil-linux) -pkgver=2.25.2 +pkgver=2.27.1 pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" -url="http://www.kernel.org/pub/linux/utils/util-linux/" +url="https://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') makedepends=('systemd' 'python2') license=('GPL2') options=('strip' 'debug') -source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.25/$pkgname-$pkgver.tar.xz" - uuidd.tmpfiles +validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak +source=("https://www.kernel.org/pub/linux/utils/util-linux/v${pkgver%.?}/$pkgbase-$pkgver.tar."{xz,sign} pam-{login,common,su}) -md5sums=('cab3d7be354000f629bc601238b629b3' - 'a39554bfd65cccfd8254bb46922f4a67' +md5sums=('3cd2698d1363a2c64091c2dadc974647' + 'SKIP' '4368b3f98abd8a32662e094c54e7f9b1' 'a31374fef2cba0ca34dfc7078e2969e4' 'fa85e5cce5d723275b14365ba71a8aad') build() { - cd "$pkgname-$pkgver" + cd "$pkgbase-$pkgver" ./configure --prefix=/usr \ --libdir=/usr/lib \ @@ -36,18 +36,18 @@ build() { --enable-chfn-chsh \ --enable-write \ --enable-mesg \ - --enable-socket-activation \ + --enable-libmount-force-mountinfo \ --with-python=2 make } package_util-linux() { - conflicts=('util-linux-ng' 'eject') - provides=("util-linux-ng=$pkgver" 'eject') + conflicts=('util-linux-ng' 'eject' 'zramctl') + provides=("util-linux-ng=$pkgver" 'eject' 'zramctl') + replaces=('zramctl') depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libutil-linux') - optdepends=('python: python bindings to libmount') - install=util-linux.install + optdepends=('python2: python bindings to libmount') groups=('base' 'base-devel') backup=(etc/pam.d/chfn etc/pam.d/chsh @@ -55,9 +55,9 @@ package_util-linux() { etc/pam.d/su etc/pam.d/su-l) - cd "$pkgname-$pkgver" + cd "$pkgbase-$pkgver" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install # setuid chfn and chsh chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}} @@ -66,28 +66,25 @@ package_util-linux() { install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn" install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh" install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login" - install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su" - install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su-l" + install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su" + install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su-l" - # include tmpfiles fragment for uuidd # TODO(dreisner): offer this upstream? - install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf" + sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "$pkgdir/usr/lib/systemd/system/uuidd.socket" - # usrmove + # adjust for usrmove + # TODO(dreisner): fix configure.ac upstream so that this isn't needed cd "$pkgdir" mv {,usr/}sbin/* usr/bin rmdir sbin usr/sbin - ### create libutil-linux split - rm -rf "$srcdir/_libutil-linux" - install -dm755 "$srcdir"/_libutil-linux/usr/lib - cd "$srcdir"/_libutil-linux - mv "$pkgdir"/usr/lib/lib*.{a,so}* usr/lib + ### runtime libs are shipped as part of libutil-linux + rm "$pkgdir"/usr/lib/lib*.{a,so}* } package_libutil-linux() { pkgdesc="util-linux runtime libraries" - provides=('libblkid.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so') + provides=('libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so') - mv "$srcdir/_libutil-linux"/* "$pkgdir" + make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES } diff --git a/abs/core/util-linux/__changelog b/abs/core/util-linux/__changelog index 31b27cd..4e7296e 100644 --- a/abs/core/util-linux/__changelog +++ b/abs/core/util-linux/__changelog @@ -1,3 +1,2 @@ changed python from 3->2 - mv $pkgdir/usr/bin/logger $pkgdir/usr/bin/logger-util-linux diff --git a/abs/core/util-linux/util-linux.install b/abs/core/util-linux/util-linux.install deleted file mode 100644 index 4c0bb10..0000000 --- a/abs/core/util-linux/util-linux.install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - # we don't want use systemd-tmpfiles here because - # the package dependency would create a circular dep. - if [ ! -d run/uuidd ]; then - # refer to uid/gid by number to avoid dependency on filesystem - install -o 68 -g 68 -dm755 run/uuidd - fi -} - -post_upgrade() { - if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then - if [ -f /var/lib/hwclock/adjtime ]; then - mv /var/lib/hwclock/adjtime /etc/adjtime - fi - if [ -d /var/lib/hwclock ]; then - rmdir /var/lib/hwclock - fi - fi - - post_install -} diff --git a/abs/core/util-linux/uuidd.tmpfiles b/abs/core/util-linux/uuidd.tmpfiles deleted file mode 100644 index b059cfe..0000000 --- a/abs/core/util-linux/uuidd.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/uuidd 0755 uuidd uuidd -- cgit v0.12 From 33812001550db57cb5a6b16885061acb04e7f2bd Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 16:44:39 +0000 Subject: xterm: update to 322 --- abs/core/xterm/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/xterm/PKGBUILD b/abs/core/xterm/PKGBUILD index 7b16dc1..b60ec65 100644 --- a/abs/core/xterm/PKGBUILD +++ b/abs/core/xterm/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Alexander Baldeck pkgname=xterm -pkgver=320 -pkgrel=2 +pkgver=322 +pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64') url="http://invisible-island.net/xterm/" @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter' 'libxkbfile') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz{,.asc} LICENSE) -md5sums=('0d7f0e6390d132ae59876b3870e5783d' +md5sums=('9ea4c83ac7275fdecf39fde9db781fac' 'SKIP' '10ecc3f8ee91e3189863a172f68282d2') validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB') # "Thomas Dickey " -- cgit v0.12 From 3307f71de770b7a9ba87e299a0c11c4e8e18eab2 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 16:50:35 +0000 Subject: bash: update to 4.3.042 --- abs/core/bash/PKGBUILD | 19 +++++++++++++++---- abs/core/bash/bash-4.3-old-memleak.patch | 24 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 abs/core/bash/bash-4.3-old-memleak.patch diff --git a/abs/core/bash/PKGBUILD b/abs/core/bash/PKGBUILD index ceb5e17..cb6847e 100644 --- a/abs/core/bash/PKGBUILD +++ b/abs/core/bash/PKGBUILD @@ -5,16 +5,16 @@ pkgname=bash _basever=4.3 -_patchlevel=039 +_patchlevel=042 pkgver=$_basever.$_patchlevel -pkgrel=1 +pkgrel=4 pkgdesc='The GNU Bourne Again shell' arch=('i686' 'x86_64') license=('GPL') url='http://www.gnu.org/software/bash/bash.html' groups=('base') backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout}) -depends=('readline>=6.3' 'glibc') +depends=('readline>=6.3' 'glibc' 'ncurses' 'libncursesw.so') optdepends=('bash-completion: for tab completion') provides=('sh') install=bash.install @@ -24,7 +24,8 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} dot.bash_logout system.bashrc system.bash_logout - privmode-setuid-fail.patch) + privmode-setuid-fail.patch + bash-4.3-old-memleak.patch) validpgpkeys=('7C0135FB088AAF6C66C650B9BB5869F064EA74AB') # Chet Ramey if [[ $((10#${_patchlevel})) -gt 0 ]]; then @@ -43,6 +44,9 @@ prepare() { # http://hmarco.org/bugs/bash_4.3-setuid-bug.html (FS#40663) patch -p0 -i ../privmode-setuid-fail.patch + + # https://bugs.archlinux.org/task/45891 + patch -p1 -i ../bash-4.3-old-memleak.patch } build() { @@ -86,6 +90,7 @@ md5sums=('81348932d5da294953e15d4814c74dd1' '561949793177116b7be29a07c385ba8b' '472f536d7c9e8250dc4568ec4cfaf294' 'a577d42e38249d298d6a8d4bf2823883' + '5bb46160bba51ff904922c6ccfd9c49e' '1ab682b4e36afa4cf1b426aa7ac81c0d' 'SKIP' '8fc22cf50ec85da00f6af3d66f7ddc1b' @@ -163,4 +168,10 @@ md5sums=('81348932d5da294953e15d4814c74dd1' '61e0522830b24fbe8c0d1b010f132470' 'SKIP' 'a4775487abe958536751c8ce53cdf6f9' + 'SKIP' + '80d3587c58854e226055ef099ffeb535' + 'SKIP' + '20bf63eef7cb441c0b1cc49ef3191d03' + 'SKIP' + '70790646ae61e207c995e44931390e50' 'SKIP') diff --git a/abs/core/bash/bash-4.3-old-memleak.patch b/abs/core/bash/bash-4.3-old-memleak.patch new file mode 100644 index 0000000..ff2b665 --- /dev/null +++ b/abs/core/bash/bash-4.3-old-memleak.patch @@ -0,0 +1,24 @@ +diff -up bash-4.3/subst.c.old bash-4.3/subst.c +--- bash-4.3/subst.c.old 2015-08-03 10:32:37.353490080 +0200 ++++ bash-4.3/subst.c 2015-08-03 10:33:34.818533408 +0200 +@@ -9492,7 +9492,7 @@ make_internal_declare (word, option) + char *word; + char *option; + { +- int t; ++ int t, r; + WORD_LIST *wl; + WORD_DESC *w; + +@@ -9504,7 +9504,10 @@ make_internal_declare (word, option) + wl = make_word_list (w, (WORD_LIST *)NULL); + wl = make_word_list (make_word (option), wl); + +- return (declare_builtin (wl)); ++ r = declare_builtin (wl); ++ ++ dispose_words (wl); ++ return r; + } + #endif + -- cgit v0.12 From 7ed5294dd60d9ac5780f33269734c2ce51832fc8 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Wed, 20 Jan 2016 12:52:12 -0600 Subject: qt5: compiled with libmysqlclient instead of mariadb --- abs/core/qt5/PKGBUILD | 4 ++-- abs/core/qt5/__changelog | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/abs/core/qt5/PKGBUILD b/abs/core/qt5/PKGBUILD index d16e001..5b87698 100644 --- a/abs/core/qt5/PKGBUILD +++ b/abs/core/qt5/PKGBUILD @@ -37,7 +37,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' 'mesa' 'at-spi2-core' 'alsa-lib' 'gst-plugins-base-libs' 'libjpeg-turbo' 'cups' 'hicolor-icon-theme' 'desktop-file-utils' 'postgresql-libs' 'nss' - 'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient' 'libmng' 'python2' 'ruby' + 'libmysqlclient' 'sqlite' 'unixodbc' 'libfbclient' 'libmng' 'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig' 'bluez-libs' 'openal' 'gtk2' 'libxkbcommon-x11' 'mtdev' 'harfbuzz' 'libwebp' 'leveldb' 'geoclue' 'pciutils' 'libinput' 'yasm' 'git') @@ -146,7 +146,7 @@ package_qt5-base() { 'qtchooser' 'libinput' 'libsm' 'libxkbcommon-x11') optdepends=('qt5-svg: to use SVG icon themes' 'postgresql-libs: PostgreSQL driver' - 'libmariadbclient: MariaDB driver' + 'libmysqlclient: MariaDB driver' 'unixodbc: ODBC driver' 'libfbclient: Firebird/iBase driver' 'mtdev: evdev plugin' diff --git a/abs/core/qt5/__changelog b/abs/core/qt5/__changelog index 5bdff6c..9c208ab 100644 --- a/abs/core/qt5/__changelog +++ b/abs/core/qt5/__changelog @@ -1,3 +1,4 @@ PKGBUILD: - remove dep libpulse - remove dep libfbclient +- changed libmaria to libmysql -- cgit v0.12 From 47d048aecaaaa3b9aa78b3ba4cb6a9dd177f0d98 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Wed, 20 Jan 2016 12:52:37 -0600 Subject: recompile to remove librtmp from the linked libs --- abs/core/gnupg/PKGBUILD | 2 +- abs/core/pacman/PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/gnupg/PKGBUILD b/abs/core/gnupg/PKGBUILD index 9ac8772..6d7dc98 100644 --- a/abs/core/gnupg/PKGBUILD +++ b/abs/core/gnupg/PKGBUILD @@ -6,7 +6,7 @@ pkgname=gnupg pkgver=2.0.22 -pkgrel=1 +pkgrel=2 pkgdesc='Complete and free implementation of the OpenPGP standard' url='http://www.gnupg.org/' license=('GPL') diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD index e592ff5..77838cf 100644 --- a/abs/core/pacman/PKGBUILD +++ b/abs/core/pacman/PKGBUILD @@ -5,7 +5,7 @@ pkgname=pacman pkgver=4.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" -- cgit v0.12 From bd05c5aff916dac7186c3089e19a607713871e41 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 18:59:07 +0000 Subject: e16_theme_settings: change font to Overlock --- abs/core/e16_theme_settings/PKGBUILD | 4 ++-- .../e16_config_dir/themes/Summer/fonts.cfg | 25 +++++++++++----------- .../e16_config_dir/themes/Summer/fonts.theme.cfg | 25 +++++++++++----------- .../themes/Summer/ttfonts/Overlock-Bold.ttf | 1 + .../themes/Summer/ttfonts/Overlock-Regular.ttf | 1 + 5 files changed, 28 insertions(+), 28 deletions(-) create mode 120000 abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Bold.ttf create mode 120000 abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Regular.ttf diff --git a/abs/core/e16_theme_settings/PKGBUILD b/abs/core/e16_theme_settings/PKGBUILD index 9ea1d6e..35823d8 100644 --- a/abs/core/e16_theme_settings/PKGBUILD +++ b/abs/core/e16_theme_settings/PKGBUILD @@ -1,6 +1,6 @@ pkgname=e16_theme_settings -pkgver=8.3 -pkgrel=3 +pkgver=8.4 +pkgrel=1 pkgdesc="Default settings for e16" depends=('enlightenment') source=() diff --git a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.cfg b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.cfg index 7d5bebc..d57f452 100644 --- a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.cfg +++ b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.cfg @@ -5,17 +5,16 @@ __E_CFG_VERSION 1 $Id: fonts.theme.cfg 47 2009-04-13 18:57:37Z don $ */ __FONTS __BGN - font-border "VeraBd/18" - font-coords "VeraBd/17" - font-dialog "Vera/18" - font-dialog-hilite "VeraBd/18" - font-epplet "Vera/16" - font-epplet-large "Vera/20" - font-epplet-medium "Vera/18" - font-epplet-small "Vera/16" - font-focus "VeraBd/18" - font-init "VeraBd/19" - font-menu "Vera/18" - font-tooltip "Vera/17" + font-border "Overlock-Bold/16" + font-coords "Overlock-Bold/17" + font-dialog "Overlock-Regular/18" + font-dialog-hilite "Overlock-Bold/18" + font-epplet "Overlock-Regular/16" + font-epplet-large "Overlock-Regular/20" + font-epplet-medium "Overlock-Regular/18" + font-epplet-small "Overlock-Regular/16" + font-focus "Overlock-Bold/18" + font-init "Overlock-Bold/19" + font-menu "Overlock-Regular/16" + font-tooltip "Overlock-Regular/17" __END - diff --git a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.theme.cfg b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.theme.cfg index 7d5bebc..d57f452 100644 --- a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.theme.cfg +++ b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/fonts.theme.cfg @@ -5,17 +5,16 @@ __E_CFG_VERSION 1 $Id: fonts.theme.cfg 47 2009-04-13 18:57:37Z don $ */ __FONTS __BGN - font-border "VeraBd/18" - font-coords "VeraBd/17" - font-dialog "Vera/18" - font-dialog-hilite "VeraBd/18" - font-epplet "Vera/16" - font-epplet-large "Vera/20" - font-epplet-medium "Vera/18" - font-epplet-small "Vera/16" - font-focus "VeraBd/18" - font-init "VeraBd/19" - font-menu "Vera/18" - font-tooltip "Vera/17" + font-border "Overlock-Bold/16" + font-coords "Overlock-Bold/17" + font-dialog "Overlock-Regular/18" + font-dialog-hilite "Overlock-Bold/18" + font-epplet "Overlock-Regular/16" + font-epplet-large "Overlock-Regular/20" + font-epplet-medium "Overlock-Regular/18" + font-epplet-small "Overlock-Regular/16" + font-focus "Overlock-Bold/18" + font-init "Overlock-Bold/19" + font-menu "Overlock-Regular/16" + font-tooltip "Overlock-Regular/17" __END - diff --git a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Bold.ttf b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Bold.ttf new file mode 120000 index 0000000..ede4578 --- /dev/null +++ b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Bold.ttf @@ -0,0 +1 @@ +../../../../../fonts/TTF/Overlock-Bold.ttf \ No newline at end of file diff --git a/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Regular.ttf b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Regular.ttf new file mode 120000 index 0000000..6e45825 --- /dev/null +++ b/abs/core/e16_theme_settings/e16_config_dir/themes/Summer/ttfonts/Overlock-Regular.ttf @@ -0,0 +1 @@ +../../../../../fonts/TTF/Overlock-Regular.ttf \ No newline at end of file -- cgit v0.12 From 72a09cabc2965e373b03fec2d3c00d02c8839837 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 19:35:48 +0000 Subject: e16_theme_settings: add dep to ttf-overlock --- abs/core/e16_theme_settings/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/e16_theme_settings/PKGBUILD b/abs/core/e16_theme_settings/PKGBUILD index 35823d8..aa5c1e2 100644 --- a/abs/core/e16_theme_settings/PKGBUILD +++ b/abs/core/e16_theme_settings/PKGBUILD @@ -1,8 +1,8 @@ pkgname=e16_theme_settings pkgver=8.4 -pkgrel=1 +pkgrel=2 pkgdesc="Default settings for e16" -depends=('enlightenment') +depends=('enlightenment' 'ttf-overlock') source=() arch=('i686' 'x86_64') groups=(alt_wm) -- cgit v0.12 From 2433a015e076039e06f0c167d051f9caa290e00b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 19:37:02 +0000 Subject: qt5: update __changelog as libfbclient was kept in the PKGBUILD --- abs/core/qt5/__changelog | 1 - 1 file changed, 1 deletion(-) diff --git a/abs/core/qt5/__changelog b/abs/core/qt5/__changelog index 9c208ab..4049625 100644 --- a/abs/core/qt5/__changelog +++ b/abs/core/qt5/__changelog @@ -1,4 +1,3 @@ PKGBUILD: - remove dep libpulse -- remove dep libfbclient - changed libmaria to libmysql -- cgit v0.12 From 2cf59595f15d6fff4f4c038679ebec4a6411f44e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 19:42:50 +0000 Subject: qtchooser: initial inclusion: dep of qt5-base --- abs/extra/qtchooser/4.conf | 2 ++ abs/extra/qtchooser/5.conf | 2 ++ abs/extra/qtchooser/PKGBUILD | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 abs/extra/qtchooser/4.conf create mode 100644 abs/extra/qtchooser/5.conf create mode 100644 abs/extra/qtchooser/PKGBUILD diff --git a/abs/extra/qtchooser/4.conf b/abs/extra/qtchooser/4.conf new file mode 100644 index 0000000..96e344e --- /dev/null +++ b/abs/extra/qtchooser/4.conf @@ -0,0 +1,2 @@ +/usr/lib/qt4/bin +/usr/lib diff --git a/abs/extra/qtchooser/5.conf b/abs/extra/qtchooser/5.conf new file mode 100644 index 0000000..bcd76de --- /dev/null +++ b/abs/extra/qtchooser/5.conf @@ -0,0 +1,2 @@ +/usr/lib/qt/bin +/usr/lib diff --git a/abs/extra/qtchooser/PKGBUILD b/abs/extra/qtchooser/PKGBUILD new file mode 100644 index 0000000..a5339f0 --- /dev/null +++ b/abs/extra/qtchooser/PKGBUILD @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Andrea Scarpino + +pkgname=qtchooser +pkgver=53 +pkgrel=2 +pkgdesc='Wrap the other Qt tools by searching for different instances of Qt on the system' +arch=('i686' 'x86_64') +url='http://code.qt.io/cgit/qt/qtchooser.git/' +license=('GPL') +backup=('etc/xdg/qtchooser/default.conf') +depends=('gcc-libs') +makedepends=('git') +source=("git://code.qt.io/qt/${pkgname}.git#commit=d20fdc63" + {4,5}.conf) +md5sums=('SKIP' + 'aa4d49b269e1b806f5eea170801f0aa6' + 'cf83f09a9a5a44d898b93f624d74dd11') + +pkgver() { + cd $pkgname + echo $(git rev-list --count HEAD) +} + +build() { + cd $pkgname + make +} + +package() { + cd $pkgname + make INSTALL_ROOT="$pkgdir" install + + install -d "$pkgdir"/etc/xdg/qtchooser + install -m644 "$srcdir"/{4,5}.conf \ + "$pkgdir"/etc/xdg/qtchooser/ + + # Set the default Qt + ln -s /etc/xdg/qtchooser/5.conf \ + "$pkgdir"/etc/xdg/qtchooser/default.conf +} -- cgit v0.12 From cdc5eec1eb3c77aefd38f984bb3eedcef2fde60e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 20:16:10 +0000 Subject: shared-mime-info: update to 1.5 --- abs/core/shared-mime-info/PKGBUILD | 17 +++++++++++---- abs/core/shared-mime-info/pbm.patch | 42 ------------------------------------- 2 files changed, 13 insertions(+), 46 deletions(-) delete mode 100644 abs/core/shared-mime-info/pbm.patch diff --git a/abs/core/shared-mime-info/PKGBUILD b/abs/core/shared-mime-info/PKGBUILD index 3b6bfa8..f2e5af0 100644 --- a/abs/core/shared-mime-info/PKGBUILD +++ b/abs/core/shared-mime-info/PKGBUILD @@ -1,26 +1,35 @@ -# $Id: PKGBUILD 148606 2012-02-04 11:19:59Z andyrtr $ +# $Id$ +# Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=shared-mime-info -pkgver=1.0 +pkgver=1.5 pkgrel=1 pkgdesc="Freedesktop.org Shared MIME Info" arch=('i686' 'x86_64') -license=('GPL') +license=('GPL2') depends=('libxml2' 'glib2') makedepends=('intltool' 'pkgconfig') install=shared-mime-info.install url="http://freedesktop.org/Software/shared-mime-info" source=(http://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.xz) -md5sums=('901b7977dbb2b71d12d30d4d8fb97028') +md5sums=('cc3e78d8bceaf2b361f62d67a8b4dda4') options=(!makeflags) build() { cd "${srcdir}/${pkgname}-${pkgver}" + # https://bugs.archlinux.org/task/38836 + # https://bugs.freedesktop.org/show_bug.cgi?id=70366 + export ac_cv_func_fdatasync=no ./configure --prefix=/usr --disable-update-mimedb make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -k check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/abs/core/shared-mime-info/pbm.patch b/abs/core/shared-mime-info/pbm.patch deleted file mode 100644 index 95f9ab8..0000000 --- a/abs/core/shared-mime-info/pbm.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur shared-mime-info-0.70-orig/freedesktop.org.xml shared-mime-info-0.70/freedesktop.org.xml ---- shared-mime-info-0.70-orig/freedesktop.org.xml 2010-02-06 02:39:24.000000000 -0500 -+++ shared-mime-info-0.70/freedesktop.org.xml 2010-02-06 02:48:01.000000000 -0500 -@@ -17025,12 +17025,10 @@ - - - -- - - - - -- - - - -@@ -17074,12 +17072,10 @@ - - - -- - - - - -- - - - -@@ -17123,12 +17119,10 @@ - - - -- - - - - -- - - - -- cgit v0.12 From 031977bb988022db7cbb78d8c25839db7365b7ee Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 20:19:06 +0000 Subject: jsoncpp: rebuild --- abs/extra/jsoncpp/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/extra/jsoncpp/PKGBUILD b/abs/extra/jsoncpp/PKGBUILD index 0fd2f2a..693cdbd 100644 --- a/abs/extra/jsoncpp/PKGBUILD +++ b/abs/extra/jsoncpp/PKGBUILD @@ -5,7 +5,7 @@ pkgname=jsoncpp pkgver=1.6.5 -pkgrel=1 +pkgrel=3 pkgdesc='A C++ library for interacting with JSON' url='https://github.com/open-source-parsers/jsoncpp' license=('MIT' 'custom:Public_Domain') -- cgit v0.12 From a294a7e3b35f6d0607956e32704c178c2b3eb2f5 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 20:27:03 +0000 Subject: cmake: update to 3.4.1 --- abs/core/cmake/PKGBUILD | 8 ++++---- abs/core/cmake/__changelog | 1 - abs/core/cmake/rebuild.list | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/abs/core/cmake/PKGBUILD b/abs/core/cmake/PKGBUILD index 7c29e73..e56b6e0 100644 --- a/abs/core/cmake/PKGBUILD +++ b/abs/core/cmake/PKGBUILD @@ -4,19 +4,19 @@ # Contributor: Pierre Schmitz pkgname=cmake -pkgver=3.3.0 -pkgrel=1 +pkgver=3.4.1 +pkgrel=3 pkgdesc='A cross-platform open-source make system' arch=('i686' 'x86_64') url="http://www.cmake.org/" license=('custom') depends=('curl' 'libarchive' 'shared-mime-info' 'jsoncpp') -makedepends=('python2-sphinx' 'emacs') +makedepends=('qt5-base' 'python2-sphinx' 'emacs') optdepends=('qt5-base: cmake-gui' 'libxkbcommon-x11: cmake-gui') install="${pkgname}.install" source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz") -md5sums=('b1d4823e3f74c961486d9f253da9825d') +md5sums=('73acda0d33be9b2729af99893d99a012') prepare() { cd ${pkgname}-${pkgver} diff --git a/abs/core/cmake/__changelog b/abs/core/cmake/__changelog index 40ac04b..1f97308 100644 --- a/abs/core/cmake/__changelog +++ b/abs/core/cmake/__changelog @@ -1,2 +1 @@ PKGBUILD: change dep python-sphinx to python2-sphinx -PKGBUILD: remvoe makedep qt5-base diff --git a/abs/core/cmake/rebuild.list b/abs/core/cmake/rebuild.list index de3bb0f..a433213 100644 --- a/abs/core/cmake/rebuild.list +++ b/abs/core/cmake/rebuild.list @@ -1,5 +1,4 @@ quazip -glm gluon sfml wt -- cgit v0.12 From 33b73bf31942223ef9c1545947f73c13e9daea56 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 20:40:41 +0000 Subject: confuse: rebuild --- abs/core/confuse/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/confuse/PKGBUILD b/abs/core/confuse/PKGBUILD index 2d7f3d7..dcb7056 100644 --- a/abs/core/confuse/PKGBUILD +++ b/abs/core/confuse/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64161 2012-02-09 16:35:50Z ttopper $ +# $Id$ # Contributor : Ionut Biru # Contributor: Roman Kyrylych # Contributor: Alexander Mieland (dma147) @@ -6,14 +6,14 @@ pkgname=confuse pkgver=2.7 -pkgrel=2 +pkgrel=3 pkgdesc="C-library for parsing configuration files" arch=('i686' 'x86_64') url="http://www.nongnu.org/confuse" license=('LGPL') depends=('glibc') source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz") -options=('!libtool' '!emptydirs') +options=('!emptydirs') md5sums=('45932fdeeccbb9ef4228f1c1a25e9c8f') build() { -- cgit v0.12 From dbeefbb11adafac4ac2b4c81736f95bd62f1992c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 20:51:45 +0000 Subject: vala: update to 0.30.0 --- abs/extra/vala/PKGBUILD | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/abs/extra/vala/PKGBUILD b/abs/extra/vala/PKGBUILD index ed48bef..a663fcd 100644 --- a/abs/extra/vala/PKGBUILD +++ b/abs/extra/vala/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Timm Preetz pkgname=vala -pkgver=0.26.1 +pkgver=0.30.0 pkgrel=1 pkgdesc="Compiler for the GObject type system" arch=('i686' 'x86_64') @@ -11,8 +11,9 @@ url="http://live.gnome.org/Vala" license=('LGPL') depends=('glib2') makedepends=('libxslt') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('8407abb19ab3a58bbfc0d288abb47666ef81f76d0540258c03965e7545f59e6b') +checkdepends=('dbus' 'libx11' 'gobject-introspection') +source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('61f0337b000f7ed6ef8c1fea87e0047d9bd7c0f91dd9c5b4eb70fd3fb883dedf') build() { cd $pkgname-$pkgver @@ -20,6 +21,11 @@ build() { make } +check() { + cd $pkgname-$pkgver +# make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install -- cgit v0.12 From 6c58d5072ebce74bf852b5b016049503a1ef6035 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 20:54:26 +0000 Subject: itstool: initial inclusion. dep of glade. --- abs/extra/itstool/PKGBUILD | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 abs/extra/itstool/PKGBUILD diff --git a/abs/extra/itstool/PKGBUILD b/abs/extra/itstool/PKGBUILD new file mode 100644 index 0000000..edfd764 --- /dev/null +++ b/abs/extra/itstool/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Michael Pusterhofer + +pkgname=itstool +pkgver=2.0.2 +pkgrel=1 +pkgdesc="XML to PO and back again" +arch=(any) +url="http://itstool.org/" +license=(GPL3) +depends=(python2 libxml2) +source=(http://files.itstool.org/itstool/$pkgname-$pkgver.tar.bz2) +sha256sums=('bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a') + +prepare() { + cd $pkgname-$pkgver + sed -i 's/| python/&2/' configure.ac + autoreconf -fi +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr PYTHON=/usr/bin/python2 + make +} + +check() { + cd $pkgname-$pkgver + make -k check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} -- cgit v0.12 From 2e67e37b0bac51b3cfc00e57c05b2e0f1a74dd81 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 21:03:23 +0000 Subject: libxml2: update to 2.9.3 --- abs/core/libxml2/PKGBUILD | 19 +++++++--------- abs/core/libxml2/fix-CVE-2014-3660.patch | 28 ------------------------ abs/core/libxml2/revert-catalog-initialize.patch | 26 ---------------------- 3 files changed, 8 insertions(+), 65 deletions(-) delete mode 100644 abs/core/libxml2/fix-CVE-2014-3660.patch delete mode 100644 abs/core/libxml2/revert-catalog-initialize.patch diff --git a/abs/core/libxml2/PKGBUILD b/abs/core/libxml2/PKGBUILD index 0949823..fe3e82c 100644 --- a/abs/core/libxml2/PKGBUILD +++ b/abs/core/libxml2/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: John Proctor pkgname=libxml2 -pkgver=2.9.2 -pkgrel=2 +pkgver=2.9.3 +pkgrel=1 pkgdesc="XML parsing library, version 2" arch=(i686 x86_64) license=('MIT') @@ -14,25 +14,22 @@ makedepends=('python2') optdepends=('python2: python bindings to libxml') url="http://www.xmlsoft.org/" source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz - http://www.w3.org/XML/Test/xmlts20080827.tar.gz - revert-catalog-initialize.patch - fix-CVE-2014-3660.patch) -md5sums=('9e6a9aca9d155737868b3dc5fd82f788' - 'ae3d1ebe000a3972afa104ca7f0e1b4a' - 'fdb2e26174ac9cced85ffbf4fb782187' - '71c88ee5a133461a8ab8aaa194899453') + http://www.w3.org/XML/Test/xmlts20080827.tar.gz) +md5sums=('daece17e045f1c107610e137ab50c179' + 'ae3d1ebe000a3972afa104ca7f0e1b4a') prepare() { cd ${pkgname}-${pkgver} sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py mv ../xmlconf . - patch -Np1 -i ../revert-catalog-initialize.patch - patch -Np1 -i ../fix-CVE-2014-3660.patch } build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python2 + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make } diff --git a/abs/core/libxml2/fix-CVE-2014-3660.patch b/abs/core/libxml2/fix-CVE-2014-3660.patch deleted file mode 100644 index 9e6441c..0000000 --- a/abs/core/libxml2/fix-CVE-2014-3660.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 72a46a519ce7326d9a00f0b6a7f2a8e958cd1675 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard -Date: Thu, 23 Oct 2014 11:35:36 +0800 -Subject: Fix missing entities after CVE-2014-3660 fix - -For https://bugzilla.gnome.org/show_bug.cgi?id=738805 - -The fix for CVE-2014-3660 introduced a regression in some case -where entity substitution is required and the entity is used -first in anotther entity referenced from an attribute value - -diff --git a/parser.c b/parser.c -index 67c9dfd..a8d1b67 100644 ---- a/parser.c -+++ b/parser.c -@@ -7235,7 +7235,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt) { - * far more secure as the parser will only process data coming from - * the document entity by default. - */ -- if ((ent->checked == 0) && -+ if (((ent->checked == 0) || -+ ((ent->children == NULL) && (ctxt->options & XML_PARSE_NOENT))) && - ((ent->etype != XML_EXTERNAL_GENERAL_PARSED_ENTITY) || - (ctxt->options & (XML_PARSE_NOENT | XML_PARSE_DTDVALID)))) { - unsigned long oldnbent = ctxt->nbentities; --- -cgit v0.10.1 - diff --git a/abs/core/libxml2/revert-catalog-initialize.patch b/abs/core/libxml2/revert-catalog-initialize.patch deleted file mode 100644 index d98b382..0000000 --- a/abs/core/libxml2/revert-catalog-initialize.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f65128f38289d77ff322d63aef2858cc0a819c34 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard -Date: Fri, 17 Oct 2014 17:13:41 +0800 -Subject: Revert "Missing initialization for the catalog module" - -This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7. -As this break xmlcatalog command -https://bugzilla.redhat.com/show_bug.cgi?id=1153753 - -diff --git a/parser.c b/parser.c -index 1d93967..67c9dfd 100644 ---- a/parser.c -+++ b/parser.c -@@ -14830,9 +14830,6 @@ xmlInitParser(void) { - #ifdef LIBXML_XPATH_ENABLED - xmlXPathInit(); - #endif --#ifdef LIBXML_CATALOG_ENABLED -- xmlInitializeCatalog(); --#endif - xmlParserInitialized = 1; - #ifdef LIBXML_THREAD_ENABLED - } --- -cgit v0.10.1 - -- cgit v0.12 From 4331f188ac10e36222d6de440e0b46787c561a8c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 21:09:36 +0000 Subject: atk: update to 2.18.0 --- abs/core/atk/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/abs/core/atk/PKGBUILD b/abs/core/atk/PKGBUILD index 3714a1f..ab5503e 100644 --- a/abs/core/atk/PKGBUILD +++ b/abs/core/atk/PKGBUILD @@ -2,16 +2,16 @@ # Maintainer: Jan de Groot pkgname=atk -pkgver=2.14.0 +pkgver=2.18.0 pkgrel=1 pkgdesc="A library providing a set of interfaces for accessibility" arch=(i686 x86_64) license=('LGPL') depends=('glib2') -makedepends=('gobject-introspection' 'python2') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -url='http://www.gtk.org/' -sha256sums=('2875cc0b32bfb173c066c22a337f79793e0c99d2cc5e81c4dac0d5a523b8fbad') +makedepends=('gobject-introspection') +source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +url='https://developer.gnome.org/atk/' +sha256sums=('ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a7022e917e46d0c92b') build() { cd "$pkgname-$pkgver" -- cgit v0.12 From 680f7c2ee7d070528042dd3487f606da1b777241 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 21:12:33 +0000 Subject: pango: update to 1.38.1 --- abs/core/pango/PKGBUILD | 17 +++++++++++++---- abs/core/pango/pango.install | 12 +++--------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/abs/core/pango/PKGBUILD b/abs/core/pango/PKGBUILD index 3adc9a6..ab1f03c 100644 --- a/abs/core/pango/PKGBUILD +++ b/abs/core/pango/PKGBUILD @@ -2,17 +2,22 @@ # Maintainer: Jan de Groot pkgname=pango -pkgver=1.36.8 +pkgver=1.38.1 pkgrel=1 pkgdesc="A library for layout and rendering of text" arch=('i686' 'x86_64') license=('LGPL') depends=('libthai' 'cairo' 'libxft' 'harfbuzz') -makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introspection' 'help2man' 'python2') +makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introspection' 'help2man') +checkdepends=('ttf-dejavu') install=pango.install source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) url="http://www.pango.org/" -sha256sums=('18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07') +sha256sums=('1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7') + +prepare() { + cd ${pkgname}-${pkgver} +} build() { cd ${pkgname}-${pkgver} @@ -24,8 +29,12 @@ build() { make } +check() { + cd ${pkgname}-${pkgver} + make -k check || : +} + package() { cd ${pkgname}-${pkgver} make -j1 DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/pango" } diff --git a/abs/core/pango/pango.install b/abs/core/pango/pango.install index 4aa7c4d..68f7fcd 100644 --- a/abs/core/pango/pango.install +++ b/abs/core/pango/pango.install @@ -1,14 +1,8 @@ -post_install() { - usr/bin/pango-querymodules >etc/pango/pango.modules -} - post_upgrade() { if [ -f usr/etc/pango/pango.modules ]; then rm usr/etc/pango/pango.modules fi - post_install -} - -pre_remove() { - rm etc/pango/pango.modules + if [ -f etc/pango/pango.modules ]; then + rm etc/pango/pango.modules + fi } -- cgit v0.12 From 48d52bfd8aa711b7e184124f238b2a3cea512318 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 21:33:23 +0000 Subject: gtk3: update to 3.18.6 --- ...o-cursor-name-fallback-for-standard-names.patch | 85 +++++++++++++++++++ ...y-do-cursor-name-fallback-for-standard-na.patch | 94 ++++++++++++++++++++++ abs/extra/gtk3/PKGBUILD | 53 +++++++++--- abs/extra/gtk3/gtk-update-icon-cache.install | 3 + abs/extra/gtk3/settings.ini | 2 +- abs/extra/gtk3/wacom.patch | 12 --- 6 files changed, 224 insertions(+), 25 deletions(-) create mode 100644 abs/extra/gtk3/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch create mode 100644 abs/extra/gtk3/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch create mode 100644 abs/extra/gtk3/gtk-update-icon-cache.install delete mode 100644 abs/extra/gtk3/wacom.patch diff --git a/abs/extra/gtk3/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch b/abs/extra/gtk3/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch new file mode 100644 index 0000000..d187d40 --- /dev/null +++ b/abs/extra/gtk3/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch @@ -0,0 +1,85 @@ +From affd6e70734d7897324409d6fc0beb7b4eb7235a Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Wed, 6 Jan 2016 14:54:33 -0500 +Subject: [PATCH 1/2] x11: Only do cursor name fallback for standard names + +Always returning a left_ptr if we can't find anything better +broke firefox application-specific fallback for missing cursors. +Keep that working by only doing the fallback for the CSS cursor +names, not for things like hashes. + +https://bugzilla.gnome.org/show_bug.cgi?id=760141 +--- + gdk/x11/gdkcursor-x11.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c +index 540f48e..d619f58 100644 +--- a/gdk/x11/gdkcursor-x11.c ++++ b/gdk/x11/gdkcursor-x11.c +@@ -611,17 +611,23 @@ static const struct { + const gchar *css_name, *traditional_name; + } name_map[] = { + { "default", "left_ptr" }, ++ { "help", "left_ptr" }, ++ { "context-menu", "left_ptr" }, + { "pointer", "hand" }, + { "progress", "left_ptr_watch" }, + { "wait", "watch" }, + { "cell", "crosshair" }, + { "crosshair", "cross" }, + { "text", "xterm" }, ++ { "vertical-text","xterm" }, + { "alias", "dnd-link" }, + { "copy", "dnd-copy" }, ++ { "move", "dnd-move" }, + { "no-drop", "dnd-none" }, + { "not-allowed", "crossed_circle" }, + { "grab", "hand2" }, ++ { "grabbing", "hand2" }, ++ { "all-scroll", "left_ptr" }, + { "col-resize", "h_double_arrow" }, + { "row-resize", "v_double_arrow" }, + { "n-resize", "top_side" }, +@@ -636,6 +642,8 @@ static const struct { + { "ns-resize", "v_double_arrow" }, + { "nesw-resize", "fd_double_arrow" }, + { "nwse-resize", "bd_double_arrow" }, ++ { "zoom-in", "left_ptr" }, ++ { "zoom-out", "left_ptr" }, + { NULL, NULL } + }; + +@@ -650,7 +658,7 @@ name_fallback (const gchar *name) + return name_map[i].traditional_name; + } + +- return "left_ptr"; ++ return NULL; + } + + GdkCursor* +@@ -683,9 +691,17 @@ _gdk_x11_display_get_cursor_for_name (GdkDisplay *display, + xdisplay = GDK_DISPLAY_XDISPLAY (display); + xcursor = XcursorLibraryLoadCursor (xdisplay, name); + if (xcursor == None) +- xcursor = XcursorLibraryLoadCursor (xdisplay, name_fallback (name)); +- if (xcursor == None) +- xcursor = XcursorLibraryLoadCursor (xdisplay, "left_ptr"); ++ { ++ const char *fallback; ++ ++ fallback = name_fallback (name); ++ if (fallback) ++ { ++ xcursor = XcursorLibraryLoadCursor (xdisplay, fallback); ++ if (xcursor == None) ++ xcursor = XcursorLibraryLoadCursor (xdisplay, "left_ptr"); ++ } ++ } + if (xcursor == None) + return NULL; + } +-- +2.7.0 + diff --git a/abs/extra/gtk3/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch b/abs/extra/gtk3/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch new file mode 100644 index 0000000..94b69fb --- /dev/null +++ b/abs/extra/gtk3/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch @@ -0,0 +1,94 @@ +From 81a287478a4db9ce650cc764474b9c173b137dee Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Wed, 6 Jan 2016 14:56:06 -0500 +Subject: [PATCH 2/2] wayland: Only do cursor name fallback for standard names + +Always returning a left_ptr if we can't find anything better +broke firefox application-specific fallback for missing cursors. +Keep that working by only doing the fallback for the CSS cursor +names, not for things like hashes. + +https://bugzilla.gnome.org/show_bug.cgi?id=760141 +--- + gdk/wayland/gdkcursor-wayland.c | 29 +++++++++++++++++++++-------- + 1 file changed, 21 insertions(+), 8 deletions(-) + +diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c +index 8aee5ae..bdfa316 100644 +--- a/gdk/wayland/gdkcursor-wayland.c ++++ b/gdk/wayland/gdkcursor-wayland.c +@@ -87,17 +87,23 @@ static const struct { + const gchar *css_name, *traditional_name; + } name_map[] = { + { "default", "left_ptr" }, ++ { "help", "left_ptr" }, ++ { "context-menu", "left_ptr" }, + { "pointer", "hand" }, + { "progress", "left_ptr_watch" }, + { "wait", "watch" }, + { "cell", "crosshair" }, + { "crosshair", "cross" }, + { "text", "xterm" }, ++ { "vertical-text","xterm" }, + { "alias", "dnd-link" }, + { "copy", "dnd-copy" }, ++ { "move", "dnd-move" }, + { "no-drop", "dnd-none" }, + { "not-allowed", "crossed_circle" }, + { "grab", "hand2" }, ++ { "grabbing", "hand2" }, ++ { "all-scroll", "left_ptr" }, + { "col-resize", "h_double_arrow" }, + { "row-resize", "v_double_arrow" }, + { "n-resize", "top_side" }, +@@ -112,6 +118,8 @@ static const struct { + { "ns-resize", "v_double_arrow" }, + { "nesw-resize", "fd_double_arrow" }, + { "nwse-resize", "bd_double_arrow" }, ++ { "zoom-in", "left_ptr" }, ++ { "zoom-out", "left_ptr" }, + { NULL, NULL } + }; + +@@ -126,7 +134,7 @@ name_fallback (const gchar *name) + return name_map[i].traditional_name; + } + +- return "left_ptr"; ++ return NULL; + } + + static gboolean +@@ -144,17 +152,22 @@ _gdk_wayland_cursor_update (GdkWaylandDisplay *wayland_display, + cursor->scale); + c = wl_cursor_theme_get_cursor (theme, cursor->name); + if (!c) +- c = wl_cursor_theme_get_cursor (theme, name_fallback (cursor->name)); ++ { ++ const char *fallback; ++ ++ fallback = name_fallback (cursor->name); ++ if (fallback) ++ { ++ c = wl_cursor_theme_get_cursor (theme, name_fallback (cursor->name)); ++ if (!c) ++ c = wl_cursor_theme_get_cursor (theme, "left_ptr"); ++ } ++ } + + if (!c) + { + g_warning (G_STRLOC ": Unable to load %s from the cursor theme", cursor->name); +- +- /* return the left_ptr cursor as a fallback */ +- c = wl_cursor_theme_get_cursor (theme, "left_ptr"); +- +- if (!c) +- return FALSE; ++ return FALSE; + } + + cursor->wl_cursor = c; +-- +2.7.0 + diff --git a/abs/extra/gtk3/PKGBUILD b/abs/extra/gtk3/PKGBUILD index 5557008..15dc342 100644 --- a/abs/extra/gtk3/PKGBUILD +++ b/abs/extra/gtk3/PKGBUILD @@ -2,23 +2,34 @@ # Maintainer: Ionut Biru # Maintainer: Jan Alexander Steffens (heftig) -pkgname=gtk3 -pkgver=3.14.5 -pkgrel=1 -pkgdesc="GObject-based multi-platform GUI toolkit (v3)" +pkgbase=gtk3 +pkgname=(gtk3 gtk-update-icon-cache) +pkgver=3.18.6 +pkgrel=2 +pkgdesc="GObject-based multi-platform GUI toolkit" arch=(i686 x86_64) url="http://www.gtk.org/" -install=gtk3.install -depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi +depends=(atk cairo libcups libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon - adwaita-icon-theme json-glib rest) -makedepends=(gobject-introspection python2) + adwaita-icon-theme json-glib rest librsvg) +makedepends=(gobject-introspection libcanberra) license=(LGPL) -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz) -sha256sums=('ba70f5ccde6646c6d8aa5a6398794b7bcf23fc45af22580a215d258f392dbbe2') +source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz + 0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch + 0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch + settings.ini) +sha256sums=('78cabf0fd5a662f8723f62d5ac633072c76c557c1d700454c9c3deaa37e441ef' + '0402c3b7801810beb0f24ad20e4fb2eb7519cf3984f39e093a6e2752a0f7d9de' + '94722b06284e76f628fc8933617ac19c14f6775a5250fe3c382defab63d7b10e' + '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202') prepare() { cd gtk+-$pkgver + + # Fix zoom in/out cursors in GTK3 builds of Firefox + # https://bugzilla.gnome.org/show_bug.cgi?id=760141 + patch -Np1 -i ../0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch + patch -Np1 -i ../0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch } build() { @@ -27,7 +38,6 @@ build() { CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-gtk2-dependency \ --disable-schemas-compile \ --enable-x11-backend \ --enable-broadway-backend \ @@ -39,7 +49,26 @@ build() { make } -package() { +package_gtk3() { + depends+=(gtk-update-icon-cache) + optdepends=('libcanberra: gtk3-widget-factory demo') + install=gtk3.install + cd "gtk+-$pkgver" make DESTDIR="$pkgdir" install + install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini" + + # split this out to use with gtk2 too + rm "$pkgdir/usr/bin/gtk-update-icon-cache" } + +package_gtk-update-icon-cache() { + pkgdesc="GTK+ icon cache updater" + depends=(gdk-pixbuf2 hicolor-icon-theme) + install=gtk-update-icon-cache.install + + cd gtk+-$pkgver/gtk + install -Dm755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache" +} + +# vim:set et sw=4: diff --git a/abs/extra/gtk3/gtk-update-icon-cache.install b/abs/extra/gtk3/gtk-update-icon-cache.install new file mode 100644 index 0000000..1afcc72 --- /dev/null +++ b/abs/extra/gtk3/gtk-update-icon-cache.install @@ -0,0 +1,3 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} diff --git a/abs/extra/gtk3/settings.ini b/abs/extra/gtk3/settings.ini index 6a0643b..921d1dd 100644 --- a/abs/extra/gtk3/settings.ini +++ b/abs/extra/gtk3/settings.ini @@ -1,4 +1,4 @@ [Settings] -gtk-icon-theme-name = gnome +gtk-icon-theme-name = Adwaita gtk-theme-name = Adwaita gtk-font-name = Cantarell 11 diff --git a/abs/extra/gtk3/wacom.patch b/abs/extra/gtk3/wacom.patch deleted file mode 100644 index 79ad84f..0000000 --- a/abs/extra/gtk3/wacom.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c ---- gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c 2012-05-02 14:45:04.000000000 +0200 -+++ gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c 2012-05-03 18:34:18.034807644 +0200 -@@ -331,6 +331,8 @@ - input_source = GDK_SOURCE_ERASER; - else if (strstr (tmp_name, "cursor")) - input_source = GDK_SOURCE_CURSOR; -+ else if (strstr (tmp_name, "finger")) -+ input_source = GDK_SOURCE_TOUCHSCREEN; - else if (strstr (tmp_name, "wacom") || - strstr (tmp_name, "pen")) - input_source = GDK_SOURCE_PEN; -- cgit v0.12 From a52a3c1ea63adcb1821c7c544f21518578157397 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 21:40:32 +0000 Subject: gobject-introspection: update to 1.46.0 --- abs/core/gobject-introspection/PKGBUILD | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/abs/core/gobject-introspection/PKGBUILD b/abs/core/gobject-introspection/PKGBUILD index 9757c17..9f5edfa 100644 --- a/abs/core/gobject-introspection/PKGBUILD +++ b/abs/core/gobject-introspection/PKGBUILD @@ -1,32 +1,41 @@ # $Id$ # Maintainer: Jan de Groot -pkgname=gobject-introspection -pkgver=1.42.0 +pkgbase=gobject-introspection +pkgname=('gobject-introspection' 'gobject-introspection-runtime') +pkgver=1.46.0 pkgrel=1 -pkgdesc="Introspection system for GObject-based libraries" url="https://live.gnome.org/GObjectIntrospection" arch=('x86_64' 'i686') license=('LGPL' 'GPL') -depends=('glib2') makedepends=('cairo' 'python2' 'python2-mako') -optdepends=('python2: gir development tools' - 'python2-mako: g-ir-doc-tool') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('3ba2edfad4f71d4f0de16960b5d5f2511335fa646b2c49bbb93ce5942b3f95f7') +source=(https://download.gnome.org/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz) +sha256sums=('6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233') prepare() { - cd $pkgname-$pkgver + cd $pkgbase-$pkgver sed -i '1s|#!/usr/bin/env python$|&2|' giscanner/*.py } build() { - cd $pkgname-$pkgver + cd $pkgbase-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static --enable-doctool make } -package() { - cd $pkgname-$pkgver +package_gobject-introspection-runtime() { + pkgdesc="Introspection system for GObject-based libraries - runtime files" + depends=('glib2') + cd $pkgbase-$pkgver + make DESTDIR="$pkgdir" install-libLTLIBRARIES install-typelibsDATA +} + +package_gobject-introspection() { + pkgdesc="Introspection system for GObject-based libraries" + depends=("gobject-introspection-runtime=$pkgver" 'python2-mako' 'python2') + options=('!emptydirs') + + cd $pkgbase-$pkgver make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" uninstall-libLTLIBRARIES uninstall-typelibsDATA } -- cgit v0.12 From 08d71ca9e0630698631ad5ccef68356f9a7f94cf Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 21:57:22 +0000 Subject: valgrind: update to 3.11.0 --- abs/extra/valgrind/PKGBUILD | 20 ++++-------- abs/extra/valgrind/valgrind-3.9.0-glibc-2.20.patch | 37 ---------------------- 2 files changed, 7 insertions(+), 50 deletions(-) delete mode 100644 abs/extra/valgrind/valgrind-3.9.0-glibc-2.20.patch diff --git a/abs/extra/valgrind/PKGBUILD b/abs/extra/valgrind/PKGBUILD index 61c9997..d23ba4e 100644 --- a/abs/extra/valgrind/PKGBUILD +++ b/abs/extra/valgrind/PKGBUILD @@ -3,25 +3,19 @@ # Maintainer: Allan McRae pkgname=valgrind -pkgver=3.10.0 +pkgver=3.11.0 pkgrel=1 pkgdesc='A tool to help find memory-management problems in programs' arch=(i686 x86_64) license=(GPL) url='http://valgrind.org/' -depends=('glibc>=2.20' 'glibc<2.21' 'perl') -makedepends=('gdb' 'openmpi') +depends=('glibc>=2.22' 'glibc<2.23' 'perl') +makedepends=(gdb openmpi) optdepends=('openmpi: MPI support') -options=('staticlibs' '!emptydirs') -source=(http://valgrind.org/downloads/$pkgname-$pkgver.tar.bz2 - valgrind-3.9.0-glibc-2.20.patch) -sha1sums=('aec0b8cd042ec36c8cce4f6027b98627ab202f26' - '2080c3d44de20857f18b03a93404a8f3d3721f7e') - -prepare() { - cd $pkgname-$pkgver - patch -p1 -i "$srcdir"/valgrind-3.9.0-glibc-2.20.patch -} +# valgrind does not like stack protector flags +options=(!emptydirs !buildflags) +source=(http://valgrind.org/downloads/$pkgname-$pkgver.tar.bz2) +sha1sums=('340757e91d9e83591158fe8bb985c6b11bc53de5') build() { cd $pkgname-$pkgver diff --git a/abs/extra/valgrind/valgrind-3.9.0-glibc-2.20.patch b/abs/extra/valgrind/valgrind-3.9.0-glibc-2.20.patch deleted file mode 100644 index d9c622e..0000000 --- a/abs/extra/valgrind/valgrind-3.9.0-glibc-2.20.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure ---- valgrind-3.9.0-orig/configure 2013-11-01 09:33:32.000000000 +1000 -+++ valgrind-3.9.0/configure 2014-02-08 09:28:06.063248544 +1000 -@@ -6689,6 +6689,16 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.20) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.20 family" >&5 -+$as_echo "2.20 family" >&6; } -+ -+$as_echo "#define GLIBC_2_20 1" >>confdefs.h -+ -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - darwin) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 - $as_echo "Darwin" >&6; } -diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac ---- valgrind-3.9.0-orig/configure.ac 2013-11-01 09:28:16.000000000 +1000 -+++ valgrind-3.9.0/configure.ac 2014-02-08 09:27:38.870385366 +1000 -@@ -918,6 +918,13 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.20) -+ AC_MSG_RESULT(2.20 family) -+ AC_DEFINE([GLIBC_2_20], 1, [Define to 1 if you're using glibc 2.20.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - darwin) - AC_MSG_RESULT(Darwin) - AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) -- cgit v0.12 From 1ca1b59319a4bf436eecb2e6240050cdb53bebb8 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 21:59:48 +0000 Subject: cambozola: update to 0.936 --- abs/extra/cambozola/PKGBUILD | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/abs/extra/cambozola/PKGBUILD b/abs/extra/cambozola/PKGBUILD index 27664f1..59067b9 100644 --- a/abs/extra/cambozola/PKGBUILD +++ b/abs/extra/cambozola/PKGBUILD @@ -1,15 +1,15 @@ -# Maintainer: Ernie Brodeur +# Maintainer: Vojtěch Aschenbrenner + pkgname=cambozola -pkgver=0.92 +pkgver=0.936 pkgrel=1 pkgdesc="A java servlet for streaming JPEG's from ip Cameras." -url="http://www.charliemouse.com:8080/code/cambozola/" -arch=('x86_64' 'i686') +url="http://www.charliemouse.com/code/cambozola/" +arch=('any') license=('GPL') depends=('java-runtime') makedepends=('apache-ant') -source=("${url}${pkgname}-${pkgver}.tar.gz") -md5sums=('602daba851e726e2399445fda3ca718f') +source=("http://www.andywilcock.com/code/cambozola/cambozola-latest.tar.gz") build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -24,3 +24,4 @@ package() { # vim:set ts=2 sw=2 et: +md5sums=('c4896a99702af61eead945ed58b5667b') -- cgit v0.12 From af9e0055206d4f8b85fe57be4e77c0b5b7205591 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 22:08:35 +0000 Subject: cairo: update to 1.14.6 --- abs/core/cairo/PKGBUILD | 19 +++++-------------- abs/core/cairo/git_fixes.diff | 34 ---------------------------------- 2 files changed, 5 insertions(+), 48 deletions(-) delete mode 100644 abs/core/cairo/git_fixes.diff diff --git a/abs/core/cairo/PKGBUILD b/abs/core/cairo/PKGBUILD index 94177ea..d0f8353 100644 --- a/abs/core/cairo/PKGBUILD +++ b/abs/core/cairo/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Brice Carpentier pkgname=cairo -pkgver=1.14.0 -pkgrel=2 +pkgver=1.14.6 +pkgrel=1 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64) license=('LGPL' 'MPL') @@ -16,17 +16,8 @@ makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' #optdepends=('xcb-util: for XCB backend') # really needed? provides=('cairo-xcb') replaces=('cairo-xcb') -source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz - git_fixes.diff) -sha1sums=('53cf589b983412ea7f78feee2e1ba9cea6e3ebae' - '0ebac538dfa510e8e3f07ba71a49dabc627b08ff') - -prepare() { - cd $pkgname-$pkgver - # fix some segfaults: https://bugs.freedesktop.org/show_bug.cgi?id=85151 - # https://bugs.archlinux.org/task/42596 - patch -Np1 -i ${srcdir}/git_fixes.diff -} +source=(http://cairographics.org/releases/cairo-$pkgver.tar.xz) +sha1sums=('0a59324e6cbe031b5b898ff8b9e2ffceb9d114f5') build() { cd $pkgname-$pkgver @@ -42,7 +33,7 @@ build() { --enable-ps \ --enable-pdf \ --enable-gobject \ - --enable-gtk-doc + --enable-gtk-doc #--disable-xlib-xcb \ #--enable-test-surfaces \ takes ages diff --git a/abs/core/cairo/git_fixes.diff b/abs/core/cairo/git_fixes.diff deleted file mode 100644 index 8f751ce..0000000 --- a/abs/core/cairo/git_fixes.diff +++ /dev/null @@ -1,34 +0,0 @@ -From 2de69581c28bf115852037ca41eba13cb7335976 Mon Sep 17 00:00:00 2001 -From: Massimo Valentini -Date: Sun, 19 Oct 2014 09:19:10 +0200 -Subject: tor-scan-converter: can't do_fullrow when intersection in row + - 0.5subrow - -the active edges list must be left sorted at the next possible use -and since full_row does not deal with intersections it is not usable -when there is an intersection in the top half of the next row first -subrow - -Reported-and-tested-by: Matthew Leach -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85151 -Reviewed-by: Chris Wilson - -diff --git a/src/cairo-tor-scan-converter.c b/src/cairo-tor-scan-converter.c -index 4adcafb..14922d0 100644 ---- a/src/cairo-tor-scan-converter.c -+++ b/src/cairo-tor-scan-converter.c -@@ -1167,8 +1167,8 @@ can_do_full_row (struct active_list *active) - - if (e->dy) { - struct quorem x = e->x; -- x.quo += e->dxdy_full.quo - e->dxdy.quo/2; -- x.rem += e->dxdy_full.rem - e->dxdy.rem/2; -+ x.quo += e->dxdy_full.quo; -+ x.rem += e->dxdy_full.rem; - if (x.rem < 0) { - x.quo--; - x.rem += e->dy; --- -cgit v0.10.2 - - -- cgit v0.12 From 722646a674ec92513482e8836c057abf2fd66979 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 22:17:49 +0000 Subject: python2-cairo: rebuild --- abs/core/python_modules/python2-cairo/PKGBUILD | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/abs/core/python_modules/python2-cairo/PKGBUILD b/abs/core/python_modules/python2-cairo/PKGBUILD index 0f2fb14..52bf713 100644 --- a/abs/core/python_modules/python2-cairo/PKGBUILD +++ b/abs/core/python_modules/python2-cairo/PKGBUILD @@ -1,14 +1,13 @@ -# $Id: PKGBUILD 122022 2011-05-01 17:05:32Z angvp $ +# $Id$ # Maintainer: Jan de Groot pkgname=python2-cairo pkgver=1.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Python2 bindings for the cairo graphics library" arch=('i686' 'x86_64') license=('LGPL' 'MPL') depends=('python2' 'cairo') -options=('!libtool') provides=("pycairo=${pkgver}") conflicts=('pycairo') replaces=('pycairo') -- cgit v0.12 From a095b747ebfb248661e9a45c849dd5628e2b2343 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 22:21:36 +0000 Subject: yelp-xsl: initial inclusion. dep of yelp-tools --- abs/extra/yelp-xsl/PKGBUILD | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 abs/extra/yelp-xsl/PKGBUILD diff --git a/abs/extra/yelp-xsl/PKGBUILD b/abs/extra/yelp-xsl/PKGBUILD new file mode 100644 index 0000000..afc8b77 --- /dev/null +++ b/abs/extra/yelp-xsl/PKGBUILD @@ -0,0 +1,26 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=yelp-xsl +pkgver=3.18.1 +pkgrel=1 +pkgdesc="Stylesheets for Yelp" +arch=(any) +makedepends=(intltool libxslt libxml2 itstool) +license=(GPL) +options=('!emptydirs') +url="http://www.gnome.org" +source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('00870fbe59a1bc7797b385fce16386917e2987c404e9b5a7adcf0036f1c1ba62') + +build() { + cd $pkgname-$pkgver + rm xslt/common/domains/yelp-xsl.xml + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} -- cgit v0.12 From 381f156846b27cd7c258e92733edcacdb0cd1a50 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 22:24:29 +0000 Subject: yelp-tools: initial inclusion. dep of gnome-common --- abs/extra/yelp-tools/PKGBUILD | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 abs/extra/yelp-tools/PKGBUILD diff --git a/abs/extra/yelp-tools/PKGBUILD b/abs/extra/yelp-tools/PKGBUILD new file mode 100644 index 0000000..a5fba2f --- /dev/null +++ b/abs/extra/yelp-tools/PKGBUILD @@ -0,0 +1,26 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=yelp-tools +pkgver=3.18.0 +pkgrel=1 +pkgdesc="Tools for creating Yelp documentation" +arch=('any') +depends=('yelp-xsl' 'libxslt' 'libxml2' 'itstool') +license=('GPL') +options=('!emptydirs') +url="http://www.gnome.org" +source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} -- cgit v0.12 From 342de3aa7b6154d021d4881e02d3ca522b3b6a47 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 22:29:15 +0000 Subject: autoconf-archive: initial inclusion. dep of gnome-common --- abs/extra/autoconf-archive/PKGBUILD | 35 ++++++++++++++++++++++ .../autoconf-archive/autoconf-archive.install | 20 +++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 abs/extra/autoconf-archive/PKGBUILD create mode 100644 abs/extra/autoconf-archive/autoconf-archive.install diff --git a/abs/extra/autoconf-archive/PKGBUILD b/abs/extra/autoconf-archive/PKGBUILD new file mode 100644 index 0000000..94e7ff7 --- /dev/null +++ b/abs/extra/autoconf-archive/PKGBUILD @@ -0,0 +1,35 @@ +# $Id$ +# Contributor: Daniel Müllner + +pkgname=autoconf-archive +pkgver=2015.09.25 +pkgrel=1 +epoch=1 +pkgdesc="A collection of freely re-usable Autoconf macros" +arch=('any') +url="http://www.gnu.org/software/autoconf-archive/" +_watch="http://mirrors.axint.net/repos/gnu.org/autoconf-archive/" +license=('GPL') +depends=('autoconf') +optdepends=('automake: macros for use with it') +validpgpkeys=('1A4F63A13A4649B632F65EE141BC28FE99089D72') +install=autoconf-archive.install +source=(http://ftpmirror.gnu.org/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) +md5sums=('23c2a68fe323d30eaf0fbfa790b4dc92' + 'SKIP') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/abs/extra/autoconf-archive/autoconf-archive.install b/abs/extra/autoconf-archive/autoconf-archive.install new file mode 100644 index 0000000..e17905a --- /dev/null +++ b/abs/extra/autoconf-archive/autoconf-archive.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(autoconf-archive.info{,-{1,2,3,4}}) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} -- cgit v0.12 From 39e1bf9e627d26579403794823759709389b574e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 22:32:19 +0000 Subject: gnome-common: update to 3.18.0 --- abs/extra/gnome-common/PKGBUILD | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/abs/extra/gnome-common/PKGBUILD b/abs/extra/gnome-common/PKGBUILD index 445cd50..7d68863 100644 --- a/abs/extra/gnome-common/PKGBUILD +++ b/abs/extra/gnome-common/PKGBUILD @@ -1,22 +1,20 @@ -# $Id: PKGBUILD 157808 2012-04-29 21:33:25Z ibiru $ +# $Id$ # Maintainer: Jan de Groot pkgname=gnome-common -pkgver=3.4.0.1 -pkgrel=2 +pkgver=3.18.0 +pkgrel=1 pkgdesc="Common development macros for GNOME" arch=(any) -license=('GPL') +depends=(sh autoconf-archive intltool yelp-tools gtk-doc) +license=(GPL) url="http://www.gnome.org" -source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz - automake1.12.patch::http://git.gnome.org/browse/gnome-common/patch/?id=1fed4ee7015b89a1ac4c4a535aeb753e820e4970) -sha256sums=('3d92a5d1dae550c409f644d87a4bba17342e14fb11ce8b1e58757ce35f3a46f7' - '78081e33a0091bfb4531e723fcd6b28219c1c94173aea9071ecb5fe6da9066ab') +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf') build() { cd $pkgname-$pkgver - patch -Np1 -i "$srcdir/automake1.12.patch" - ./configure --prefix=/usr + ./configure --prefix=/usr --with-autoconf-archive make } -- cgit v0.12 From 24cf5e803b385e504521d07fc76665a7f5ca67b0 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 22:55:12 +0000 Subject: pixman: update to 0.32.8 --- abs/core/pixman/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/pixman/PKGBUILD b/abs/core/pixman/PKGBUILD index 76c0959..f55c0cf 100644 --- a/abs/core/pixman/PKGBUILD +++ b/abs/core/pixman/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Alexander Baldeck pkgname=pixman -pkgver=0.32.6 +pkgver=0.32.8 pkgrel=1 pkgdesc="The pixel-manipulation library for X and cairo" arch=(i686 x86_64) @@ -12,7 +12,7 @@ url="http://xorg.freedesktop.org" license=('custom') depends=('glibc') source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('5b730399e1e212e5acaa69a4f1a2c7be1af1cdc4') +sha1sums=('5c57045622265b877c9bf02d531973eadf942140') build() { cd $pkgname-$pkgver -- cgit v0.12 From 72df153b88dc1bf01d639efe469a655ffa2c53c0 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 20 Jan 2016 23:16:54 +0000 Subject: findbrokenpkgs: initial inclusion --- abs/extra/findbrokenpkgs/PKGBUILD | 18 ++ abs/extra/findbrokenpkgs/findbrokenpkgs-1.1.sh | 326 +++++++++++++++++++++++++ 2 files changed, 344 insertions(+) create mode 100644 abs/extra/findbrokenpkgs/PKGBUILD create mode 100644 abs/extra/findbrokenpkgs/findbrokenpkgs-1.1.sh diff --git a/abs/extra/findbrokenpkgs/PKGBUILD b/abs/extra/findbrokenpkgs/PKGBUILD new file mode 100644 index 0000000..32d7a38 --- /dev/null +++ b/abs/extra/findbrokenpkgs/PKGBUILD @@ -0,0 +1,18 @@ +# Maintaine: Jaroslav Lichtblau +# Contributor: Stefan Husmann +# Contributor: Paul Bredbury + +pkgname=findbrokenpkgs +pkgver=1.1 +pkgrel=1 +pkgdesc="Broken package identifier for Arch Linux, based on Gentoo's revdep-rebuild" +arch=('any') +url="http://bbs.archlinux.org/viewtopic.php?id=13882" +license=('GPL') +depends=('binutils' 'pacman') +source=($pkgname-$pkgver.sh) +md5sums=('ee683c467e4881736ed60a15ebbcc7a5') + +package() { + install -Dm755 $pkgname-$pkgver.sh "${pkgdir}"/usr/bin/$pkgname +} diff --git a/abs/extra/findbrokenpkgs/findbrokenpkgs-1.1.sh b/abs/extra/findbrokenpkgs/findbrokenpkgs-1.1.sh new file mode 100644 index 0000000..ee59628 --- /dev/null +++ b/abs/extra/findbrokenpkgs/findbrokenpkgs-1.1.sh @@ -0,0 +1,326 @@ +#! /bin/bash +# Distributed under the terms of the GNU General Public License v2 + +# Shamelessly copied mostly from Gentoo's revdep-rebuild utility. +# http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/gentoolkit/ +# $ equery belongs /usr/bin/revdep-rebuild +# app-portage/gentoolkit-0.2.3-r1 +# $ cat /usr/portage/app-portage/gentoolkit/gentoolkit-0.2.3-r1.ebuild | grep LICENSE +# LICENSE="GPL-2" + +# findbrokenpkgs for Arch Linux. +# Converted to use pacman instead of emerge by Paul Bredbury +# +# v1.1 - files now in $HOME/.findbrokenpkgs/ directory - based on changes from +# Stefan Husmann, repackaged by Jaroslav Lichtblau + +# Customizable variables: +# +# LD_LIBRARY_MASK - Mask of specially evaluated libraries +# SEARCH_DIRS - List of directories to search for executables and libraries +# SEARCH_DIRS_MASK - List of directories to not search +# +# These variables can be prepended to by setting the variable in +# your environment prior to execution. +# +# An entry of "-*" means to clear the variable from that point forward. +# Example: env SEARCH_DIRS="/usr/bin -*" findbrokenpkgs will set SEARCH_DIRS +# to contain only /usr/bin + +if [ "$1" = "-h" -o "$1" = "-help" -o "$1" = "--help" ] ; then + echo "Broken package identifier, version 1.0" + echo "Checks dynamic library linking." + echo + echo "Usage: $0 [OPTIONS]" + echo + echo " -nc, --no-color Turn off colored output" + echo " -nw, --no-warning Disable newbie-friendly warning" + echo " -q, --quiet Be less verbose" + echo + echo "Report bugs to http://bbs.archlinux.org/viewtopic.php?id=13882" + exit 0 +fi + +# Update the incremental variables using /etc/profile.env, /etc/ld.so.conf, +# and the environment. + +# Read the incremental variables from environment +PRELIMINARY_SEARCH_DIRS="$SEARCH_DIRS" +PRELIMINARY_SEARCH_DIRS_MASK="$SEARCH_DIRS_MASK" +PRELIMINARY_LD_LIBRARY_MASK="$LD_LIBRARY_MASK" +SONAME_SEARCH="not found" +SONAME_GREP=grep + +# Add the defaults +if [ -d /etc/findbrokenpkgs ] ; then + for file in $(ls /etc/findbrokenpkgs) ; do + PRELIMINARY_SEARCH_DIRS="$PRELIMINARY_SEARCH_DIRS $(. /etc/findbrokenpkgs/${file}; echo $SEARCH_DIRS)" + PRELIMINARY_SEARCH_DIRS_MASK="$PRELIMINARY_SEARCH_DIRS_MASK $(. /etc/findbrokenpkgs/${file}; echo $SEARCH_DIRS_MASK)" + PRELIMINARY_LD_LIBRARY_MASK="$PRELIMINARY_LD_LIBRARY_MASK $(. /etc/findbrokenpkgs/${file}; echo $LD_LIBRARY_MASK)" + done +else + PRELIMINARY_SEARCH_DIRS="$PRELIMINARY_SEARCH_DIRS /bin /sbin /usr/bin /usr/sbin /lib* /usr/lib*" + # openoffice is a binary, and we don't want to check that monster + PRELIMINARY_SEARCH_DIRS_MASK="$PRELIMINARY_SEARCH_DIRS_MASK /opt/openoffice" + # Binary libraries + PRELIMINARY_LD_LIBRARY_MASK="$PRELIMINARY_LD_LIBRARY_MASK libodbcinst.so libodbc.so libjava.so libjvm.so" +fi + +# Get the ROOTPATH and PATH from /etc/profile.env +if [ -e "/etc/profile.env" ] ; then + PRELIMINARY_SEARCH_DIRS="$PRELIMINARY_SEARCH_DIRS $((. /etc/profile.env; echo ${ROOTPATH}:${PATH}) | tr ':' ' ')" +fi + +# Get the directories from /etc/ld.so.conf +if [ -e /etc/ld.so.conf ] ; then + PRELIMINARY_SEARCH_DIRS="$PRELIMINARY_SEARCH_DIRS $(grep -v "^#" /etc/ld.so.conf | tr '\n' ' ')" +fi + +# Set the final variables +# Note: Using $(echo $variable) removes extraneous spaces from variable assignment +unset SEARCH_DIRS +for i in $(echo $PRELIMINARY_SEARCH_DIRS) ; do + [ "$i" = "-*" ] && break + # Append a / at the end so that links and directories are treated the same by find + # Remove any existing trailing slashes to prevent double-slashes + SEARCH_DIRS="$(echo $SEARCH_DIRS ${i/%\//}/)" +done +# Remove any double-slashes from the path +SEARCH_DIRS="$(echo $SEARCH_DIRS | sed 's:/\+:/:g')" + +unset SEARCH_DIRS_MASK +for i in $(echo $PRELIMINARY_SEARCH_DIRS_MASK) ; do + [ "$i" = "-*" ] && break + SEARCH_DIRS_MASK="$(echo $SEARCH_DIRS_MASK $i)" +done + +unset LD_LIBRARY_MASK +for i in $(echo $PRELIMINARY_LD_LIBRARY_MASK) ; do + [ "$i" = "-*" ] && break + LD_LIBRARY_MASK="$(echo $LD_LIBRARY_MASK $i)" +done + +# Base of temporary files names. +[ -d ${HOME}/.findbrokenpkgs ] || mkdir ${HOME}/.findbrokenpkgs +touch ${HOME}/.findbrokenpkgs/findbrokenpkgs_0.test 2>/dev/null +if [ $? -eq 0 ] ; then + LIST="${HOME}/.findbrokenpkgs/findbrokenpkgs" + rm ~/.findbrokenpkgs/findbrokenpkgs_0.test +else + # Try to use /var/tmp since $HOME is not available + touch /var/tmp/.findbrokenpkgs/findbrokenpkgs_0.test 2>/dev/null + if [ $? -eq 0 ] ; then + LIST="/var/tmp/.findbrokenpkgs/findbrokenpkgs" + rm /var/tmp/.findbrokenpkgs/findbrokenpkgs_0.test + else + echo + echo "!!! Unable to write temporary files to either $HOME or /var/tmp !!!" + echo + exit 1 + fi +fi + +shopt -s nullglob +shopt -s expand_aliases +unalias -a +alias echo_v=echo + +while [ ! -z "$1" ] ; do + case "$1" in + -q | --quiet ) + alias echo_v=: + shift + ;; + -nc | --no-color ) + NOCOLOR=true + shift + ;; + -nw | --no-warning ) + NOWARNING=true + shift + ;; + * ) + echo "Unknown option: $1" + exit 1 + ;; + esac +done + +# Color Definitions +if [ "$NOCOLOR" = "yes" -o "$NOCOLOR" = "true" ] ; then + NO="" + BR="" + CY="" + GR="" + RD="" + YL="" + BL="" +else + NO="\x1b[0m" + BR="\x1b[0;01m" + CY="\x1b[36;01m" + GR="\x1b[32;01m" + RD="\x1b[31;01m" + YL="\x1b[33;01m" + BL="\x1b[34;01m" +fi + +function set_trap () { + trap "rm_temp $1" SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM +} + +function rm_temp () { + echo " terminated." + echo "Removing incomplete $1." + rm $1 + echo + exit 1 +} + +# Want program results (especially from pacman) in English +export LC_ALL=C + +# Always delete the temporary files from a previous run +rm -f ${LIST}.[0-9]_* + +# Clean up no longer needed environment variables +unset PREVIOUS_SEARCH_DIRS PREVIOUS_SEARCH_DIRS_MASK PREVIOUS_LD_LIBRARY_MASK PREVIOUS_PREVIOUS_OPTIONS +unset PRELIMINARY_SEARCH_DIRS PRELIMINARY_SEARCH_DIRS_MASK PRELIMINARY_LD_LIBRARY_MASK + +# Log our environment +echo "SEARCH_DIRS=\"$SEARCH_DIRS\"" > $LIST.0_env +echo "SEARCH_DIRS_MASK=\"$SEARCH_DIRS_MASK\"" >> $LIST.0_env +echo "LD_LIBRARY_MASK=\"$LD_LIBRARY_MASK\"" >> $LIST.0_env + +echo_v +echo_v "Checking reverse dependencies..." +echo_v +echo_v -n -e "${GR}Collecting system binaries and libraries...${NO}" + +set_trap "$LIST.1_*" + +# Be extra paranoid and pipe results through sed to remove multiple slashes +# using -perm /u+x for find command +find $SEARCH_DIRS -type f \( -perm /u+x -o -name '*.so' -o -name '*.so.*' -o -name '*.la' \) 2>/dev/null | sort | uniq | sed 's:/\+:/:g' >$LIST.0_files + +# Remove files that match SEARCH_DIR_MASK +for dir in $SEARCH_DIRS_MASK ; do + grep -v "^$dir" $LIST.0_files > $LIST.1_files + mv $LIST.1_files $LIST.0_files +done + +mv $LIST.0_files $LIST.1_files +echo_v -e " ${GR}done.${NO}\n ($LIST.1_files)" + +echo_v +echo_v -n -e "${GR}Collecting complete LD_LIBRARY_PATH...${NO}" +set_trap "$LIST.2_ldpath" +# Ensure that the "trusted" lib directories are at the start of the path +( + echo /lib* /usr/lib* | sed 's/ /:/g' + sed '/^#/d;s/#.*$//' $LIST.2_ldpath +echo_v -e " ${GR}done.${NO}\n ($LIST.2_ldpath)" +COMPLETE_LD_LIBRARY_PATH="$(cat $LIST.2_ldpath)" + +echo_v +echo_v -e "${GR}Checking dynamic linking consistency...${NO}" +set_trap "$LIST.3_rebuild" +LD_MASK="\\( $(echo "$LD_LIBRARY_MASK" | sed 's/\./\\./g;s/ / \\| /g') \\)" +echo -n > $LIST.3_rebuild +cat $LIST.1_files | egrep -v '*\.la$' | while read FILE ; do + # Note: double checking seems to be faster than single + # with complete path (special add-ons are rare). + if ldd "$FILE" 2>/dev/null | grep -v "$LD_MASK" | $SONAME_GREP -q "$SONAME_SEARCH" ; then + if LD_LIBRARY_PATH="$COMPLETE_LD_LIBRARY_PATH" ldd "$FILE" 2>/dev/null | grep -v "$LD_MASK" | $SONAME_GREP -q "$SONAME_SEARCH" ; then + # Only build missing direct dependencies + ALL_MISSING_LIBS=$(ldd "$FILE" 2>/dev/null | sort -u | sed -n 's/ \(.*\) => not found/\1/p' | tr '\n' ' ' | sed 's/ $//' ) + REQUIRED_LIBS=$(objdump -x $FILE | grep NEEDED | awk '{print $2}' | tr '\n' ' ' | sed 's/ $//') + MISSING_LIBS="" + for lib in $ALL_MISSING_LIBS ; do + if echo $REQUIRED_LIBS | grep -q $lib ; then + MISSING_LIBS="$MISSING_LIBS $lib" + fi + done + if [ "$MISSING_LIBS" != "" ] ; then + echo "$FILE" >> $LIST.3_rebuild + # MISSING_LIBS already starts with a space + echo_v -e " $FILE ${RD}needs missing${NO}${MISSING_LIBS}" + fi + fi + fi +done +# Not sure if *.la files should even be checked +cat $LIST.1_files | egrep '*\.la$' | while read FILE ; do + for depend in $(grep '^dependency_libs' $FILE | awk -F'=' '{print $2}' | sed "s/'//g") ; do + [ ${depend:0:1} != '/' ] && continue + if [ ! -e $depend ] ; then + echo "$FILE" >> $LIST.3_rebuild + echo_v -e " $FILE ${RD}needs missing${NO} ${depend}" + fi + done +done +echo_v -e " ${GR}done${NO}.\n ($LIST.3_rebuild)" + +echo_v +echo_v -n -e "${GR}Assigning files to packages...${NO}" +set_trap "$LIST.4_*" +echo -n > $LIST.4_package_owners +echo -n > $LIST.4_packages_raw +echo -n > $LIST.4_orphans + +cat $LIST.3_rebuild | while read FILE ; do + EXACT_PKG=$(pacman -Qo $FILE | awk '{print $5 " " $6}') + PKG=$(echo $EXACT_PKG | awk '{print $1}') + if [ -z "$PKG" ] ; then + echo_v -n -e "\n ${RD}*** $FILE is orphan & broken! ***${NO}" + echo "$FILE -> (none)" >> $LIST.4_package_owners + echo "$FILE" >> $LIST.4_orphans + echo_v -n -e "\n $FILE ${RD}-> (none)${NO}" + else + echo "$PKG" >> $LIST.4_packages_raw + echo "$FILE -> $EXACT_PKG" >> $LIST.4_package_owners + echo_v -n -e "\n $FILE ${CY}->${NO} ${BR}$PKG${NO}" + fi +done +echo_v +echo_v -e " ${GR}done.${NO}\n ($LIST.4_*)" + +echo_v +echo_v -n -e "${GR}Cleaning list of packages to rebuild...${NO}" +set_trap "$LIST.5_packages" +sort -u $LIST.4_packages_raw >$LIST.5_packages +echo_v -e " ${GR}done.${NO}\n ($LIST.5_packages)" + +REBUILD_LIST="$(cat $LIST.5_packages | tr '\n' ' ')" +ORPHAN_LIST="$(cat $LIST.4_orphans)" + +# Clean up no longer needed environment variables +unset COMPLETE_LD_LIBRARY_PATH SEARCH_DIRS SEARCH_DIRS_MASK LD_LIBRARY_MASK + +trap - SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM + +if [ -z "$REBUILD_LIST" ] && [ -z "$ORPHAN_LIST" ] ; then + echo_v -e "\n${GR}Dynamic linking on your system is consistent.${NO}" + # All OK, so delete temporary files + rm -f ${LIST}.[0-9]_* +else + # Show broken files & packages + if [ -n "$ORPHAN_LIST" ] ; then + echo -e "\n${RD}Orphaned broken files:${NO}" + echo "$ORPHAN_LIST" + echo_v -e "\n${GR}This list of orphaned broken files is in $LIST.4_orphans${NO}" + fi + if [ -n "$REBUILD_LIST" ] ; then + echo -e "\n${RD}Recompile these packages:${NO}" + echo -e "${BR}$REBUILD_LIST${NO}" + if ! [ "$NOWARNING" = "yes" -o "$NOWARNING" = "true" ] ; then + echo_v -e "\nSome/all breakages may be ${GR}OK${NO} - this program cannot distinguish between ${RD}required${NO}" + echo_v -e "and ${GR}optional${NO} dependencies. See http://bbs.archlinux.org/viewtopic.php?id=13882" + fi + fi + # The temporary files are deliberately not deleted, as a source of info +fi + +exit 0 -- cgit v0.12 From a160b30380f80ca4dfee379fef513c23eed096db Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 00:47:32 +0000 Subject: make: update to 4.1.1 --- abs/core/make/PKGBUILD | 36 ++----- abs/core/make/bug30612.patch | 66 ------------ abs/core/make/bug30723.patch | 12 --- abs/core/make/make-3.82-bug30612.patch | 91 ++++++++++++++++ abs/core/make/make-3.82-bug30723.patch | 12 +++ .../make/make-3.82-dont-prune-intermediate.patch | 57 ++++++++++ abs/core/make/make-3.82-expensive_glob.patch | 116 +++++++++++++++++++++ abs/core/make/make.install | 4 +- 8 files changed, 286 insertions(+), 108 deletions(-) delete mode 100644 abs/core/make/bug30612.patch delete mode 100644 abs/core/make/bug30723.patch create mode 100644 abs/core/make/make-3.82-bug30612.patch create mode 100644 abs/core/make/make-3.82-bug30723.patch create mode 100644 abs/core/make/make-3.82-dont-prune-intermediate.patch create mode 100644 abs/core/make/make-3.82-expensive_glob.patch diff --git a/abs/core/make/PKGBUILD b/abs/core/make/PKGBUILD index 3f38c53..54ffd48 100644 --- a/abs/core/make/PKGBUILD +++ b/abs/core/make/PKGBUILD @@ -1,45 +1,25 @@ -# $Id: PKGBUILD 138005 2011-09-14 05:05:13Z allan $ +# $Id$ # Maintainer: Allan McRae # Contributor: judd pkgname=make -pkgver=3.82 -pkgrel=4 +pkgver=4.1 +pkgrel=1 pkgdesc="GNU make utility to maintain groups of programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/make" license=('GPL3') groups=('base-devel') -depends=('glibc' 'sh') +depends=('glibc' 'sh' 'guile') install=$pkgname.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - bug30612.patch - bug30723.patch - make-3.82-sort-blank.patch - make-3.82-makeflags.patch) -md5sums=('1a11100f3c63fcf5753818e59d63088f' - 'c8f496b22191f9fb9420ab14c1a19a47' - '662e6450e19a5acdaa5c9fcb8ad78dea' - '7d01a99f389d8f08dec93ed479071ee4' - 'bc12ad4d0c6e6c0e72d9fb61054f446b') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('57a7a224a822f94789a587ccbcedff69' + 'SKIP') +validpgpkeys=('3D2554F0A15338AB9AF1BB9D96B047156338B6D4') # Paul Smith build() { cd ${srcdir}/${pkgname}-${pkgver} - - # http://savannah.gnu.org/bugs/?30612 - patch -Np1 -i $srcdir/bug30612.patch - - # http://savannah.gnu.org/bugs/?30723 - patch -Np1 -i $srcdir/bug30723.patch - - # https://bugs.archlinux.org/task/22733 (fix from Fedora) - patch -Np1 -i $srcdir/make-3.82-sort-blank.patch - - # https://savannah.gnu.org/support/index.php?107487 - # https://savannah.gnu.org/bugs/?33873 - patch -Np0 -i $srcdir/make-3.82-makeflags.patch - ./configure --prefix=/usr make } diff --git a/abs/core/make/bug30612.patch b/abs/core/make/bug30612.patch deleted file mode 100644 index fb843bc..0000000 --- a/abs/core/make/bug30612.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c ---- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 -+++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000 -@@ -1,3 +1,4 @@ -+ - /* Argument parsing and main program of GNU Make. - Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -@@ -1138,7 +1139,7 @@ - a macro and some compilers (MSVC) don't like conditionals in macros. */ - { - const char *features = "target-specific order-only second-expansion" -- " else-if shortest-stem undefine" -+ " else-if shortest-stem undefine oneshell" - #ifndef NO_ARCHIVES - " archives" - #endif -diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c ---- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000 -+++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000 -@@ -3028,7 +3028,7 @@ - { - /* This looks like the first element in an open archive group. - A valid group MUST have ')' as the last character. */ -- const char *e = p + nlen; -+ const char *e = p; - do - { - e = next_token (e); -@@ -3084,19 +3084,19 @@ - Go to the next item in the string. */ - if (flags & PARSEFS_NOGLOB) - { -- NEWELT (concat (2, prefix, tp)); -+ NEWELT (concat (2, prefix, tmpbuf)); - continue; - } - - /* If we get here we know we're doing glob expansion. - TP is a string in tmpbuf. NLEN is no longer used. - We may need to do more work: after this NAME will be set. */ -- name = tp; -+ name = tmpbuf; - - /* Expand tilde if applicable. */ -- if (tp[0] == '~') -+ if (tmpbuf[0] == '~') - { -- tildep = tilde_expand (tp); -+ tildep = tilde_expand (tmpbuf); - if (tildep != 0) - name = tildep; - } -@@ -3152,7 +3152,11 @@ - else - { - /* We got a chain of items. Attach them. */ -- (*newp)->next = found; -+ if (*newp) -+ (*newp)->next = found; -+ else -+ *newp = found; -+ - - /* Find and set the new end. Massage names if necessary. */ - while (1) diff --git a/abs/core/make/bug30723.patch b/abs/core/make/bug30723.patch deleted file mode 100644 index 84e7ebe..0000000 --- a/abs/core/make/bug30723.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c ---- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 -+++ make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000 -@@ -2093,7 +2093,7 @@ - const char *pv = define_makeflags (1, 1); - char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); - sprintf (p, "MAKEFLAGS=%s", pv); -- putenv (p); -+ putenv (allocated_variable_expand (p)); - } - - if (ISDB (DB_BASIC)) diff --git a/abs/core/make/make-3.82-bug30612.patch b/abs/core/make/make-3.82-bug30612.patch new file mode 100644 index 0000000..9867a15 --- /dev/null +++ b/abs/core/make/make-3.82-bug30612.patch @@ -0,0 +1,91 @@ +--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 ++++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000 +@@ -1,3 +1,4 @@ ++ + /* Argument parsing and main program of GNU Make. + Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +@@ -1138,7 +1139,7 @@ + a macro and some compilers (MSVC) don't like conditionals in macros. */ + { + const char *features = "target-specific order-only second-expansion" +- " else-if shortest-stem undefine" ++ " else-if shortest-stem undefine oneshell" + #ifndef NO_ARCHIVES + " archives" + #endif +diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c +--- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000 ++++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000 +@@ -3028,7 +3028,7 @@ + { + /* This looks like the first element in an open archive group. + A valid group MUST have ')' as the last character. */ +- const char *e = p + nlen; ++ const char *e = p; + do + { + e = next_token (e); +@@ -3084,19 +3084,19 @@ + Go to the next item in the string. */ + if (flags & PARSEFS_NOGLOB) + { +- NEWELT (concat (2, prefix, tp)); ++ NEWELT (concat (2, prefix, tmpbuf)); + continue; + } + + /* If we get here we know we're doing glob expansion. + TP is a string in tmpbuf. NLEN is no longer used. + We may need to do more work: after this NAME will be set. */ +- name = tp; ++ name = tmpbuf; + + /* Expand tilde if applicable. */ +- if (tp[0] == '~') ++ if (tmpbuf[0] == '~') + { +- tildep = tilde_expand (tp); ++ tildep = tilde_expand (tmpbuf); + if (tildep != 0) + name = tildep; + } +@@ -3152,7 +3152,11 @@ + else + { + /* We got a chain of items. Attach them. */ +- (*newp)->next = found; ++ if (*newp) ++ (*newp)->next = found; ++ else ++ *newp = found; ++ + + /* Find and set the new end. Massage names if necessary. */ + while (1) +diff --git make-3.82-orig/read.c make-3.82-fix30612/read.c +index c87d4a7..b012094 100644 +--- make-3.82-orig/read.c ++++ make-3.82-fix30612/read.c +@@ -3044,16 +3044,16 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar, + nlen -= (n + 1) - tp; + tp = n + 1; + +- /* If we have just "lib(", part of something like +- "lib( a b)", go to the next item. */ +- if (! nlen) +- continue; +- + /* We can stop looking now. */ + break; + } + } + while (*e != '\0'); ++ ++ /* If we have just "lib(", part of something like "lib( a b)", ++ go to the next item. */ ++ if (! nlen) ++ continue; + } + } + diff --git a/abs/core/make/make-3.82-bug30723.patch b/abs/core/make/make-3.82-bug30723.patch new file mode 100644 index 0000000..84e7ebe --- /dev/null +++ b/abs/core/make/make-3.82-bug30723.patch @@ -0,0 +1,12 @@ +diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c +--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 ++++ make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000 +@@ -2093,7 +2093,7 @@ + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); +- putenv (p); ++ putenv (allocated_variable_expand (p)); + } + + if (ISDB (DB_BASIC)) diff --git a/abs/core/make/make-3.82-dont-prune-intermediate.patch b/abs/core/make/make-3.82-dont-prune-intermediate.patch new file mode 100644 index 0000000..f4f47dd --- /dev/null +++ b/abs/core/make/make-3.82-dont-prune-intermediate.patch @@ -0,0 +1,57 @@ +2012-09-09 Paul Smith + + * remake.c (update_file_1): Force intermediate files to be + considered, not pruned, if their non-intermediate parent needs to + be remade. Fixes Savannah bug #30653. + +Index: remake.c +=================================================================== +RCS file: /sources/make/make/remake.c,v +retrieving revision 1.153 +retrieving revision 1.154 +diff -u -r1.153 -r1.154 +--- remake.c 5 Mar 2012 14:10:45 -0000 1.153 ++++ remake.c 10 Sep 2012 02:36:05 -0000 1.154 +@@ -612,6 +612,10 @@ + d->file->dontcare = file->dontcare; + } + ++ /* We may have already considered this file, when we didn't know ++ we'd need to update it. Force update_file() to consider it and ++ not prune it. */ ++ d->file->considered = !considered; + + dep_status |= update_file (d->file, depth); + +Index: tests/scripts/features/parallelism +=================================================================== +RCS file: /sources/make/make/tests/scripts/features/parallelism,v +retrieving revision 1.19 +retrieving revision 1.20 +diff -u -r1.19 -r1.20 +--- tests/scripts/features/parallelism 4 Mar 2012 00:24:32 -0000 1.19 ++++ tests/scripts/features/parallelism 10 Sep 2012 02:36:05 -0000 1.20 +@@ -214,6 +214,23 @@ + rmfiles(qw(foo.y foo.y.in main.bar)); + } + ++# Ensure intermediate/secondary files are not pruned incorrectly. ++# See Savannah bug #30653 ++ ++utouch(-15, 'file2'); ++utouch(-10, 'file4'); ++utouch(-5, 'file1'); ++ ++run_make_test(q! ++.INTERMEDIATE: file3 ++file4: file3 ; @mv -f $< $@ ++file3: file2 ; touch $@ ++file2: file1 ; @touch $@ ++!, ++ '--no-print-directory -j2', "touch file3"); ++ ++#rmfiles('file1', 'file2', 'file3', 'file4'); ++ + if ($all_tests) { + # Jobserver FD handling is messed up in some way. + # Savannah bug #28189 diff --git a/abs/core/make/make-3.82-expensive_glob.patch b/abs/core/make/make-3.82-expensive_glob.patch new file mode 100644 index 0000000..8663f50 --- /dev/null +++ b/abs/core/make/make-3.82-expensive_glob.patch @@ -0,0 +1,116 @@ +Index: read.c +=================================================================== +RCS file: /sources/make/make/read.c,v +retrieving revision 1.198 +retrieving revision 1.200 +diff -u -r1.198 -r1.200 +--- read.c 29 Apr 2011 15:27:39 -0000 1.198 ++++ read.c 7 May 2011 14:36:12 -0000 1.200 +@@ -2901,6 +2901,7 @@ + const char *name; + const char **nlist = 0; + char *tildep = 0; ++ int globme = 1; + #ifndef NO_ARCHIVES + char *arname = 0; + char *memname = 0; +@@ -3109,32 +3110,40 @@ + } + #endif /* !NO_ARCHIVES */ + +- switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl)) +- { +- case GLOB_NOSPACE: +- fatal (NILF, _("virtual memory exhausted")); +- +- case 0: +- /* Success. */ +- i = gl.gl_pathc; +- nlist = (const char **)gl.gl_pathv; +- break; +- +- case GLOB_NOMATCH: +- /* If we want only existing items, skip this one. */ +- if (flags & PARSEFS_EXISTS) +- { +- i = 0; +- break; +- } +- /* FALLTHROUGH */ +- +- default: +- /* By default keep this name. */ ++ /* glob() is expensive: don't call it unless we need to. */ ++ if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL) ++ { ++ globme = 0; + i = 1; + nlist = &name; +- break; +- } ++ } ++ else ++ switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl)) ++ { ++ case GLOB_NOSPACE: ++ fatal (NILF, _("virtual memory exhausted")); ++ ++ case 0: ++ /* Success. */ ++ i = gl.gl_pathc; ++ nlist = (const char **)gl.gl_pathv; ++ break; ++ ++ case GLOB_NOMATCH: ++ /* If we want only existing items, skip this one. */ ++ if (flags & PARSEFS_EXISTS) ++ { ++ i = 0; ++ break; ++ } ++ /* FALLTHROUGH */ ++ ++ default: ++ /* By default keep this name. */ ++ i = 1; ++ nlist = &name; ++ break; ++ } + + /* For each matched element, add it to the list. */ + while (i-- > 0) +@@ -3174,7 +3183,8 @@ + #endif /* !NO_ARCHIVES */ + NEWELT (concat (2, prefix, nlist[i])); + +- globfree (&gl); ++ if (globme) ++ globfree (&gl); + + #ifndef NO_ARCHIVES + if (arname) +Index: tests/scripts/functions/wildcard +=================================================================== +RCS file: /sources/make/make/tests/scripts/functions/wildcard,v +retrieving revision 1.6 +retrieving revision 1.7 +diff -u -r1.6 -r1.7 +--- tests/scripts/functions/wildcard 13 Jun 2009 21:21:49 -0000 1.6 ++++ tests/scripts/functions/wildcard 7 May 2011 14:36:11 -0000 1.7 +@@ -88,4 +88,16 @@ + !, + '', "\n"); + ++# TEST #5: wildcard used to verify file existence ++ ++touch('xxx.yyy'); ++ ++run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!, ++ '', "file=xxx.yyy\n"); ++ ++unlink('xxx.yyy'); ++ ++run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!, ++ '', "file=\n"); ++ + 1; diff --git a/abs/core/make/make.install b/abs/core/make/make.install index 6cf8b0d..8426085 100644 --- a/abs/core/make/make.install +++ b/abs/core/make/make.install @@ -2,7 +2,7 @@ infodir=usr/share/info filelist=(make.info make.info-1 make.info-2) post_install() { - [ -x usr/bin/install-info ] || return 0 + [[ -x usr/bin/install-info ]] || return 0 for file in ${filelist[@]}; do install-info $infodir/$file.gz $infodir/dir 2> /dev/null done @@ -13,7 +13,7 @@ post_upgrade() { } pre_remove() { - [ -x usr/bin/install-info ] || return 0 + [[ -x usr/bin/install-info ]] || return 0 for file in ${filelist[@]}; do install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done -- cgit v0.12 From 756c27483da9dc25fa404ef5c03bad99816c6cbe Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 13:10:59 +0000 Subject: gtk2: update to 2.24.29 --- abs/core/gtk2/PKGBUILD | 45 +++++++++++------------------ abs/core/gtk2/gtk-update-icon-cache.install | 3 -- abs/core/gtk2/gtkrc | 2 +- 3 files changed, 18 insertions(+), 32 deletions(-) delete mode 100644 abs/core/gtk2/gtk-update-icon-cache.install diff --git a/abs/core/gtk2/PKGBUILD b/abs/core/gtk2/PKGBUILD index 4949bfc..81d2f0e 100644 --- a/abs/core/gtk2/PKGBUILD +++ b/abs/core/gtk2/PKGBUILD @@ -1,19 +1,23 @@ # $Id$ # Maintainer: Jan de Groot -pkgbase=gtk2 -pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.25 +pkgname=gtk2 +pkgver=2.24.29 pkgrel=1 -arch=('i686' 'x86_64') +pkgdesc="GObject-based multi-platform GUI toolkit (legacy)" +arch=(i686 x86_64) url="http://www.gtk.org/" -makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' - 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection' 'python2') -license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz +depends=(atk pango libxcursor libxinerama libxrandr libxi libxcomposite libxdamage + shared-mime-info cairo libcups gtk-update-icon-cache librsvg) +makedepends=(gobject-introspection python2) +optdepends=('gnome-themes-standard: Default widget theme' + 'adwaita-icon-theme: Default icon theme') +license=(LGPL) +install=gtk2.install +source=(https://download.gnome.org/sources/gtk+/2.24/gtk+-$pkgver.tar.xz gtkrc xid-collision-debug.patch) -sha256sums=('38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3' - 'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2' +sha256sums=('0741c59600d3d810a223866453dc2bbb18ce4723828681ba24aa6519c37631b8' + 'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') prepare() { @@ -35,15 +39,7 @@ build() { make } -package_gtk2() { - pkgdesc="GTK+ is a multi-platform toolkit (v2)" - install=gtk2.install - depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' - 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') - optdepends=('gnome-themes-standard: Default widget theme' - 'gnome-icon-theme: Default icon theme') - replaces=('gtk2-docs') - +package() { cd gtk+-$pkgver make DESTDIR="$pkgdir" install @@ -51,14 +47,7 @@ package_gtk2() { install -Dm644 "$srcdir/gtkrc" "$pkgdir/usr/share/gtk-2.0/gtkrc" - #split this out to use with gtk3 too - rm $pkgdir/usr/bin/gtk-update-icon-cache + rm "$pkgdir/usr/bin/gtk-update-icon-cache" } -package_gtk-update-icon-cache() { - pkgdesc="The GTK+ update icon cache tool" - depends=('gdk-pixbuf2>=2.24.1-3' 'hicolor-icon-theme') - install=gtk-update-icon-cache.install - cd gtk+-$pkgver/gtk - install -D -m755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache" -} +# vim:set noet sw=4: diff --git a/abs/core/gtk2/gtk-update-icon-cache.install b/abs/core/gtk2/gtk-update-icon-cache.install deleted file mode 100644 index 1afcc72..0000000 --- a/abs/core/gtk2/gtk-update-icon-cache.install +++ /dev/null @@ -1,3 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} diff --git a/abs/core/gtk2/gtkrc b/abs/core/gtk2/gtkrc index d2282ac..1ee9497 100644 --- a/abs/core/gtk2/gtkrc +++ b/abs/core/gtk2/gtkrc @@ -1,3 +1,3 @@ -gtk-icon-theme-name = "gnome" +gtk-icon-theme-name = "Adwaita" gtk-theme-name = "Adwaita" gtk-font-name = "Cantarell 11" -- cgit v0.12 From 7b2f36b150567bb095f4f7d6842db9e4ee2cfdff Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 13:18:11 +0000 Subject: poppler: update to 0.39.0 --- abs/core/poppler/PKGBUILD | 21 +++++++++++++++++---- abs/core/poppler/__changelog | 1 - 2 files changed, 17 insertions(+), 5 deletions(-) delete mode 100644 abs/core/poppler/__changelog diff --git a/abs/core/poppler/PKGBUILD b/abs/core/poppler/PKGBUILD index aed359e..6048751 100644 --- a/abs/core/poppler/PKGBUILD +++ b/abs/core/poppler/PKGBUILD @@ -2,17 +2,17 @@ # Maintainer: Jan de Groot pkgbase=poppler -pkgname=('poppler' 'poppler-glib' 'poppler-qt4') -pkgver=0.29.0 +pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5') +pkgver=0.39.0 pkgrel=1 arch=(i686 x86_64) license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu' 'git' 'python2') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu' 'qt5-base' 'git' 'python2') options=('!emptydirs') url="http://poppler.freedesktop.org/" source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz git://anongit.freedesktop.org/poppler/test) -md5sums=('7a5d87b7f62db636cc59f73bbd240811' +md5sums=('5100960c61b932430b5d74068d71f530' 'SKIP') build() { @@ -23,6 +23,7 @@ build() { --enable-xpdf-headers \ --enable-libjpeg --enable-zlib \ --enable-poppler-qt4 \ + --enable-poppler-qt5 \ --enable-poppler-glib make } @@ -74,3 +75,15 @@ package_poppler-qt4() { install -m644 poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" rm -f "${pkgdir}"/usr/lib/libpoppler.* } + +package_poppler-qt5() { + pkgdesc="Poppler Qt5 bindings" + depends=("poppler=${pkgver}" 'qt5-base') + + cd "${pkgbase}-${pkgver}" + make -C poppler DESTDIR="${pkgdir}" install-libLTLIBRARIES + make -C qt5 DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/" + rm -f "${pkgdir}"/usr/lib/libpoppler.* +} diff --git a/abs/core/poppler/__changelog b/abs/core/poppler/__changelog deleted file mode 100644 index 0701dff..0000000 --- a/abs/core/poppler/__changelog +++ /dev/null @@ -1 +0,0 @@ -PKGBUILD: remove qt5 stuff -- cgit v0.12 From ba2a3d48d220594daf81b35e74c525d07f94973c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 13:22:10 +0000 Subject: librsvg: update to 2.40.11 --- abs/core/librsvg/PKGBUILD | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/abs/core/librsvg/PKGBUILD b/abs/core/librsvg/PKGBUILD index e3e7534..0a479ec 100644 --- a/abs/core/librsvg/PKGBUILD +++ b/abs/core/librsvg/PKGBUILD @@ -2,20 +2,19 @@ # Maintainer: Jan de Groot pkgname=librsvg -pkgver=2.40.5 +pkgver=2.40.11 pkgrel=1 -epoch=1 +epoch=2 pkgdesc="A SVG viewing library" arch=(i686 x86_64) license=('LGPL') depends=('gdk-pixbuf2' 'pango' 'libcroco') -makedepends=('intltool' 'gtk3' 'gobject-introspection' 'vala' 'python2') -optdepends=('gtk3: for rsvg-view-3') +makedepends=('intltool' 'gobject-introspection' 'vala' 'python2') options=('!emptydirs') url="https://live.gnome.org/LibRsvg" install=librsvg.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('d14d7b3e25023ce34302022fd7c9b3a468629c94dff6c177874629686bfc71a7') +source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('611ac0f544debd0c9bf1ef5509c990d218e83dd1d8c83297075c4b29796a2e02') build() { cd $pkgname-$pkgver -- cgit v0.12 From ab3816ec6755bdcdd6d887d34cb918245e4ed62f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 13:30:47 +0000 Subject: fontconfig: update to 2.11.1-2 --- ...g-73291-poppler-does-not-show-fl-ligature.patch | 43 +++ .../0002-Update-aliases-for-new-URW-fonts.patch | 308 +++++++++++++++++++++ abs/core/fontconfig/29-replace-bitmap-fonts.conf | 37 --- abs/core/fontconfig/PKGBUILD | 18 +- abs/core/fontconfig/fontconfig.install | 1 + 5 files changed, 367 insertions(+), 40 deletions(-) create mode 100644 abs/core/fontconfig/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch create mode 100644 abs/core/fontconfig/0002-Update-aliases-for-new-URW-fonts.patch delete mode 100644 abs/core/fontconfig/29-replace-bitmap-fonts.conf diff --git a/abs/core/fontconfig/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch b/abs/core/fontconfig/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch new file mode 100644 index 0000000..8c1e55d --- /dev/null +++ b/abs/core/fontconfig/0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch @@ -0,0 +1,43 @@ +From e7121de237a1873c3241a5b8451e7d00a3d41524 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Fri, 3 Oct 2014 12:26:42 +0900 +Subject: Revert "Bug 73291 - poppler does not show fl ligature" + +This reverts commit c6aa4d4bfcbed14f39d070fe7ef90a4b74642ee7. + +This issue has been fixed in poppler and we no longer need to patch it out in fontconfig. + +diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf +index 08c8ba3..49a9602 100644 +--- a/conf.d/30-metric-aliases.conf ++++ b/conf.d/30-metric-aliases.conf +@@ -77,15 +77,12 @@ but in an order preferring similar designs first. We do this in three steps: + + + +- + + + Nimbus Mono L +@@ -418,10 +415,7 @@ but in an order preferring similar designs first. We do this in three steps: + + Times + +- + Nimbus Roman No9 L + + +-- +cgit v0.10.2 + diff --git a/abs/core/fontconfig/0002-Update-aliases-for-new-URW-fonts.patch b/abs/core/fontconfig/0002-Update-aliases-for-new-URW-fonts.patch new file mode 100644 index 0000000..58df7ea --- /dev/null +++ b/abs/core/fontconfig/0002-Update-aliases-for-new-URW-fonts.patch @@ -0,0 +1,308 @@ +From b732bf057f4b3ec3bac539803005e9c42d056b2a Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Thu, 6 Nov 2014 13:15:09 +0900 +Subject: Update aliases for new URW fonts + +Patch from Tom Yan + +https://bugs.freedesktop.org/show_bug.cgi?id=85225 + +diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf +index 49a9602..cd1e924 100644 +--- a/conf.d/30-metric-aliases.conf ++++ b/conf.d/30-metric-aliases.conf +@@ -6,17 +6,17 @@ + + Alias similar/metric-compatible families from various sources: + +-PostScript fonts: URW fonts: GUST fonts: Windows fonts: +-====================== ==================== ================= ================== +-Helvetica Nimbus Sans L TeX Gyre Heros +-Helvetica Condensed TeX Gyre Heros Cn +-Times Nimbus Roman No9 L TeX Gyre Termes +-Courier Nimbus Mono L TeX Gyre Cursor +-ITC Avant Garde Gothic URW Gothic L TeX Gyre Adventor +-ITC Bookman URW Bookman L TeX Gyre Bonum Bookman Old Style +-ITC Zapf Chancery URW Chancery L TeX Gyre Chorus +-Palatino URW Palladio L TeX Gyre Pagella Palatino Linotype +-New Century Schoolbook Century Schoolbook L TeX Gyre Schola Century Schoolbook ++PostScript fonts: URW fonts: GUST fonts: Windows fonts: ++====================== ====================== ================= ================== ++Helvetica Nimbus Sans TeX Gyre Heros ++Helvetica Condensed Nimbus Sans Narrow TeX Gyre Heros Cn ++Times Nimbus Roman TeX Gyre Termes ++Courier Nimbus Mono TeX Gyre Cursor ++ITC Avant Garde Gothic URW Gothic TeX Gyre Adventor ++ITC Bookman Bookman URW TeX Gyre Bonum Bookman Old Style ++ITC Zapf Chancery Chancery URW TeX Gyre Chorus ++Palatino Palladio URW TeX Gyre Pagella Palatino Linotype ++New Century Schoolbook Century SchoolBook URW TeX Gyre Schola Century Schoolbook + + Microsoft fonts: Liberation fonts: Google CrOS core fonts: StarOffice fonts: AMT fonts: + ================ ====================== ======================= ================= ============== +@@ -57,6 +57,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ Nimbus Sans ++ ++ Helvetica ++ ++ ++ ++ + TeX Gyre Heros + + Helvetica +@@ -64,6 +71,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ Nimbus Sans Narrow ++ ++ Helvetica Condensed ++ ++ ++ ++ + TeX Gyre Heros Cn + + Helvetica Condensed +@@ -78,6 +92,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ Nimbus Roman ++ ++ Times ++ ++ ++ ++ + TeX Gyre Termes + + Times +@@ -92,6 +113,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ Nimbus Mono ++ ++ Courier ++ ++ ++ ++ + TeX Gyre Cursor + + Courier +@@ -113,6 +141,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ URW Gothic ++ ++ ITC Avant Garde Gothic ++ ++ ++ ++ + TeX Gyre Adventor + + ITC Avant Garde Gothic +@@ -134,6 +169,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ Bookman URW ++ ++ ITC Bookman ++ ++ ++ ++ + TeX Gyre Bonum + + ITC Bookman +@@ -162,6 +204,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ Chancery URW ++ ++ ITC Zapf Chancery ++ ++ ++ ++ + TeX Gyre Chorus + + ITC Zapf Chancery +@@ -176,6 +225,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ Palladio URW ++ ++ Palatino ++ ++ ++ ++ + TeX Gyre Pagella + + Palatino +@@ -197,6 +253,13 @@ but in an order preferring similar designs first. We do this in three steps: + + + ++ Century SchoolBook URW ++ ++ New Century Schoolbook ++ ++ ++ ++ + TeX Gyre Schola + + New Century Schoolbook +@@ -401,6 +464,7 @@ but in an order preferring similar designs first. We do this in three steps: + Helvetica + + TeX Gyre Heros ++ Nimbus Sans + Nimbus Sans L + + +@@ -409,6 +473,7 @@ but in an order preferring similar designs first. We do this in three steps: + Helvetica Condensed + + TeX Gyre Heros Cn ++ Nimbus Sans Narrow + + + +@@ -416,6 +481,7 @@ but in an order preferring similar designs first. We do this in three steps: + Times + + TeX Gyre Termes ++ Nimbus Roman + Nimbus Roman No9 L + + +@@ -424,6 +490,7 @@ but in an order preferring similar designs first. We do this in three steps: + Courier + + TeX Gyre Cursor ++ Nimbus Mono + Nimbus Mono L + + +@@ -432,6 +499,7 @@ but in an order preferring similar designs first. We do this in three steps: + ITC Avant Garde Gothic + + TeX Gyre Adventor ++ URW Gothic + URW Gothic L + + +@@ -441,6 +509,7 @@ but in an order preferring similar designs first. We do this in three steps: + + Bookman Old Style + TeX Gyre Bonum ++ Bookman URW + URW Bookman L + + +@@ -449,6 +518,7 @@ but in an order preferring similar designs first. We do this in three steps: + ITC Zapf Chancery + + TeX Gyre Chorus ++ Chancery URW + URW Chancery L + + +@@ -458,6 +528,7 @@ but in an order preferring similar designs first. We do this in three steps: + + Palatino Linotype + TeX Gyre Pagella ++ Palladio URW + URW Palladio L + + +@@ -467,6 +538,7 @@ but in an order preferring similar designs first. We do this in three steps: + + Century Schoolbook + TeX Gyre Schola ++ Century SchoolBook URW + Century Schoolbook L + + +diff --git a/conf.d/45-latin.conf b/conf.d/45-latin.conf +index 996fb81..72490f3 100644 +--- a/conf.d/45-latin.conf ++++ b/conf.d/45-latin.conf +@@ -34,6 +34,10 @@ + serif + + ++ Nimbus Roman ++ serif ++ ++ + Luxi Serif + serif + +@@ -97,6 +101,10 @@ + sans-serif + + ++ Nimbus Sans ++ sans-serif ++ ++ + Luxi Sans + sans-serif + +@@ -151,6 +159,10 @@ + Nimbus Mono L + monospace + ++ ++ Nimbus Mono ++ monospace ++ + +diff --git a/conf.d/60-latin.conf b/conf.d/60-latin.conf +index 2107e31..35600ea 100644 +--- a/conf.d/60-latin.conf ++++ b/conf.d/60-latin.conf +@@ -10,6 +10,7 @@ + Thorndale AMT + Luxi Serif + Nimbus Roman No9 L ++ Nimbus Roman + Times + + +@@ -23,6 +24,7 @@ + Albany AMT + Luxi Sans + Nimbus Sans L ++ Nimbus Sans + Helvetica + Lucida Sans Unicode + BPG Glaho International +@@ -40,6 +42,7 @@ + Cumberland AMT + Luxi Mono + Nimbus Mono L ++ Nimbus Mono + Courier + + +-- +cgit v0.10.2 + diff --git a/abs/core/fontconfig/29-replace-bitmap-fonts.conf b/abs/core/fontconfig/29-replace-bitmap-fonts.conf deleted file mode 100644 index 7ac4483..0000000 --- a/abs/core/fontconfig/29-replace-bitmap-fonts.conf +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - Helvetica - - - Arial - Liberation Sans - sans-serif - - - - - Courier - - - Courier New - Liberation Mono - monospace - - - - - Times - - - Times New Roman - Liberation Serif - serif - - - diff --git a/abs/core/fontconfig/PKGBUILD b/abs/core/fontconfig/PKGBUILD index 2919bb1..9f1fe17 100644 --- a/abs/core/fontconfig/PKGBUILD +++ b/abs/core/fontconfig/PKGBUILD @@ -3,19 +3,31 @@ pkgname=fontconfig pkgver=2.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64) url="http://www.fontconfig.org/release/" license=('custom') depends=('expat' 'freetype2') install=fontconfig.install -source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2) -sha256sums=('dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99') +source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2 + 0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch + 0002-Update-aliases-for-new-URW-fonts.patch) +sha256sums=('dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99' + '657d180d9d78555df4f1b81871ba9c1c7c6056c83455514950d064fdfae4646b' + '1194d1b92d228d8ed705f5502fdf4fcfad5a794f388bcb4928074df4c34a1bfb') # a nice page to test font matching: # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html +prepare() { + cd $pkgname-$pkgver + + # Upstream patches implementing FS#45928 + patch -p1 -i ../0001-Revert-Bug-73291-poppler-does-not-show-fl-ligature.patch + patch -p1 -i ../0002-Update-aliases-for-new-URW-fonts.patch +} + build() { cd $pkgname-$pkgver diff --git a/abs/core/fontconfig/fontconfig.install b/abs/core/fontconfig/fontconfig.install index 3a0ca57..961bba5 100644 --- a/abs/core/fontconfig/fontconfig.install +++ b/abs/core/fontconfig/fontconfig.install @@ -19,6 +19,7 @@ post_install() { _EOF echo -n "updating font cache... " + # a full forced directory scan is required here /usr/bin/fc-cache -f echo "done." } -- cgit v0.12 From 6bd9f7bc78dd2e5cc879a54604f4f83979dea69d Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 13:35:19 +0000 Subject: libspectre: rebuild --- abs/core/libspectre/PKGBUILD | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/abs/core/libspectre/PKGBUILD b/abs/core/libspectre/PKGBUILD index 0ee5052..b5f1755 100644 --- a/abs/core/libspectre/PKGBUILD +++ b/abs/core/libspectre/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 165038 2012-08-09 11:32:27Z jgc $ +# $Id$ # Maintainer: Jan de Groot pkgname=libspectre pkgver=0.2.7 -pkgrel=1 +pkgrel=2 pkgdesc="Small library for rendering Postscript documents" arch=('i686' 'x86_64') license=('GPL2') url="http://www.freedesktop.org/wiki/Software/libspectre" depends=('ghostscript>=9.00') -options=('!libtool') source=(http://libspectre.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) sha1sums=('a7efd97b82b84ff1bb7a0d88c7e35ad10cc84ea8') -- cgit v0.12 From 5c19a8c126d825f29dc3f8f340e9a1dffb295c62 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 13:37:00 +0000 Subject: cairo: rebuild --- abs/core/cairo/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/cairo/PKGBUILD b/abs/core/cairo/PKGBUILD index d0f8353..4fd5cfe 100644 --- a/abs/core/cairo/PKGBUILD +++ b/abs/core/cairo/PKGBUILD @@ -4,7 +4,7 @@ pkgname=cairo pkgver=1.14.6 -pkgrel=1 +pkgrel=2 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64) license=('LGPL' 'MPL') -- cgit v0.12 From c8a8f68d16379819909f8df703e5f2a538201fda Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 13:44:16 +0000 Subject: pycairo: renamed to python2-cairo --- abs/core/python_modules/__changelog | 1 - abs/core/python_modules/pycairo/PKGBUILD | 26 -------------------------- 2 files changed, 27 deletions(-) delete mode 100644 abs/core/python_modules/__changelog delete mode 100644 abs/core/python_modules/pycairo/PKGBUILD diff --git a/abs/core/python_modules/__changelog b/abs/core/python_modules/__changelog deleted file mode 100644 index 4a02fe3..0000000 --- a/abs/core/python_modules/__changelog +++ /dev/null @@ -1 +0,0 @@ -removed python from requirement --jm diff --git a/abs/core/python_modules/pycairo/PKGBUILD b/abs/core/python_modules/pycairo/PKGBUILD deleted file mode 100644 index 9adfcb5..0000000 --- a/abs/core/python_modules/pycairo/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 96553 2010-10-22 08:47:59Z jgc $ -# Maintainer: Jan de Groot - -pkgname=pycairo -pkgver=1.8.10 -pkgrel=4 -pkgdesc="Python bindings for the cairo graphics library" -arch=('i686' 'x86_64') -license=('LGPL' 'MPL') -depends=('python2' 'cairo>=1.8.10') -options=('!libtool') -source=(http://cairographics.org/releases/py2cairo-${pkgver}.tar.gz) -url="http://www.cairographics.org/pycairo" -md5sums=('87421a6a70304120555ba7ba238f3dc3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - PYTHON=python2 ./configure --prefix=/usr - make || return 1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 -} - -- cgit v0.12 From da49f66e6cf1bd0573fdbb8dee69455622b4db10 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 13:46:54 +0000 Subject: python2-cairo: rebuild --- abs/core/python_modules/python2-cairo/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/python_modules/python2-cairo/PKGBUILD b/abs/core/python_modules/python2-cairo/PKGBUILD index 52bf713..574eca2 100644 --- a/abs/core/python_modules/python2-cairo/PKGBUILD +++ b/abs/core/python_modules/python2-cairo/PKGBUILD @@ -3,7 +3,7 @@ pkgname=python2-cairo pkgver=1.10.0 -pkgrel=2 +pkgrel=3 pkgdesc="Python2 bindings for the cairo graphics library" arch=('i686' 'x86_64') license=('LGPL' 'MPL') -- cgit v0.12 From 6704135b5e60617ba55721632b7e8276b0736959 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 13:53:43 +0000 Subject: pygobject: update to 3.18.2 --- abs/core/python_modules/pygobject/PKGBUILD | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/abs/core/python_modules/pygobject/PKGBUILD b/abs/core/python_modules/pygobject/PKGBUILD index 32e4c31..fc8f1c7 100644 --- a/abs/core/python_modules/pygobject/PKGBUILD +++ b/abs/core/python_modules/pygobject/PKGBUILD @@ -3,34 +3,33 @@ pkgbase=pygobject pkgname=(python2-gobject pygobject-devel) -pkgver=3.12.1 +pkgver=3.18.2 pkgrel=1 arch=(i686 x86_64) url="https://live.gnome.org/PyGObject" license=(LGPL) makedepends=(python2 python2-cairo gobject-introspection gnome-common) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz) -sha256sums=('da5fe04759e862d347b26b53a6aea0affa7cbe858b7004475fa8c7929496da35') +source=(https://download.gnome.org/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz) +sha256sums=('2a3cad1517916b74e131e6002c3824361aee0671ffb0d55ded119477fc1c2c5f') prepare() { mkdir build-py2 build-py3 devel cd ${pkgbase}-${pkgver} - sed -i '/Werror=format/d' configure # gcc 4.8 } build() { cd build-py2 - ../${pkgbase}-${pkgver}/autogen.sh --prefix=/usr --with-python=/usr/bin/python2 + ../${pkgbase}-${pkgver}/configure --prefix=/usr --with-python=/usr/bin/python2 make # cd ../build-py3 -# ../${pkgbase}-${pkgver}/configure --prefix=/usr - make +# ../${pkgbase}-${pkgver}/configure --prefix=/usr --with-python=/usr/bin/python +# make } #package_python-gobject() { # pkgdesc="Python 3 bindings for GObject" -# depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver") +# depends=('gobject-introspection-runtime' "pygobject-devel=$pkgver" 'python' 'cairo') # cd build-py3 # make DESTDIR="$pkgdir" install @@ -39,15 +38,17 @@ build() { package_python2-gobject() { pkgdesc="Python 2 bindings for GObject" - depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver") + depends=('gobject-introspection-runtime' "pygobject-devel=$pkgver" 'python2' 'cairo') cd build-py2 make DESTDIR="$pkgdir" install mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel" + python2 -m compileall "$pkgdir"//usr/lib/python2.7/site-packages/gi } package_pygobject-devel() { pkgdesc="Development files for the pygobject bindings" + cd "devel" mkdir -p "$pkgdir"/usr/{include,lib} mv include "$pkgdir/usr/" -- cgit v0.12 From f0519dff7d8979cbe2c495890d7d02b01802993a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 14:02:33 +0000 Subject: pygobject2: update to 2.28.6-12 --- abs/core/python_modules/pygobject2/PKGBUILD | 35 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/abs/core/python_modules/pygobject2/PKGBUILD b/abs/core/python_modules/pygobject2/PKGBUILD index f4e921e..ba3d035 100644 --- a/abs/core/python_modules/pygobject2/PKGBUILD +++ b/abs/core/python_modules/pygobject2/PKGBUILD @@ -4,12 +4,11 @@ pkgbase=pygobject2 pkgname=(python2-gobject2 pygobject2-devel) pkgver=2.28.6 -pkgrel=9 +pkgrel=12 arch=(i686 x86_64) url="http://www.pygtk.org/" license=(LGPL) makedepends=(python2 git) -options=('!libtool') # pygobject-2-28 branch: https://git.gnome.org/browse/pygobject/log/?h=pygobject-2-28 source=('git://git.gnome.org/pygobject#commit=9456ba7') @@ -19,8 +18,11 @@ prepare() { cd pygobject autoreconf -fi - cd .. - cp -a pygobject python2-build + cp -a . ../python2-build + + find -O3 ../python2-build \ + \( -name '*.py' -o -name '*.py.in' \) \ + -exec sed -i '1s|python$|&2|' {} + } build() { @@ -30,22 +32,22 @@ build() { make cd ../pygobject - ./configure --prefix=/usr --disable-introspection - make +# ./configure --prefix=/usr --disable-introspection +# make } -package_python-gobject2() { - pkgdesc="Python 3 bindings for GObject2" - depends=(glib2 pygobject2-devel python) - replaces=(py3gobject) - provides=("py3gobject=$pkgver") +#package_python-gobject2() { +# pkgdesc="Python 3 bindings for GObject2" +# depends=(glib2 pygobject2-devel python) +# replaces=(py3gobject) +# provides=("py3gobject=$pkgver") - cd pygobject - make DESTDIR="$pkgdir" install +# cd pygobject +# make DESTDIR="$pkgdir" install # Delete devel stuff - rm -r "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} -} +# rm -r "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} +#} package_python2-gobject2() { pkgdesc="Python 2 bindings for GObject2" @@ -56,9 +58,6 @@ package_python2-gobject2() { cd python2-build make DESTDIR="$pkgdir" install - 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 -- cgit v0.12 From 3650722c0b2058006777cf4965fcc31fe636ee21 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 14:10:40 +0000 Subject: glade: initial inclusion. dep of vte3 --- abs/extra/glade/PKGBUILD | 33 +++++++++++++++++++++++++++++++++ abs/extra/glade/glade.install | 12 ++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 abs/extra/glade/PKGBUILD create mode 100644 abs/extra/glade/glade.install diff --git a/abs/extra/glade/PKGBUILD b/abs/extra/glade/PKGBUILD new file mode 100644 index 0000000..6d61747 --- /dev/null +++ b/abs/extra/glade/PKGBUILD @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Douglas Soares de Andrade + +pkgname=glade +pkgver=3.19.0 +pkgrel=1 +pkgdesc="User interface builder for GTK+ and GNOME." +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('gtk3' 'libxml2' 'desktop-file-utils') +makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'python2-gobject' 'itstool' 'docbook-xsl') +optdepends=('python2: Python widgets support' + 'devhelp: help browser') +url="http://glade.gnome.org/" +install=glade.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('a7a3f6d32fbfcc9b754b48a3410bf025e462bc7898e124f0ad8f64c3d7ad6fa2') + +prepare() { + cd "$pkgname-$pkgver" +} + +build() { + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/abs/extra/glade/glade.install b/abs/extra/glade/glade.install new file mode 100644 index 0000000..bce670a --- /dev/null +++ b/abs/extra/glade/glade.install @@ -0,0 +1,12 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} -- cgit v0.12 From a195b93cfc1e54f017e1cef62891b01d7a7abf30 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 14:16:37 +0000 Subject: nettle: update to 3.1.1 --- abs/core/nettle/PKGBUILD | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/abs/core/nettle/PKGBUILD b/abs/core/nettle/PKGBUILD index a017c92..0058dd2 100644 --- a/abs/core/nettle/PKGBUILD +++ b/abs/core/nettle/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: bender02 at gmx dot com pkgname=nettle -pkgver=2.7.1 +pkgver=3.1.1 pkgrel=1 pkgdesc="A low-level cryptographic library" arch=('i686' 'x86_64') @@ -11,15 +11,17 @@ url="http://www.lysator.liu.se/~nisse/nettle/" license=('GPL2') install=$pkgname.install depends=('gmp') -source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('003d5147911317931dd453520eb234a5' +checkdepends=('valgrind') +source=(https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) +md5sums=('b40fa88dc32f37a182b6b42092ebb144' 'SKIP') +validpgpkeys=('343C2FF0FBEE5EC2EDBEF399F3599FF828C67298') # Niels Möller build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --libdir=/usr/lib \ - --enable-shared + ./configure --prefix=/usr \ + --disable-static make } @@ -31,7 +33,4 @@ check() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install - - # 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 b1726cf316ff11205cd549f0204c526a5a3733e0 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 15:46:32 +0000 Subject: libarchive: rebuild for new nettle --- abs/core/libarchive/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/libarchive/PKGBUILD b/abs/core/libarchive/PKGBUILD index 3b1540f..4c45763 100644 --- a/abs/core/libarchive/PKGBUILD +++ b/abs/core/libarchive/PKGBUILD @@ -3,7 +3,7 @@ pkgname=libarchive pkgver=3.1.2 -pkgrel=8 +pkgrel=9 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64') url="http://libarchive.org/" -- cgit v0.12 From 2de71da67216715c56462ad41ac51aaf4594aebb Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 16:23:37 +0000 Subject: pacman: rebuild for new nettle --- abs/core/pacman/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD index 77838cf..c7f2af8 100644 --- a/abs/core/pacman/PKGBUILD +++ b/abs/core/pacman/PKGBUILD @@ -5,7 +5,7 @@ pkgname=pacman pkgver=4.2.1 -pkgrel=4 +pkgrel=5 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" -- cgit v0.12 From 65cc240f4d4a992f875a8f076c909187b6364634 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 16:26:38 +0000 Subject: libtasn1: update to 4.7 --- abs/core/libtasn1/PKGBUILD | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/abs/core/libtasn1/PKGBUILD b/abs/core/libtasn1/PKGBUILD index 20d5bf4..0942ca5 100644 --- a/abs/core/libtasn1/PKGBUILD +++ b/abs/core/libtasn1/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 160686 2012-06-03 18:36:06Z andyrtr $ +# $Id$ +# Maintainer: AndyRTR # Maintainer: Jan de Groot # Contributor: judd pkgname=libtasn1 -pkgver=2.13 +pkgver=4.7 pkgrel=1 pkgdesc="The ASN.1 library used in GNUTLS" arch=('i686' 'x86_64') license=('GPL3' 'LGPL') url="http://www.gnu.org/software/libtasn1/" depends=('glibc' 'texinfo') -options=('!libtool') install=libtasn1.install source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig}) -sha1sums=('89120584bfedd244dab92df99e955a174c481851' - '2f9ce2aef6c1bd78f462e95de531b2b61f59d13c') +md5sums=('12d10ca4ae0a3b95f7aa06a076da39ec' + 'SKIP') +validpgpkeys=('1F42418905D8206AA754CCDC29EE58B996865171') #Nikos Mavrogiannopoulos build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --with-packager=Archlinux \ --with-packager-bug-reports="http://bugs.archlinux.org/" \ @@ -26,11 +27,11 @@ build() { } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } -- cgit v0.12 From 82d1194c239d8fe0616d3434ac4ccf769892c297 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 16:32:17 +0000 Subject: readline: update to 6.3.008 --- abs/core/readline/PKGBUILD | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/abs/core/readline/PKGBUILD b/abs/core/readline/PKGBUILD index f8dfe0d..07b6b36 100644 --- a/abs/core/readline/PKGBUILD +++ b/abs/core/readline/PKGBUILD @@ -5,21 +5,22 @@ pkgname=readline _basever=6.3 -_patchlevel=006 +_patchlevel=008 pkgver=$_basever.$_patchlevel -pkgrel=1 +pkgrel=3 pkgdesc='GNU readline library' arch=('i686' 'x86_64') url='http://tiswww.case.edu/php/chet/readline/rltop.html' license=('GPL') -depends=('glibc' 'ncurses') +depends=('glibc' 'ncurses' 'libncursesw.so') backup=('etc/inputrc') options=('!emptydirs') install=readline.install source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig} inputrc) +validpgpkeys=('7C0135FB088AAF6C66C650B9BB5869F064EA74AB') # Chet Ramey -if [[ $_patchlevel -gt 0 ]]; then +if [ $_patchlevel -gt 0 ]; then for (( _p=1; _p <= $((10#${_patchlevel})); _p++ )); do source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//.}-$(printf "%03d" $_p){,.sig}) done @@ -65,4 +66,8 @@ md5sums=('33c8fb279e981274f485fd91da77e94a' '93721c31cd225393f80cb3aadb165544' 'SKIP' '71dc6ecce66d1489b96595f55d142a52' + 'SKIP' + '062a08ed60679d3c4878710b3d595b65' + 'SKIP' + 'ee1c04072154826870848d8b218d7b04' 'SKIP') -- cgit v0.12 From 31a50c5e5c5e2002d97ba48534300cf8e9dd198b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 16:37:33 +0000 Subject: p11-kit: update to 0.23.2 --- abs/core/p11-kit/PKGBUILD | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/abs/core/p11-kit/PKGBUILD b/abs/core/p11-kit/PKGBUILD index a0d282b..54c17ed 100644 --- a/abs/core/p11-kit/PKGBUILD +++ b/abs/core/p11-kit/PKGBUILD @@ -2,18 +2,19 @@ # Maintainer: Ionut Biru pkgname=p11-kit -pkgver=0.23.1 -pkgrel=2 +pkgver=0.23.2 +pkgrel=1 pkgdesc="Library to work with PKCS#11 modules" arch=(i686 x86_64) url="http://p11-glue.freedesktop.org" license=('BSD') depends=('glibc' 'libtasn1' 'libffi') +makedepends=('gtk-doc') source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig} libnssckbi-compat.patch) -md5sums=('96f073270c489c9a594e1c9413f42db8' - 'SKIP' - '8c3f119005908cf4a3e0ef0a0a310f14') +sha256sums=('ba726ea8303c97467a33fca50ee79b7b35212964be808ecf9b145e9042fdfaf0' + 'SKIP' + '8f763cdbc6c0ca6c5a7898f9fd6f3018b7ac5b1aca36f67c6c813343c2962962') validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF') prepare() { @@ -30,7 +31,11 @@ prepare() { build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc \ + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-doc \ --with-module-path=/usr/lib/pkcs11 \ --with-trust-paths=/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source make -- cgit v0.12 From fd3c28fbf41b6c9eb6c89d8afaa3894944c3fcbf Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 17:09:39 +0000 Subject: guile: update to 2.0.11 --- abs/extra/guile/PKGBUILD | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/abs/extra/guile/PKGBUILD b/abs/extra/guile/PKGBUILD index 50f10eb..642bf8a 100644 --- a/abs/extra/guile/PKGBUILD +++ b/abs/extra/guile/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 150868 2012-02-23 13:23:16Z ibiru $ +# $Id$ +# Maintainer: Jan de Groot +# Maintainer: Bartłomiej Piotrowski # Contributor: Tom Newsom -# Maintainer: Jan de Groot pkgname=guile -pkgver=1.8.8 -pkgrel=2 -pkgdesc="a portable, embeddable Scheme implementation written in C" -url="http://www.gnu.org/software/guile/" -arch=(i686 x86_64) +pkgver=2.0.11 +pkgrel=3 +pkgdesc='Portable, embeddable Scheme implementation written in C' +url='http://www.gnu.org/software/guile/' +arch=('i686' 'x86_64') license=('GPL') -depends=('gmp' 'libltdl' 'ncurses>=5.7' 'texinfo') +depends=('gmp' 'libltdl' 'ncurses' 'texinfo' 'libunistring' 'gc' 'libffi') install=guile.install -source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -options=('!libtool') -md5sums=('18661a8fdfef13e2fcb7651720aa53f3') +source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('e532c68c6f17822561e3001136635ddd') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr \ - --disable-static \ - --disable-error-on-warning - make LDFLAGS+="-lpthread" + --disable-static \ + --disable-error-on-warning + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make -C $pkgname-$pkgver DESTDIR="$pkgdir" install + rm "$pkgdir"/usr/lib/libguile-2.0.so.22.7.2-gdb.scm } -- cgit v0.12 From 798c41e8a221116ffcaae0342686ce1312d430f1 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 17:44:28 +0000 Subject: make: rebuild for new guile --- abs/core/make/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/make/PKGBUILD b/abs/core/make/PKGBUILD index 54ffd48..8851f98 100644 --- a/abs/core/make/PKGBUILD +++ b/abs/core/make/PKGBUILD @@ -4,7 +4,7 @@ pkgname=make pkgver=4.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNU make utility to maintain groups of programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/make" -- cgit v0.12 From df4680dd1b0f6080991747ea583ab61b272835bf Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 17:48:59 +0000 Subject: gnutils: update to 3.4.8 --- abs/core/gnutls/PKGBUILD | 46 +++++++++++++++++++++++++----------------- abs/core/gnutls/gnutls.install | 2 +- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/abs/core/gnutls/PKGBUILD b/abs/core/gnutls/PKGBUILD index e6d5075..f030c5a 100644 --- a/abs/core/gnutls/PKGBUILD +++ b/abs/core/gnutls/PKGBUILD @@ -1,41 +1,51 @@ -# $Id: PKGBUILD 162907 2012-07-03 15:25:08Z andyrtr $ +# $Id$ # Maintainer: Jan de Groot +# Maintainer: Andreas Radke pkgname=gnutls -pkgver=3.0.21 +pkgver=3.4.8 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') -license=('GPL3' 'LGPL') -url="http://www.gnu.org/software/gnutls/" +license=('GPL3' 'LGPL2.1') +url="http://www.gnutls.org/" install=gnutls.install -options=('!libtool' '!zipman') -depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12') -makedepends=('valgrind' 'strace') -source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('7480dff7115e5af85215893c06b3ac5c' - 'c84eb5e67f1498c60ea6fd6ba9045def') +options=('!zipman') +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') +optdepends=('guile: for use with Guile bindings') +source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('a26e6dd8d5ad92016e3f068795b89624' + 'SKIP') +validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F' + '1F42418905D8206AA754CCDC29EE58B996865171') + # "Simon Josefsson " + # "Nikos Mavrogiannopoulos build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} + + # disable libidn for security reasons: + # http://lists.gnupg.org/pipermail/gnutls-devel/2015-May/007582.html + ./configure --prefix=/usr \ --with-zlib \ --disable-static \ - --disable-guile \ - --disable-valgrind-tests + --without-idn \ + --enable-guile --with-guile-site-dir=no \ + --with-default-trust-store-pkcs11="pkcs11:model=p11-kit-trust;manufacturer=PKCS%2311%20Kit" make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -k check # passes all || /bin/true + cd ${pkgname}-${pkgver} + make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - - # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman + + # lots of .png files are put into infodir and are gzipped by makepkg! this needs to be fixed by using !zipman # gzip -9 all files in infodir and manpages manually find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \; find "$pkgdir/usr/share/man" -exec gzip -9 {} \; diff --git a/abs/core/gnutls/gnutls.install b/abs/core/gnutls/gnutls.install index e8c8e17..196a913 100644 --- a/abs/core/gnutls/gnutls.install +++ b/abs/core/gnutls/gnutls.install @@ -1,5 +1,5 @@ infodir=usr/share/info -filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info.gz) +filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info-5.gz gnutls.info-6.gz gnutls.info.gz gnutls-guile.info.gz) post_install() { [ -x usr/bin/install-info ] || return 0 -- cgit v0.12 From d29e321ff1656298347c228d3badb7d2bb010399 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 18:07:51 +0000 Subject: vte3: update to 0.42.1 --- abs/extra/vte3/PKGBUILD | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/abs/extra/vte3/PKGBUILD b/abs/extra/vte3/PKGBUILD index 1019be3..e7797d0 100644 --- a/abs/extra/vte3/PKGBUILD +++ b/abs/extra/vte3/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 160601 2012-06-02 20:33:51Z ibiru $ +# $Id$ # Maintainer: Ionut Biru pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.32.2 -pkgrel=1 +pkgver=0.42.1 +pkgrel=2 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64') license=('LGPL') -options=('!libtool' '!emptydirs') -makedepends=('intltool' 'gobject-introspection' 'gtk3') +options=('!emptydirs') +makedepends=('intltool' 'gobject-introspection' 'gtk3' 'vala' 'glade') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/GNOME/sources/vte/${pkgver%.*}/vte-$pkgver.tar.xz) -sha256sums=('d69ec071f7a380d8b8b981b35a9a0b891f37c4b6b17d08407f66ac98d619486a') +source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz) +sha256sums=('9e00e2e9e94f4202b979c871f407a8815890bc0f4a8448a08534f76ab0fc9d34') build() { cd "vte-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vte \ --localstatedir=/var --disable-static \ - --enable-introspection + --enable-introspection --enable-glade-catalogue + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool make } @@ -28,12 +29,12 @@ package_vte3(){ cd "vte-$pkgver" make DESTDIR="$pkgdir" install - rm "$pkgdir"/usr/lib/vte/gnome-pty-helper + rm "$pkgdir"/etc/profile.d/vte.sh } package_vte-common() { pkgdesc="Common files used by vte and vte3" cd "vte-$pkgver" - make -C gnome-pty-helper DESTDIR="$pkgdir" install + install -Dm644 src/vte.sh "$pkgdir"/etc/profile.d/vte.sh } -- cgit v0.12 From e71f11d9865f691b2269d23d8dc66ef5cd1e3daa Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 20:23:39 +0000 Subject: tilda: update to 1.3.1 --- abs/core/tilda/PKGBUILD | 48 ++++++++------------ abs/core/tilda/__changelog | 6 ++- abs/core/tilda/config_0 | 80 ++++++++++++++++++++++++++------- abs/core/tilda/tilda-conf-sigsegv.patch | 11 ----- abs/core/tilda/tilda-fix.patch | 24 ---------- abs/core/tilda/tilda-glib2.patch | 11 ----- abs/core/tilda/tilda.changelog | 52 ++++++++++++++++----- abs/core/tilda/tilda_hide.patch | 38 ++++++++-------- 8 files changed, 148 insertions(+), 122 deletions(-) delete mode 100644 abs/core/tilda/tilda-conf-sigsegv.patch delete mode 100644 abs/core/tilda/tilda-fix.patch delete mode 100644 abs/core/tilda/tilda-glib2.patch diff --git a/abs/core/tilda/PKGBUILD b/abs/core/tilda/PKGBUILD index 814a5c3..6c4c7e7 100644 --- a/abs/core/tilda/PKGBUILD +++ b/abs/core/tilda/PKGBUILD @@ -1,49 +1,37 @@ -# $Id: PKGBUILD 71879 2012-06-02 18:37:37Z jlichtblau $ -# Maintainer: Jaroslav Lichtblau +# $Id$ +# Maintainer: Jaroslav Lichtblau # Contributor: Douglas Soares de Andrade # Contributor: William Rea pkgname=tilda -pkgver=0.9.6 -pkgrel=7 -pkgdesc="Linux terminal based on classic terminals from first person shooter games" +pkgver=1.3.1 +pkgrel=2 +pkgdesc="A Gtk based drop down terminal for Linux and Unix" arch=('i686' 'x86_64') -url="http://tilda.sourceforge.net" +url="https://github.com/lanoxx/tilda" license=('GPL') -depends=('vte' 'confuse' 'libglade') -makedepends=('gawk') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz -tilda-fix.patch tilda-glib2.patch tilda-conf-sigsegv.patch config_0 tilda_hide.patch ) +depends=('vte3' 'confuse') +changelog=$pkgname.changelog +source=(https://github.com/lanoxx/$pkgname/archive/$pkgname-$pkgver.tar.gz + 'tilda_hide.patch' 'config_0') build() { - cd $srcdir/$pkgname-$pkgver - -# gdk && desktop file fix FS#25762 - patch -p0 -i ${srcdir}/$pkgname-fix.patch - -# glib2 fix - patch -p0 -i ${srcdir}/$pkgname-glib2.patch - -# fix segfaults on malformed config files FS#29754 - patch -p0 -i ${srcdir}/$pkgname-conf-sigsegv.patch + cd $pkgname-$pkgname-$pkgver patch -p0 -i ${srcdir}/tilda_hide.patch + ./autogen.sh ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgname-$pkgver - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install #default config - install -D -m 0755 $startdir/src/config_0 $startdir/pkg/etc/tilda_config - + install -D -m 0755 ${srcdir}/config_0 ${pkgdir}/etc/tilda_config } -md5sums=('b44ebe04fdfd312e9ddc5e0ed77f4289' - '6ca2c5ae5acd254b1e89b319b118b8e1' - 'f1fc7009418c2ed7b506d5c555f072cb' - '3e08a0b2d48bba69cf96bef1faeca429' - '754753190e0990cd6fba27b3c931bd0e' - '0cc3020eabc74d939b0b978944d11693') +md5sums=('2e1e40e73ccd4f03b3595b8842bb0397' + 'eae07ef0ffb2e9dee3ba5eec3e87b920' + 'e2fc4a2d0eb3205b1091e30f633b53f8') diff --git a/abs/core/tilda/__changelog b/abs/core/tilda/__changelog index b637dfd..153d015 100644 --- a/abs/core/tilda/__changelog +++ b/abs/core/tilda/__changelog @@ -1,2 +1,6 @@ tilda_hide patch -This stops tilda from showing the config wizard unless tilda is started with -C + This stops tilda from showing the config wizard unless tilda is started with -C + +add config_0 to /etc/tilda_config + /etc/X11/Session/LinHES will pull in /etc/tilda_config to ~/.config/tilda/ + and adjust the height and width of the window based on screen size diff --git a/abs/core/tilda/config_0 b/abs/core/tilda/config_0 index 198afd3..d3a7a33 100644 --- a/abs/core/tilda/config_0 +++ b/abs/core/tilda/config_0 @@ -1,28 +1,62 @@ -tilda_config_version = "0.9.6" -# image = "" +tilda_config_version = "1.3.1" # command = "" -font = "Monospace 15" +font = "DejaVu Sans Mono 14" key = "F3" +addtab_key = "t" +fullscreen_key = "F11" +toggle_transparency_key = "F12" +toggle_searchbar_key = "f" +closetab_key = "w" +nexttab_key = "Page_Down" +prevtab_key = "Page_Up" +movetableft_key = "Page_Up" +movetabright_key = "Page_Down" +gototab_1_key = "1" +gototab_2_key = "2" +gototab_3_key = "3" +gototab_4_key = "4" +gototab_5_key = "5" +gototab_6_key = "6" +gototab_7_key = "7" +gototab_8_key = "8" +gototab_9_key = "9" +gototab_10_key = "0" +copy_key = "c" +paste_key = "v" +quit_key = "q" title = "Tilda" background_color = "white" # working_dir = "" -web_browser = "firefox" -lines = 7000 -max_width = 1612 -max_height = 532 +web_browser = "google-chrome" +increase_font_size_key = "equal" +decrease_font_size_key = "minus" +normalize_font_size_key = "0" +# show_on_monitor = "" +word_chars = "-A-Za-z0-9,./?%&#:_" +lines = 8000 +max_width = 921 +max_height = 350 min_width = 1 min_height = 1 -transparency = 0 -x_pos = 1114 +x_pos = 51 y_pos = 0 -tab_pos = 1 +tab_pos = 0 backspace_key = 0 delete_key = 1 d_set_title = 3 command_exit = 2 -scheme = 3 -slide_sleep_usec = 14607 +scheme = 0 +slide_sleep_usec = 10000 animation_orientation = 0 +timer_resolution = 200 +auto_hide_time = 2000 +on_last_terminal_exit = 2 +palette_scheme = 0 +non_focus_pull_up_behaviour = 0 +cursor_shape = 0 +# show_on_monitor_number = 0 +title_max_length = 25 +palette = {11822, 13364, 13878, 52428, 0, 0, 20046, 39578, 1542, 50372, 41120, 0, 13364, 25957, 42148, 30069, 20560, 31611, 1542, 38944, 39578, 54227, 55255, 53199, 21845, 22359, 21331, 61423, 10537, 10537, 35466, 58082, 13364, 64764, 59881, 20303, 29298, 40863, 53199, 44461, 32639, 43176, 13364, 58082, 58082, 61166, 61166, 60652} scrollbar_pos = 2 back_red = 0 back_green = 0 @@ -30,12 +64,14 @@ back_blue = 0 text_red = 65535 text_green = 65535 text_blue = 65535 -scroll_background = true +cursor_red = 60395 +cursor_green = 47288 +cursor_blue = 7196 +scroll_history_infinite = false scroll_on_output = false -notebook_border = true +notebook_border = false antialias = true scrollbar = false -use_image = false grab_focus = true above = true notaskbar = true @@ -45,9 +81,21 @@ scroll_on_key = true bell = false run_command = false pinned = true -animation = false +animation = true hidden = true +set_as_desktop = false centered_horizontally = true centered_vertically = false enable_transparency = false double_buffer = false +auto_hide_on_focus_lost = false +auto_hide_on_mouse_leave = false +title_max_length_flag = true +inherit_working_dir = true +command_login_shell = false +start_fullscreen = false +# image = "" +# scroll_background = false +# use_image = false +transparency = 0 +back_alpha = 65535 diff --git a/abs/core/tilda/tilda-conf-sigsegv.patch b/abs/core/tilda/tilda-conf-sigsegv.patch deleted file mode 100644 index a48aad0..0000000 --- a/abs/core/tilda/tilda-conf-sigsegv.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/key_grabber.c 2008-04-08 00:12:31.000000000 +0200 -+++ src/key_grabber.c 2012-05-17 19:43:25.227699421 +0200 -@@ -257,7 +257,7 @@ - gboolean tilda_keygrabber_bind (const gchar *keystr, tilda_window *tw) - { - /* Empty strings are no good */ -- if (strcmp ("", keystr) == 0) -+ if (!keystr || strcmp ("", keystr) == 0) - return FALSE; - - return tomboy_keybinder_bind (keystr, onKeybindingPull, tw); diff --git a/abs/core/tilda/tilda-fix.patch b/abs/core/tilda/tilda-fix.patch deleted file mode 100644 index a6d273c..0000000 --- a/abs/core/tilda/tilda-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/key_grabber.c 2008-04-08 01:12:31.000000000 +0300 -+++ src/key_grabber.c 2009-10-16 17:39:16.399679408 +0300 -@@ -190,7 +190,7 @@ - * Overriding the user time here seems to work a lot better than calling - * gtk_window_present_with_time() here, or at the end of the function. I have - * no idea why, they should do the same thing. */ -- gdk_x11_window_set_user_time (GTK_WIDGET(tw->window)->window, -+ gdk_x11_window_set_user_time (GTK_WIDGET(tw->window), - tomboy_keybinder_get_current_event_time()); - gtk_window_move (GTK_WINDOW(tw->window), config_getint ("x_pos"), config_getint ("y_pos")); - gtk_widget_show (GTK_WIDGET(tw->window)); - ---- tilda.desktop.in 2007-03-16 04:53:34.000000000 +0100 -+++ tilda.desktop.in 2011-08-28 19:08:53.000000000 +0200 -@@ -2 +1,0 @@ --Encoding=UTF-8 -@@ -4,2 +3,2 @@ --Exec=@BINDIR@/tilda --Icon=@PIXMAPSDIR@/tilda.png -+Exec=tilda -+Icon=tilda -@@ -8 +7 @@ --Categories=GNOME;GTK;Application;Utility;TerminalEmulator; -+Categories=GNOME;GTK;Utility;TerminalEmulator;System; diff --git a/abs/core/tilda/tilda-glib2.patch b/abs/core/tilda/tilda-glib2.patch deleted file mode 100644 index 2d048e5..0000000 --- a/abs/core/tilda/tilda-glib2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/tomboykeybinder.h 2007-07-15 04:31:19.000000000 +0200 -+++ src/tomboykeybinder.h 2012-05-17 19:42:06.613150329 +0200 -@@ -2,7 +2,7 @@ - #ifndef __TOMBOY_KEY_BINDER_H__ - #define __TOMBOY_KEY_BINDER_H__ - --#include -+//#include - - G_BEGIN_DECLS - diff --git a/abs/core/tilda/tilda.changelog b/abs/core/tilda/tilda.changelog index 4248e9a..714a4ae 100644 --- a/abs/core/tilda/tilda.changelog +++ b/abs/core/tilda/tilda.changelog @@ -1,20 +1,52 @@ -2012-06-02 Jaroslav Lichtblau +2016-01-02 Jaroslav Lichtblau + * tilda 1.3.1-1 - * FS#29754 fixed +2015-11-18 Jaroslav Lichtblau + * tilda 1.3.0-1 -2011-08-28 Jaroslav Lichtblau +2015-06-28 Jaroslav Lichtblau + * tilda 1.2.4-1 - * FS#25762 fixed +2014-10-31 Jaroslav Lichtblau + * tilda 1.2.2-1 -2008-04-29 Mateusz Herych +2014-10-17 Jaroslav Lichtblau + * tilda 1.2.1-1 - * Updated for x86_64 - 0.9.6 +2014-10-16 Jaroslav Lichtblau + * tilda 1.2-1 -2008-04-28 Douglas Soares de Andrade +2014-09-26 Jaroslav Lichtblau + * tilda 1.1.13-1 - * Updated for i686 - 0.9.6 +2014-06-05 Jaroslav Lichtblau + * tilda 1.1.12-1 -2007-12-30 Douglas Soares de Andrade +2013-12-14 Jaroslav Lichtblau + * tilda 1.1.10-1 - * Updated to newer version - 0.9.5 +2013-11-17 Jaroslav Lichtblau + * tilda 1.1.8-1 + +2013-08-22 Maxime Gauduin + * tilda 1.1.7-3 + * Fixes FS#36542, FS#36516 and FS#36543 + +2013-08-08 Jaroslav Lichtblau + * tilda 1.1.7-1 + +2012-06-02 Jaroslav Lichtblau + * FS#29754 fixed + +2011-08-28 Jaroslav Lichtblau + * FS#25762 fixed + +2008-04-29 Mateusz Herych + * Updated for x86_64 - 0.9.6 + +2008-04-28 Douglas Soares de Andrade + * Updated for i686 - 0.9.6 + +2007-12-30 Douglas Soares de Andrade + * Updated to newer version - 0.9.5 diff --git a/abs/core/tilda/tilda_hide.patch b/abs/core/tilda/tilda_hide.patch index 19d2869..a9d586f 100644 --- a/abs/core/tilda/tilda_hide.patch +++ b/abs/core/tilda/tilda_hide.patch @@ -1,35 +1,35 @@ ---- src/tilda.c.orig 2012-12-10 13:11:23.336581090 -0600 -+++ src/tilda.c 2012-12-10 13:44:31.543784376 -0600 -@@ -582,11 +582,11 @@ - if (access (tw->config_file, R_OK) == -1) +--- src/tilda.c.orig 2016-01-21 18:11:13.800212725 +0000 ++++ src/tilda.c 2016-01-21 18:17:31.901530136 +0000 +@@ -772,11 +772,11 @@ + if (access (tw.config_file, R_OK) == -1) { /* We probably need a default key, too ... */ -- gchar *default_key = g_strdup_printf ("F%d", tw->instance+1); -+ gchar *default_key = g_strdup_printf ("F%d", tw->instance+3); +- gchar *default_key = g_strdup_printf ("F%d", tw.instance+1); ++ gchar *default_key = g_strdup_printf ("F%d", tw.instance+3); config_setstr ("key", default_key); g_free (default_key); - need_wizard = TRUE; -+// need_wizard = TRUE; ++// need_wizard = TRUE; } /* Show the wizard if we need to. -@@ -598,12 +598,12 @@ - { - gint ret = tilda_keygrabber_bind (config_getstr ("key"), tw); +@@ -788,12 +788,12 @@ + } else { + gint ret = tilda_keygrabber_bind (config_getstr ("key"), &tw); - if (!ret) - { - /* The key was unbindable, so we need to show the wizard */ -- show_invalid_keybinding_dialog (NULL); -- wizard (tw); +- show_invalid_keybinding_dialog (NULL, _("The keybinding you chose for \"Pull Down Terminal\" is invalid. Please choose another.")); +- wizard (&tw); - } -+// if (!ret) -+// { -+// /* The key was unbindable, so we need to show the wizard */ -+// show_invalid_keybinding_dialog (NULL); -+// wizard (tw); -+// } ++// if (!ret) ++// { ++// /* The key was unbindable, so we need to show the wizard */ ++// show_invalid_keybinding_dialog (NULL, _("The keybinding you chose for \"Pull Down Terminal\" is invalid. Please choose another.")); ++// wizard (&tw); ++// } } - if (config_getbool ("hidden")) + pull (&tw, config_getbool ("hidden") ? PULL_UP : PULL_DOWN, FALSE); -- cgit v0.12 From 37a05f90e899430a2357f5deeb173e11e018d389 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 20:25:50 +0000 Subject: LinHES-system: LinHES-session: adjust for new tilda version --- abs/core/LinHES-system/LinHES-session | 30 ++++++++++++++---------------- abs/core/LinHES-system/PKGBUILD | 6 +++--- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session index ad8fb3c..c2b9b03 100755 --- a/abs/core/LinHES-system/LinHES-session +++ b/abs/core/LinHES-system/LinHES-session @@ -88,36 +88,34 @@ function load_nvidia_settings(){ function run_tilda(){ if [ -f /usr/bin/tilda ] then - if [ ! -e ~/.tilda/config_0 ] + if [ ! -e ~/.config/tilda/config_0 ] then - mkdir -p ~/.tilda/ + mkdir -p ~/.config/tilda/ fi width=`/usr/bin/xwininfo -root|grep Width | awk '{ print $2}'` height=`/usr/bin/xwininfo -root|grep Height | awk '{ print $2}'` center=$[width/2] - sixtypercent=`echo "scale=0; ( $width*.6) / 1" |bc` - quarter_height=`echo "scale=0; ($height*.35) /1" |bc` + tilda_width=`echo "scale=0; ( $width*.9) / 1" |bc` + tilda_height=`echo "scale=0; ($height*.4) /1" |bc` - - if [ $sixtypercent -lt 700 ] - then - sixtypercent=700 + if [ $tilda_width -lt 700 ] + then + tilda_width=700 fi - if [ $quarter_height -lt 350 ] - then - quarter_height=350 + if [ $tilda_height -lt 350 ] + then + tilda_height=350 fi - startloc=`echo "scale=0 ; (${center}-(${sixtypercent})/2) / 1" |bc` + startloc=`echo "scale=0 ; (${center}-(${tilda_width})/2) / 1" |bc` - sed -e "s/^max_width.*$/max_width = $sixtypercent/" \ - -e "s/^max_height.*$/max_height = $quarter_height/" \ - -e "s/^x_pos.*$/x_pos = $startloc/g" /etc/tilda_config > ~/.tilda/config_0 + sed -e "s/^max_width.*$/max_width = $tilda_width/" \ + -e "s/^max_height.*$/max_height = $tilda_height/" \ + -e "s/^x_pos.*$/x_pos = $startloc/g" /etc/tilda_config > ~/.config/tilda/config_0 /usr/bin/tilda -h & - fi } diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 5501add..9c7d50b 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system -pkgver=8.3 -pkgrel=24 +pkgver=8.4 +pkgrel=1 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -79,7 +79,7 @@ package() { } -md5sums=('76842f8cff548d2c1289e0992a8b84dd' +md5sums=('c03d5e54f00e404c561c7dc69fff9168' 'ad5e144999b6f37931dea799c2761c7e' 'de32a1c50101265dd7f6ca5037f7a26a' '2d7b8414ddce5f401331342ac1529c22' -- cgit v0.12 From 80a07018ddc505831c8f24cd19ca2eac35d62838 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 21:16:08 +0000 Subject: tilda: increase font size and kill animation --- abs/core/tilda/PKGBUILD | 4 ++-- abs/core/tilda/config_0 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/abs/core/tilda/PKGBUILD b/abs/core/tilda/PKGBUILD index 6c4c7e7..85a7d17 100644 --- a/abs/core/tilda/PKGBUILD +++ b/abs/core/tilda/PKGBUILD @@ -5,7 +5,7 @@ pkgname=tilda pkgver=1.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="A Gtk based drop down terminal for Linux and Unix" arch=('i686' 'x86_64') url="https://github.com/lanoxx/tilda" @@ -34,4 +34,4 @@ package() { } md5sums=('2e1e40e73ccd4f03b3595b8842bb0397' 'eae07ef0ffb2e9dee3ba5eec3e87b920' - 'e2fc4a2d0eb3205b1091e30f633b53f8') + 'e2a091d91105b99b6f0a0ce37b13b975') diff --git a/abs/core/tilda/config_0 b/abs/core/tilda/config_0 index d3a7a33..7cf7b30 100644 --- a/abs/core/tilda/config_0 +++ b/abs/core/tilda/config_0 @@ -1,6 +1,6 @@ tilda_config_version = "1.3.1" # command = "" -font = "DejaVu Sans Mono 14" +font = "DejaVu Sans Mono 16" key = "F3" addtab_key = "t" fullscreen_key = "F11" @@ -81,7 +81,7 @@ scroll_on_key = true bell = false run_command = false pinned = true -animation = true +animation = false hidden = true set_as_desktop = false centered_horizontally = true -- cgit v0.12 From 1f33ceeadc724f49b95531f7f54fa33ccf6c204a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Jan 2016 22:27:18 +0000 Subject: linhes-theme: adjust main menu --- abs/core/linhes-theme/PKGBUILD | 4 +- abs/core/linhes-theme/menu-ui-vert.xml.patch | 59 +++++++++++++++++----------- 2 files changed, 39 insertions(+), 24 deletions(-) diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index e3af746..952f559 100644 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-theme pkgver=8.4 -pkgrel=1 +pkgrel=2 pkgdesc="Default LinHES MythTV theme" arch=('i686' 'x86_64') license=('GPL2') @@ -85,7 +85,7 @@ package() { md5sums=('2dca856c2a4d1f959473512c94e43b60' '13bff6425487194cc7bc622e64c6176a' 'f2b9c85519e80843294315a42870e582' - 'e17b628a6a9d8e0bdb20f6f5e0651a0c' + '23d7e1400b4b192046896e57c509b548' '22ff4044c8c29560451fb51dcbf4d44e' '9fe3371a8b964a7028126405cfaa330b' '919d02ffb789b2ec3c1fd5d2866d12dc' diff --git a/abs/core/linhes-theme/menu-ui-vert.xml.patch b/abs/core/linhes-theme/menu-ui-vert.xml.patch index 543b638..05e597d 100644 --- a/abs/core/linhes-theme/menu-ui-vert.xml.patch +++ b/abs/core/linhes-theme/menu-ui-vert.xml.patch @@ -1,30 +1,45 @@ --- menu-ui-vert.xml.orig 2016-01-13 18:48:20.631382184 +0000 -+++ menu-ui-vert.xml 2016-01-13 18:24:57.804680515 +0000 -@@ -18,6 +18,41 @@ - 394,0,2,720 ++++ menu-ui-vert.xml 2016-01-21 22:25:26.290989767 +0000 +@@ -6,18 +6,53 @@ + 0,0,1280,720 + + +- 87,0,310,720 ++ 77,0,330,720 + box + + + +- 88,0,2,720 ++ 78,0,2,720 + + + +- 394,0,2,720 ++ 404,0,2,720 + - - - - -- cgit v0.12 From ed53e91449ab21a84f101ecfca43411775e50d42 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 28 Jan 2016 22:04:19 +0000 Subject: flashplugin: update to 11.2.202.559 --- abs/extra/flashplugin/PKGBUILD | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/abs/extra/flashplugin/PKGBUILD b/abs/extra/flashplugin/PKGBUILD index c78fd36..454c4a3 100644 --- a/abs/extra/flashplugin/PKGBUILD +++ b/abs/extra/flashplugin/PKGBUILD @@ -4,7 +4,7 @@ pkgname=flashplugin _licensefile='PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf' -pkgver=11.2.202.425 +pkgver=11.2.202.559 pkgrel=1 pkgdesc='Adobe Flash Player' url='http://get.adobe.com/flashplayer' @@ -16,22 +16,14 @@ license=('custom') options=(!strip) install=flashplugin.install backup=(etc/adobe/mms.cfg) - -if [ "$CARCH" = "i686" ]; then - source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.i386.tar.gz" - "http://www.adobe.com/products/eulas/pdfs/${_licensefile}" - mms.cfg) - md5sums=('3de010fba558cf5d8c66892456b0ed33' - '94ca2aecb409abfe36494d1a7ec7591d' - 'f34aae6279b40e0bd2abfb0d9963d7b8') -elif [ "$CARCH" = "x86_64" ]; then - source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.x86_64.tar.gz" - "http://www.adobe.com/products/eulas/pdfs/${_licensefile}" - mms.cfg) - md5sums=('a060430d0900dd98252b9102ec1a32d6' - '94ca2aecb409abfe36494d1a7ec7591d' - 'f34aae6279b40e0bd2abfb0d9963d7b8') -fi +source=(http://www.adobe.com/products/eulas/pdfs/${_licensefile} + mms.cfg) +source_i686=(flashplugin_$pkgver.i386.tar.gz::http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.i386.tar.gz) +source_x86_64=(flashplugin_$pkgver.x86_64.tar.gz::http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.x86_64.tar.gz) +md5sums=('94ca2aecb409abfe36494d1a7ec7591d' + 'f34aae6279b40e0bd2abfb0d9963d7b8') +md5sums_i686=('b133fef5420808363d80235ac56a47e1') +md5sums_x86_64=('f88b62884ef00d4b8735a3391caf35d4') package () { install -Dm755 libflashplayer.so "$pkgdir/usr/lib/mozilla/plugins/libflashplayer.so" @@ -50,6 +42,3 @@ package () { install -Dm644 "${_licensefile}" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.pdf" install -Dm644 mms.cfg "$pkgdir/etc/adobe/mms.cfg" } -md5sums=('719258340ba34eda72495187b8148f75' - '94ca2aecb409abfe36494d1a7ec7591d' - 'f34aae6279b40e0bd2abfb0d9963d7b8') -- cgit v0.12 From aabf8dad99ceae0d0f58d8cc43f88e0198f97ce8 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 28 Jan 2016 22:10:21 +0000 Subject: iproute2: update to 4.1.1 --- abs/core/iproute2/PKGBUILD | 37 +++++----- abs/core/iproute2/iproute2-fhs.patch | 132 +++++++++++++++++++---------------- 2 files changed, 92 insertions(+), 77 deletions(-) diff --git a/abs/core/iproute2/PKGBUILD b/abs/core/iproute2/PKGBUILD index e1f1683..4a6bcc0 100644 --- a/abs/core/iproute2/PKGBUILD +++ b/abs/core/iproute2/PKGBUILD @@ -3,14 +3,14 @@ # Contributor: Judd Vinet pkgname=iproute2 -pkgver=3.17.0 +pkgver=4.1.1 pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') license=('GPL2') url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" depends=('glibc' 'iptables') -makedepends=('linux-atm' 'git') +makedepends=('linux-atm') optdepends=('linux-atm: ATM support') groups=('base') provides=('iproute') @@ -19,44 +19,47 @@ replaces=('iproute') options=('staticlibs' '!makeflags') backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') -#source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz -source=(git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git#tag=v$pkgver +validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger +source=("http://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign} iproute2-fhs.patch unwanted-link-help.patch) -sha1sums=('SKIP' - '35b8cf2dc94b73eccad427235c07596146cd6f6c' +sha1sums=('750c17e720b43041c23fed7b8cf0118c0e841036' + 'SKIP' + '2dc6d8f1a2495a0d51eaa303dcc78ecc0c477935' '3b1335f4025f657f388fbf4e5a740871e3129c2a') prepare() { - cd "$srcdir/$pkgname" + cd "${srcdir}/${pkgname}-${pkgver}" # set correct fhs structure - patch -Np1 -i "$srcdir/iproute2-fhs.patch" + patch -Np1 -i "${srcdir}/iproute2-fhs.patch" # allow operations on links called "h", "he", "hel", "help" - patch -Np1 -i "$srcdir/unwanted-link-help.patch" + patch -Np1 -i "${srcdir}/unwanted-link-help.patch" # do not treat warnings as errors sed -i 's/-Werror//' Makefile + } build() { - cd "$srcdir/$pkgname" + cd "${srcdir}/${pkgname}-${pkgver}" ./configure make } package() { - cd "$srcdir/$pkgname" + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install # libnetlink isn't installed, install it FS#19385 - install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h" - install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a" + install -Dm644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h" + install -Dm644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a" + + # move binaries + cd "${pkgdir}" + mv sbin usr/bin - # usrmove - cd "$pkgdir" - mv usr/sbin usr/bin } diff --git a/abs/core/iproute2/iproute2-fhs.patch b/abs/core/iproute2/iproute2-fhs.patch index add3635..f632b64 100644 --- a/abs/core/iproute2/iproute2-fhs.patch +++ b/abs/core/iproute2/iproute2-fhs.patch @@ -1,75 +1,87 @@ -diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile ---- iproute2-3.4.0/Makefile 2012-05-21 23:12:19.000000000 +0200 -+++ iproute2-3.4.0.new/Makefile 2012-06-18 10:23:53.896760158 +0200 -@@ -1,7 +1,8 @@ - ROOTDIR=$(DESTDIR) - PREFIX=/usr - LIBDIR=$(PREFIX)/lib --SBINDIR=/sbin -+SBINDIR=/usr/sbin -+SHAREDIR=/usr/share - CONFDIR=/etc/iproute2 - DATADIR=$(PREFIX)/share - DOCDIR=$(DATADIR)/doc/iproute2 -diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile ---- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.000000000 +0200 -+++ iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +0200 -@@ -20,9 +20,9 @@ +diff --git a/Makefile b/Makefile +index 67176be..6549447 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,7 +13,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include + + SHARED_LIBS = y + +-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" ++DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DDATADIR=\"$(DATADIR)\" + ifneq ($(SHARED_LIBS),y) + DEFINES+= -DNO_SHARED_LIBS + endif +diff --git a/netem/Makefile b/netem/Makefile +index e52e125..5b4d283 100644 +--- a/netem/Makefile ++++ b/netem/Makefile +@@ -20,9 +20,9 @@ stats: stats.c $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm install: all - mkdir -p $(DESTDIR)$(LIBDIR)/tc -+ mkdir -p $(DESTDIR)$(SHAREDIR)/tc ++ mkdir -p $(DESTDIR)$(DATADIR)/tc for i in $(DISTDATA); \ - do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \ -+ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \ ++ do install -m 644 $$i $(DESTDIR)$(DATADIR)/tc; \ done clean: -diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile ---- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.000000000 +0200 -+++ iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200 -@@ -105,18 +105,11 @@ - $(AR) rcs $@ $(TCLIB) - - install: all -- mkdir -p $(MODDESTDIR) -+ mkdir -p $(DESTDIR)$(LIBDIR)/tc - install -m 0755 tc $(DESTDIR)$(SBINDIR) - for i in $(TCSO); \ -- do install -m 755 $$i $(MODDESTDIR); \ -+ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ - done -- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \ -- if [ -f $(MODDESTDIR)/m_xt.so ]; \ -- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \ -- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \ -- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \ -- fi; \ -- fi +diff --git a/tc/q_netem.c b/tc/q_netem.c +index cd990a0..7d4e71f 100644 +--- a/tc/q_netem.c ++++ b/tc/q_netem.c +@@ -113,7 +113,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata) + char *line = NULL; + char name[128]; - clean: - rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \ -diff -Naur iproute2-3.4.0/tc/tc_util.c iproute2-3.4.0.new/tc/tc_util.c ---- iproute2-3.4.0/tc/tc_util.c 2012-05-21 23:12:19.000000000 +0200 -+++ iproute2-3.4.0.new/tc/tc_util.c 2012-06-18 10:23:53.893426840 +0200 -@@ -24,8 +24,8 @@ - #include "utils.h" - #include "tc_util.h" - --#ifndef LIBDIR --#define LIBDIR "/usr/lib" -+#ifndef SHAREDIR -+#define SHAREDIR "/usr/share" +- snprintf(name, sizeof(name), "%s/%s.dist", get_tc_lib(), type); ++ snprintf(name, sizeof(name), "%s/%s.dist", get_tc_datadir(), type); + if ((f = fopen(name, "r")) == NULL) { + fprintf(stderr, "No distribution data for %s (%s: %s)\n", + type, name, strerror(errno)); +diff --git a/tc/tc_util.c b/tc/tc_util.c +index aa6de24..22bb6d5 100644 +--- a/tc/tc_util.c ++++ b/tc/tc_util.c +@@ -32,6 +32,10 @@ + #define LIBDIR "/usr/lib" #endif - const char *get_tc_lib(void) -@@ -34,7 +34,7 @@ - - lib_dir = getenv("TC_LIB_DIR"); - if (!lib_dir) -- lib_dir = LIBDIR "/tc/"; -+ lib_dir = SHAREDIR "/tc/"; ++#ifndef DATADIR ++#define DATADIR "/usr/share" ++#endif ++ + static struct db_names *cls_names = NULL; + #define NAMES_DB "/etc/iproute2/tc_cls" +@@ -73,6 +77,17 @@ const char *get_tc_lib(void) return lib_dir; } + ++const char *get_tc_datadir(void) ++{ ++ const char *data_dir; ++ ++ data_dir = getenv("TC_DATA_DIR"); ++ if (!data_dir) ++ data_dir = DATADIR "/tc/"; ++ ++ return data_dir; ++} ++ + int get_qdisc_handle(__u32 *h, const char *str) + { + __u32 maj; +diff --git a/tc/tc_util.h b/tc/tc_util.h +index 61e60b1..6d448de 100644 +--- a/tc/tc_util.h ++++ b/tc/tc_util.h +@@ -55,6 +55,7 @@ struct exec_util { + }; + + extern const char *get_tc_lib(void); ++extern const char *get_tc_datadir(void); + + extern struct qdisc_util *get_qdisc_kind(const char *str); + extern struct filter_util *get_filter_kind(const char *str); -- cgit v0.12 From 56a3a6b21c534b4ede87f14f01b67e58ca645a6b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 28 Jan 2016 22:24:06 +0000 Subject: libatasmart: update to 0.19-3 --- .../0001-Dont-test-undefined-bits.patch | 28 +++++++ ...2-Drop-our-own-many-bad-sectors-heuristic.patch | 93 ++++++++++++++++++++++ abs/core/libatasmart/PKGBUILD | 21 +++-- 3 files changed, 137 insertions(+), 5 deletions(-) create mode 100644 abs/core/libatasmart/0001-Dont-test-undefined-bits.patch create mode 100644 abs/core/libatasmart/0002-Drop-our-own-many-bad-sectors-heuristic.patch diff --git a/abs/core/libatasmart/0001-Dont-test-undefined-bits.patch b/abs/core/libatasmart/0001-Dont-test-undefined-bits.patch new file mode 100644 index 0000000..9b32bba --- /dev/null +++ b/abs/core/libatasmart/0001-Dont-test-undefined-bits.patch @@ -0,0 +1,28 @@ +Author: Phillip Susi +Subject: fix an incorrect IO error reading SMART status +Description: The read SMART status command's return status + was testing for a success/failure value that included 8 + bits that are "N/A" according to the standard, and required + that they be zeros. At least some drives do not fill them + with zeros, so correct this by masking off the undefined + bits. +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61998 +Bug-Ubuntu: https://launchpad.net/bugs/1143495 + +Index: b/atasmart.c +=================================================================== +--- a/atasmart.c ++++ b/atasmart.c +@@ -925,10 +925,10 @@ + /* SAT/USB bridges truncate packets, so we only check for 4F, + * not for 2C on those */ + if ((d->type == SK_DISK_TYPE_ATA_PASSTHROUGH_12 || cmd[3] == htons(0x00C2U)) && +- cmd[4] == htons(0x4F00U)) ++ (cmd[4] & htons(0xFF00U)) == htons(0x4F00U)) + *good = TRUE; + else if ((d->type == SK_DISK_TYPE_ATA_PASSTHROUGH_12 || cmd[3] == htons(0x002CU)) && +- cmd[4] == htons(0xF400U)) ++ (cmd[4] & htons(0xFF00U)) == htons(0xF400U)) + *good = FALSE; + else { + errno = EIO; diff --git a/abs/core/libatasmart/0002-Drop-our-own-many-bad-sectors-heuristic.patch b/abs/core/libatasmart/0002-Drop-our-own-many-bad-sectors-heuristic.patch new file mode 100644 index 0000000..0655ca4 --- /dev/null +++ b/abs/core/libatasmart/0002-Drop-our-own-many-bad-sectors-heuristic.patch @@ -0,0 +1,93 @@ +From 6846b7c2431dbeaddd9f931c609b522c04e55732 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Fri, 19 Mar 2010 14:56:06 +0100 +Subject: [PATCH 2/2] Drop our own "many bad sectors" heuristic + +This currently causes a lot of false positives, because in many cases our +threshold is either overly pessimistically low, or the raw value is implausibly +high. Just use the normalized values vs. threshold for now. + +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=25772 +Bug-Ubuntu: https://launchpad.net/bugs/438136 +--- + atasmart.c | 33 +++++++++++---------------------- + 1 files changed, 11 insertions(+), 22 deletions(-) + +Index: libatasmart/atasmart.c +=================================================================== +--- libatasmart.orig/atasmart.c 2012-05-23 08:34:14.007836753 +0200 ++++ libatasmart/atasmart.c 2012-05-23 08:34:43.903835695 +0200 +@@ -130,6 +130,8 @@ + SkBool current_pending_sector_found:1; + uint64_t reallocated_sector_count; + uint64_t current_pending_sector; ++ SkBool reallocated_sector_count_bad:1; ++ SkBool current_pending_sector_bad:1; + + void *blob; + }; +@@ -2190,16 +2192,23 @@ + if (a->pretty_unit != SK_SMART_ATTRIBUTE_UNIT_SECTORS) + return; + ++ if (!a->current_value_valid) ++ return; ++ + if (!strcmp(a->name, "reallocated-sector-count")) { + if (a->pretty_value > d->reallocated_sector_count) + d->reallocated_sector_count = a->pretty_value; + d->reallocated_sector_count_found = TRUE; ++ if (a->good_now_valid && !a->good_now) ++ d->reallocated_sector_count_bad = TRUE; + } + + if (!strcmp(a->name, "current-pending-sector")) { + if (a->pretty_value > d->current_pending_sector) + d->current_pending_sector = a->pretty_value; + d->current_pending_sector_found = TRUE; ++ if (a->good_now_valid && !a->good_now) ++ d->current_pending_sector_bad = TRUE; + } + } + +@@ -2255,24 +2264,9 @@ + return _P(map[overall]); + } + +-static uint64_t u64log2(uint64_t n) { +- unsigned r; +- +- if (n <= 1) +- return 0; +- +- r = 0; +- for (;;) { +- n = n >> 1; +- if (!n) +- return r; +- r++; +- } +-} +- + int sk_disk_smart_get_overall(SkDisk *d, SkSmartOverall *overall) { + SkBool good; +- uint64_t sectors, sector_threshold; ++ uint64_t sectors; + + assert(d); + assert(overall); +@@ -2293,13 +2287,7 @@ + return -1; + sectors = 0; + } else { +- +- /* We use log2(n_sectors)*1024 as a threshold here. We +- * had to pick something, and this makes a bit of +- * sense, or doesn't it? */ +- sector_threshold = u64log2(d->size/512) * 1024; +- +- if (sectors >= sector_threshold) { ++ if (d->reallocated_sector_count_bad || d->current_pending_sector_bad) { + *overall = SK_SMART_OVERALL_BAD_SECTOR_MANY; + return 0; + } diff --git a/abs/core/libatasmart/PKGBUILD b/abs/core/libatasmart/PKGBUILD index 0d003c0..6e1fed5 100644 --- a/abs/core/libatasmart/PKGBUILD +++ b/abs/core/libatasmart/PKGBUILD @@ -1,15 +1,27 @@ -# $Id: PKGBUILD 198126 2013-10-30 12:56:47Z allan $ +# $Id$ # Maintainer: Jan de Groot pkgname=libatasmart pkgver=0.19 -pkgrel=2 +pkgrel=3 pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library" arch=('i686' 'x86_64') license=('LGPL') -depends=('udev') +depends=('libsystemd') +makedepends=('systemd') url="http://0pointer.de/blog/projects/being-smart.html" -source=("http://0pointer.de/public/${pkgname}-${pkgver}.tar.xz") +source=(http://0pointer.de/public/${pkgname}-${pkgver}.tar.xz + 0001-Dont-test-undefined-bits.patch + 0002-Drop-our-own-many-bad-sectors-heuristic.patch) +md5sums=('53afe2b155c36f658e121fe6def33e77' + 'eb5d0468b0d47d099e5164372a21f9da' + 'cebd1fbed0b05d0458177d6d3ad4ea3f') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../0001-Dont-test-undefined-bits.patch + patch -Np1 -i ../0002-Drop-our-own-many-bad-sectors-heuristic.patch +} build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -25,4 +37,3 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('53afe2b155c36f658e121fe6def33e77') -- cgit v0.12 From 157bdaa9b865723785c1047324843af8468849ea Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Jan 2016 17:11:30 +0000 Subject: tilda: change focus pull up pref to hide --- abs/core/tilda/PKGBUILD | 4 ++-- abs/core/tilda/config_0 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/tilda/PKGBUILD b/abs/core/tilda/PKGBUILD index 85a7d17..3fa26e1 100644 --- a/abs/core/tilda/PKGBUILD +++ b/abs/core/tilda/PKGBUILD @@ -5,7 +5,7 @@ pkgname=tilda pkgver=1.3.1 -pkgrel=3 +pkgrel=4 pkgdesc="A Gtk based drop down terminal for Linux and Unix" arch=('i686' 'x86_64') url="https://github.com/lanoxx/tilda" @@ -34,4 +34,4 @@ package() { } md5sums=('2e1e40e73ccd4f03b3595b8842bb0397' 'eae07ef0ffb2e9dee3ba5eec3e87b920' - 'e2a091d91105b99b6f0a0ce37b13b975') + 'cd116d2afeccafdc08b880ed460445da') diff --git a/abs/core/tilda/config_0 b/abs/core/tilda/config_0 index 7cf7b30..c8597ed 100644 --- a/abs/core/tilda/config_0 +++ b/abs/core/tilda/config_0 @@ -52,7 +52,7 @@ timer_resolution = 200 auto_hide_time = 2000 on_last_terminal_exit = 2 palette_scheme = 0 -non_focus_pull_up_behaviour = 0 +non_focus_pull_up_behaviour = 1 cursor_shape = 0 # show_on_monitor_number = 0 title_max_length = 25 -- cgit v0.12 From d28fa9756f4898ddccef11d97da7d40fc634f7bd Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Jan 2016 17:29:28 +0000 Subject: xymon: xymon-smart.sh: check for optical and mounted check if SMART is disabled and enable --- abs/core/xymon/PKGBUILD | 4 ++-- abs/core/xymon/xymon-smart.sh | 23 ++++++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD index 7197a24..9de6599 100755 --- a/abs/core/xymon/PKGBUILD +++ b/abs/core/xymon/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=xymon pkgname=('xymonserver' 'xymonclient') pkgver=4.3.17 -pkgrel=20 +pkgrel=21 pkgdesc="Xymon is a system for monitoring of hosts and networks" license="GPL" arch=('i686' 'x86_64') @@ -182,7 +182,7 @@ md5sums=('d8d119a777e7b7204d1292fb27314312' '313b11e7a22c3c08fb2afaadbfb46d87' '6452d891d88bb46d07bcf7790a523ad0' 'f0486d82a56a0e28a20278daabbc4c53' - '9569e07936e337b06c194e0fb29e7e6b' + 'e071c387deac6b896b20db19903b7794' 'b4e8641e97e6b689dbc634af785e6799' 'e2844513e2c92e8b5084818f3b2a478d' '98e9242ae346f729b14cb195786571f2' diff --git a/abs/core/xymon/xymon-smart.sh b/abs/core/xymon/xymon-smart.sh index f951158..7c10db5 100755 --- a/abs/core/xymon/xymon-smart.sh +++ b/abs/core/xymon/xymon-smart.sh @@ -9,16 +9,29 @@ while read DISK do DISKDEV=`ls -l $DISK | awk -F/ '{print $NF}'` - #check if disk is removable - RM=0 - RM=`cat /sys/block/$DISKDEV/removable` - if test $RM -ne 0 + #check if device is optical + if [[ $DISKDEV == "sr"* ]] then continue fi - DRES=`sudo /usr/sbin/smartctl -H -n standby $DISK` + #check if device is mounted + if ! mount | grep -q /dev/$DISKDEV + then + continue + fi + + DRES=`sudo /usr/bin/smartctl -H -n standby $DISK` DCODE=$? + + #check if SMART is disabled and enable + if [[ $DRES == *"SMART Disabled. Use option -s with argument 'on'"* ]] + then + sudo /usr/bin/smartctl -s on $DISK + DRES=`sudo /usr/bin/smartctl -H -n standby $DISK` + DCODE=$? + fi + DSTBY=$(( $DCODE & 2 )) DFAIL=$(( $DCODE & 8 )) DWARN=$(( $DCODE & 32 )) -- cgit v0.12 From 0d65d1138afe53d05e2ae46e8aafba1e0db96306 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Jan 2016 17:30:48 +0000 Subject: fping: update to 3.10 --- abs/core/fping/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/abs/core/fping/PKGBUILD b/abs/core/fping/PKGBUILD index cc3f56b..ae32976 100644 --- a/abs/core/fping/PKGBUILD +++ b/abs/core/fping/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 200236 2013-11-23 17:36:41Z giovanni $ +# $Id$ # Maintainer: Giovanni Scafora # Contributor: Tom Newsom pkgname=fping -pkgver=3.8 -pkgrel=3 +pkgver=3.10 +pkgrel=1 pkgdesc="A utility to ping multiple hosts at once" arch=('i686' 'x86_64') url="http://www.fping.org/" license=('custom') depends=('glibc') source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz") -md5sums=('1e36467cc96a4ca959925ac167ea19af') +md5sums=('6a0ddecb671df1d580d20c0dd1095773') build() { cd "$srcdir/$pkgname-$pkgver" -- cgit v0.12 From 5af51242991cf3a7e37c2b6f8fb090171e66ddf3 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Jan 2016 19:00:49 +0000 Subject: fping: remove old source file --- abs/core/fping/fping-3.8-2.src.tar.gz | 1 - 1 file changed, 1 deletion(-) delete mode 120000 abs/core/fping/fping-3.8-2.src.tar.gz diff --git a/abs/core/fping/fping-3.8-2.src.tar.gz b/abs/core/fping/fping-3.8-2.src.tar.gz deleted file mode 120000 index 9cbf1dd..0000000 --- a/abs/core/fping/fping-3.8-2.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/src_packages/fping-3.8-2.src.tar.gz \ No newline at end of file -- cgit v0.12 From 2204ce656276d6b9776d2c99882bfe093be3808b Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Jan 2016 19:02:14 +0000 Subject: php: update to 5.6.17 --- abs/core/php/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/php/PKGBUILD b/abs/core/php/PKGBUILD index cccb505..7ba2398 100644 --- a/abs/core/php/PKGBUILD +++ b/abs/core/php/PKGBUILD @@ -23,8 +23,8 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.6.12 -pkgrel=2 +pkgver=5.6.17 +pkgrel=1 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' @@ -405,7 +405,7 @@ package_php-xsl() { install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so } -md5sums=('f2cc602602eb2b121779f2c4b8bacaba' +md5sums=('5e080e4b7df5db24f1b64313f8114bd8' 'SKIP' '943f882a55c0a6a7b3e5616c7dbbd7a8' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' -- cgit v0.12 From 0873cf04612494e0d385b2033f4287fa69931a4f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Jan 2016 19:29:24 +0000 Subject: xymon: xymon-hddtemp.sh: check for optical and mounted check if SMART is enabled --- abs/core/xymon/PKGBUILD | 4 ++-- abs/core/xymon/xymon-hddtemp.sh | 22 +++++++++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD index 9de6599..b106e66 100755 --- a/abs/core/xymon/PKGBUILD +++ b/abs/core/xymon/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=xymon pkgname=('xymonserver' 'xymonclient') pkgver=4.3.17 -pkgrel=21 +pkgrel=22 pkgdesc="Xymon is a system for monitoring of hosts and networks" license="GPL" arch=('i686' 'x86_64') @@ -181,7 +181,7 @@ md5sums=('d8d119a777e7b7204d1292fb27314312' '9af2ad60ac4c3cb653754618f603e311' '313b11e7a22c3c08fb2afaadbfb46d87' '6452d891d88bb46d07bcf7790a523ad0' - 'f0486d82a56a0e28a20278daabbc4c53' + 'b49e7de696c1a0678ad198bab926266c' 'e071c387deac6b896b20db19903b7794' 'b4e8641e97e6b689dbc634af785e6799' 'e2844513e2c92e8b5084818f3b2a478d' diff --git a/abs/core/xymon/xymon-hddtemp.sh b/abs/core/xymon/xymon-hddtemp.sh index 6c0f109..7084abc 100755 --- a/abs/core/xymon/xymon-hddtemp.sh +++ b/abs/core/xymon/xymon-hddtemp.sh @@ -8,15 +8,27 @@ do DISKDEV=`ls -l $DISK | awk -F/ '{print $NF}'` DISKNAME=`echo $DISK | awk -F/ '{print $5}' | tr ":" "_"` - #check if disk is removable - RM=0 - RM=`cat /sys/block/$DISKDEV/removable` - if test $RM -ne 0 + #check if device is optical + if [[ $DISKDEV == "sr"* ]] then continue fi - hddtemp=`sudo smartctl -A $DISK | grep Temperature_Celsius | awk '{print $10}'` + #check if device is mounted + if ! mount | grep -q /dev/$DISKDEV + then + continue + fi + + #check if SMART is disabled and enable + DRES=`sudo /usr/bin/smartctl -A $DISK` + if [[ $DRES == *"SMART Disabled. Use option -s with argument 'on'"* ]] + then + sudo /usr/bin/smartctl -s on $DISK + DRES=`sudo /usr/bin/smartctl -A $DISK` + fi + + hddtemp=`echo "$DRES" | grep Temperature_Celsius | awk '{print $10}'` TEMP=": $hddtemp" if [[ $hddtemp == "" ]] -- cgit v0.12 From 15303eeec89c35e14fa43868882ed35387a16da6 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Jan 2016 19:44:35 +0000 Subject: xfsprogs: update to 4.3.0 --- abs/core/xfsprogs/PKGBUILD | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/abs/core/xfsprogs/PKGBUILD b/abs/core/xfsprogs/PKGBUILD index 7d8cea6..09f2700 100644 --- a/abs/core/xfsprogs/PKGBUILD +++ b/abs/core/xfsprogs/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # pkgname=xfsprogs -pkgver=3.2.1 +pkgver=4.3.0 pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('i686' 'x86_64') @@ -9,13 +9,14 @@ license=('LGPL') url="http://oss.sgi.com/projects/xfs/" groups=('base') depends=('libutil-linux') +makedepends=('git') options=('!makeflags') -# We mirror the sources as upstream tends to move them once a new release is out -source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") -md5sums=('5c6905932029c8f9207fe5a0a8aac24b') +source=("git://oss.sgi.com/xfs/cmds/xfsprogs#tag=v${pkgver}") +md5sums=('SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" + make configure export OPTIMIZER="-march=${CARCH/_/-} -O1" export DEBUG=-DNDEBUG ./configure --prefix=/usr --sbindir=/usr/bin @@ -23,7 +24,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" make DIST_ROOT="${pkgdir}" PKG_ROOT_SBIN_DIR="/usr/bin" install install-dev chown -R root $pkgdir chgrp -R root $pkgdir -- cgit v0.12 From 0480aaf2ccf7689ebe2f04c2100507a3a539fe70 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Jan 2016 19:46:36 +0000 Subject: xfsdump: update to 3.1.6 --- abs/extra/xfsdump/PKGBUILD | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) mode change 100755 => 100644 abs/extra/xfsdump/PKGBUILD diff --git a/abs/extra/xfsdump/PKGBUILD b/abs/extra/xfsdump/PKGBUILD old mode 100755 new mode 100644 index 54370cf..1459142 --- a/abs/extra/xfsdump/PKGBUILD +++ b/abs/extra/xfsdump/PKGBUILD @@ -1,8 +1,9 @@ # Contributor: judd -# Maintainer: dkaylor +# Contributor: dkaylor +# Maintainer: Pablo Lezaeta pkgname=xfsdump -pkgver=3.1.3 +pkgver=3.1.6 pkgrel=1 pkgdesc="Additional XFS filesystem utilities" arch=(i686 x86_64) @@ -11,10 +12,13 @@ license=('LGPL') depends=('xfsprogs>=3.1.0' 'attr>=2.4.43' 'acl>=2.2.47' 'dmapi>=2.2.10') options=('!makeflags' '!emptydirs' '!libtool') source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/$pkgname-$pkgver.tar.gz{,.sig}) +sha256sums=('7f78c11ca527477d90e5e62b0778f3ad96f2b71c19173044e9aca9515fff42d0' + 'SKIP') +validpgpkeys=('9893A827C19F7D96164A38FFADE82947F475FA1D') # Dave Chinner build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin --bindir=/usr/bin make } @@ -23,12 +27,10 @@ package() { make DIST_ROOT="${pkgdir}" install # hack to merge binaries from /sbin and /usr/sbin into /usr/bin # - mkdir -p $pkgdir/usr/bin - mv $pkgdir/{sbin/*,usr/sbin/xfsinvutil} $pkgdir/usr/bin - rm -rf $pkgdir/{sbin,usr/sbin} + mkdir -p "$pkgdir/usr/bin" + mv "$pkgdir/sbin"/* "$pkgdir/usr/bin" + rm -rf "$pkgdir"/{sbin,usr/sbin} - chown -R root $pkgdir - chgrp -R root $pkgdir + chown -R root "$pkgdir" + chgrp -R root "$pkgdir" } -md5sums=('aad7160b88db24c0510c001debd689be' - 'SKIP') -- cgit v0.12 From b59ff5364cd2b3309f12eefa31f636a0d51ef22f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Jan 2016 20:21:23 +0000 Subject: dbus: update to 1.10.6 --- abs/core/dbus/30-dbus | 6 ------ abs/core/dbus/PKGBUILD | 26 ++++++++++++++------------ 2 files changed, 14 insertions(+), 18 deletions(-) delete mode 100644 abs/core/dbus/30-dbus diff --git a/abs/core/dbus/30-dbus b/abs/core/dbus/30-dbus deleted file mode 100644 index 96a5182..0000000 --- a/abs/core/dbus/30-dbus +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# launches a session dbus instance -if [ -z "${DBUS_SESSION_BUS_ADDRESS-}" ] && type dbus-launch >/dev/null; then - eval $(dbus-launch --sh-syntax --exit-with-session) -fi diff --git a/abs/core/dbus/PKGBUILD b/abs/core/dbus/PKGBUILD index f7bb849..ddc3ebf 100644 --- a/abs/core/dbus/PKGBUILD +++ b/abs/core/dbus/PKGBUILD @@ -5,19 +5,22 @@ pkgbase=dbus pkgname=('dbus' 'libdbus') -pkgver=1.8.20 +pkgver=1.10.6 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64) license=('GPL' 'custom') makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl') -source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc} - 30-dbus) -md5sums=('b49890bbabedab3a1c3f4f73c7ff8b2b' - 'SKIP' - '6683a05bd749929ef9442816c22c3268') -validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie +source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc}) +md5sums=('26d0cf3a1c9782cb0e342101f0450440' + 'SKIP') +validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90' # Simon McVittie + '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie + +prepare() { + cd dbus-$pkgver +} build() { cd dbus-$pkgver @@ -30,7 +33,7 @@ build() { --disable-verbose-mode --disable-static \ --disable-tests --disable-asserts \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --enable-systemd + --enable-systemd --enable-user-session make } @@ -48,16 +51,15 @@ package_dbus(){ make DESTDIR="$pkgdir" install - rm -rf "${pkgdir}/var/run" - rm -rf "${pkgdir}/usr/lib/pkgconfig" + rm -r "${pkgdir}/var/run" + rm -r "${pkgdir}/usr/lib/pkgconfig" - install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus.sh" install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING" } package_libdbus(){ pkgdesc="DBus library" - depends=('glibc') + depends=('libsystemd') cd dbus-$pkgver make DESTDIR="$pkgdir" -C dbus install -- cgit v0.12 From cdb06395b1ae72c272cb6e45c93221fd43d7381e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Jan 2016 20:52:32 +0000 Subject: openssl: update to 1.0.2.f --- abs/core/openssl/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/openssl/PKGBUILD b/abs/core/openssl/PKGBUILD index 95f83f1..a1627f3 100644 --- a/abs/core/openssl/PKGBUILD +++ b/abs/core/openssl/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Pierre Schmitz pkgname=openssl -_ver=1.0.2e +_ver=1.0.2f # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} #pkgver=$_ver @@ -19,7 +19,7 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc" 'no-rpath.patch' 'ca-dir.patch') -md5sums=('5262bfa25b60ed9de9f28d5d52d77fc5' +md5sums=('b3bf73f507172be9292ea2a8c28b659d' 'SKIP' 'dc78d3d06baffc16217519242ce92478' '3bf51be3a1bbd262be46dc619f92aa90') -- cgit v0.12 From ae1d9da2f862fccb3c3d9e9188e3ec6ef008cf5a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Jan 2016 21:07:15 +0000 Subject: libdrm: update to 2.4.66 --- abs/core/libdrm/PKGBUILD | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/abs/core/libdrm/PKGBUILD b/abs/core/libdrm/PKGBUILD index 356b9f7..df8c56b 100644 --- a/abs/core/libdrm/PKGBUILD +++ b/abs/core/libdrm/PKGBUILD @@ -2,28 +2,37 @@ # Maintainer: Jan de Groot pkgname=libdrm -pkgver=2.4.58 +pkgver=2.4.66 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) license=('custom') depends=('glibc' 'libpciaccess') -makedepends=('valgrind') +makedepends=('valgrind' 'xorg-util-macros') checkdepends=('cairo') replaces=('libdrm-new' 'libdrm-nouveau') url="http://dri.freedesktop.org/" -source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 +source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2{,.sig} COPYING) -sha256sums=('b155fae6b9c9a3b02ef8b77f58c7c219194c996a4018dc55ba66c03996a365dd' +sha256sums=('79cb8e988749794edfb2d777b298d5292eff353bbbb71ed813589e61d2bc2d76' + 'SKIP' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') +validpgpkeys=('B97BD6A80CAC4981091AE547FE558C72A67013C3') # Maarten Lankhorst +validpgpkeys+=('215DEE688925CCB965BE5DA97C03D7797B6E1AE2') # Damien Lespiau +validpgpkeys+=('10A6D91DA1B05BD29F6DEBAC0C74F35979C486BE') # David Airlie +validpgpkeys+=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov +validpgpkeys+=('D6285B5E899299F3DA746184191C9B905522B045') # Rob Clark -build() { +prepare() { cd $pkgname-$pkgver - + # pthread is useless in Linux sed -i "/pthread-stubs/d" configure.ac autoreconf --force --install - + +} +build() { + cd $pkgname-$pkgver ./configure --prefix=/usr --enable-udev make } -- cgit v0.12 From 84f2fc5bdd5a29c41849b75d9ff5cb5c0f72d622 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Jan 2016 21:09:40 +0000 Subject: libvdpau: update to 1.1.1 --- abs/core/libvdpau/PKGBUILD | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/abs/core/libvdpau/PKGBUILD b/abs/core/libvdpau/PKGBUILD index 911d3e4..e1cb7f9 100644 --- a/abs/core/libvdpau/PKGBUILD +++ b/abs/core/libvdpau/PKGBUILD @@ -2,17 +2,18 @@ # Maintainer: Jan de Groot pkgname=libvdpau -pkgver=0.8 -pkgrel=1 +pkgver=1.1.1 +pkgrel=2 pkgdesc="Nvidia VDPAU library" arch=(i686 x86_64) url='http://cgit.freedesktop.org/~aplattner/libvdpau' depends=('gcc-libs' 'libxext') -conflicts=('nvidia-utils<190.42-2') license=('custom') -source=(http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz) +source=(http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.bz2{,.sig}) makedepends=('dri2proto') -sha256sums=('73a7d11cc1abed8bcaf1392bd361fc00fd43bd85bbeafb12a64bdd0bcb4101ed') +sha256sums=('857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736' + 'SKIP') +validpgpkeys=('BD68A042C603DDAD9AA354B0F56ACC8F09BA9635') # Aaron Plattner build() { cd "${srcdir}/${pkgname}-${pkgver}" -- cgit v0.12 From aa576d022474df1cd2394a4a18eddca8c8771f54 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Jan 2016 21:25:39 +0000 Subject: ocaml: update to 4.02.3 --- abs/extra/ocaml/PKGBUILD | 20 ++++---- abs/extra/ocaml/fix-ocaml-binutils-2.21.patch | 66 --------------------------- abs/extra/ocaml/ocaml-3.12.1-3.src.tar.gz | 1 - 3 files changed, 10 insertions(+), 77 deletions(-) delete mode 100644 abs/extra/ocaml/fix-ocaml-binutils-2.21.patch delete mode 120000 abs/extra/ocaml/ocaml-3.12.1-3.src.tar.gz diff --git a/abs/extra/ocaml/PKGBUILD b/abs/extra/ocaml/PKGBUILD index e7ad5ec..f1b1343 100644 --- a/abs/extra/ocaml/PKGBUILD +++ b/abs/extra/ocaml/PKGBUILD @@ -1,30 +1,31 @@ -# $Id: PKGBUILD 143814 2011-11-29 13:33:35Z stephane $ +# $Id$ # Maintainer: Tobias Powalowski pkgbase='ocaml' pkgname=('ocaml' 'ocaml-compiler-libs') -pkgver=3.12.1 -pkgrel=3 +pkgver=4.02.3 +pkgrel=2 pkgdesc="A functional language with OO extensions" arch=('i686' 'x86_64') -license=('LGPL2' 'custom: QPL-1.0') +license=('LGPL2.1' 'custom: QPL-1.0') url="http://caml.inria.fr/" depends=('gdbm') -makedepends=('tk' 'ncurses>=5.6-7' 'libx11') +makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11') optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') -source=(http://caml.inria.fr/distrib/ocaml-3.12/${pkgname}-${pkgver}.tar.gz) -options=('!makeflags' '!emptydirs') +source=(http://caml.inria.fr/distrib/ocaml-4.02/${pkgname}-${pkgver}.tar.gz) +md5sums=('ef1a324608c97031cbd92a442d685ab7') +options=('!makeflags' '!emptydirs' 'staticlibs') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure -prefix /usr + ./configure -prefix /usr -x11include /usr/include make world.opt } package_ocaml() { cd "${srcdir}/${pkgbase}-${pkgver}" make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install - + # Save >10MB with this one, makepkg only strips debug symbols. #find "${pkgdir}/usr/lib" -type f -name '*.so.*' -exec strip --strip-unneeded {} \; @@ -54,4 +55,3 @@ optdepends=() install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('814a047085f0f901ab7d8e3a4b7a9e65') diff --git a/abs/extra/ocaml/fix-ocaml-binutils-2.21.patch b/abs/extra/ocaml/fix-ocaml-binutils-2.21.patch deleted file mode 100644 index fa7664c..0000000 --- a/abs/extra/ocaml/fix-ocaml-binutils-2.21.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Stephane Glondu -Date: Tue, 8 Mar 2011 21:17:40 +0100 -Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Bug: http://caml.inria.fr/mantis/view.php?id=5237 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404 -Authors: Eric Cooper, spiralvoice -Reviewed-by: Stéphane Glondu ---- - asmcomp/amd64/emit.mlp | 13 +++++++------ - asmcomp/i386/emit.mlp | 6 +++--- - 2 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp -index 4a3f844..525c6e6 100644 ---- a/asmcomp/amd64/emit.mlp -+++ b/asmcomp/amd64/emit.mlp -@@ -679,17 +679,18 @@ let fundecl fundecl = - emit_all true fundecl.fun_body; - List.iter emit_call_gc !call_gc_sites; - emit_call_bound_errors (); -+ begin match Config.system with -+ "linux" | "gnu" -> -+ ` .type {emit_symbol fundecl.fun_name},@function\n`; -+ ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` -+ | _ -> () -+ end; - if !float_constants <> [] then begin - if macosx - then ` .literal8\n` - else ` .section .rodata.cst8,\"a\",@progbits\n`; - List.iter emit_float_constant !float_constants -- end; -- match Config.system with -- "linux" | "gnu" -> -- ` .type {emit_symbol fundecl.fun_name},@function\n`; -- ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` -- | _ -> () -+ end - - (* Emission of data *) - -diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp -index 2992f29..0b1252c 100644 ---- a/asmcomp/i386/emit.mlp -+++ b/asmcomp/i386/emit.mlp -@@ -905,12 +905,12 @@ let fundecl fundecl = - emit_all true fundecl.fun_body; - List.iter emit_call_gc !call_gc_sites; - emit_call_bound_errors (); -- List.iter emit_float_constant !float_constants; -- match Config.system with -+ begin match Config.system with - "linux_elf" | "bsd_elf" | "gnu" -> - ` .type {emit_symbol fundecl.fun_name},@function\n`; - ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` -- | _ -> () -+ | _ -> () end; -+ List.iter emit_float_constant !float_constants - - - (* Emission of data *) --- diff --git a/abs/extra/ocaml/ocaml-3.12.1-3.src.tar.gz b/abs/extra/ocaml/ocaml-3.12.1-3.src.tar.gz deleted file mode 120000 index 140a1a6..0000000 --- a/abs/extra/ocaml/ocaml-3.12.1-3.src.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/data/pkg_repo/src_packages/ocaml-3.12.1-3.src.tar.gz \ No newline at end of file -- cgit v0.12 From b5fe68872dcf57f226f514dacada690c7471202a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Jan 2016 21:28:32 +0000 Subject: ocaml-findlib: initial inclusion. dep of llvm --- abs/extra/ocaml-findlib/PKGBUILD | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 abs/extra/ocaml-findlib/PKGBUILD diff --git a/abs/extra/ocaml-findlib/PKGBUILD b/abs/extra/ocaml-findlib/PKGBUILD new file mode 100644 index 0000000..ce5bdff --- /dev/null +++ b/abs/extra/ocaml-findlib/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Lukas Fleischer +# Contributor: Thomas S Hatch +# Contributor: Sebastian Wiesner +# Contributor: Benjamin Andresen +# Contributor: scj + +pkgname=ocaml-findlib +pkgver=1.5.5 +pkgrel=3 +license=('MIT') +arch=('i686' 'x86_64') +pkgdesc='Objective Caml (OCaml) package manager' +url='http://projects.camlcity.org/projects/findlib.html' +depends=('ocaml') +source=("http://download.camlcity.org/download/findlib-$pkgver.tar.gz") +md5sums=('703eae112f9e912507c3a2f8d8c48498') +options=('staticlibs' '!strip' 'zipman' '!makeflags') # otherwise the bytecode gets broken + +build() { + cd "$srcdir/findlib-$pkgver" + + ./configure -config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man + make all opt +} + +package () { + cd "$srcdir/findlib-$pkgver" + + make prefix="$pkgdir" install + + # add the old site-lib to the path to maintain compatibility with old style packages + sed -i 's/path=\"\/usr\/lib\/ocaml\"/path="\/usr\/lib\/ocaml:\/usr\/lib\/ocaml\/site-lib"/' \ + "${pkgdir}/etc/findlib.conf" + + install -m755 src/findlib/ocamlfind_opt "$pkgdir/usr/bin/" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} -- cgit v0.12 From cf6a437dee04ab2f95f195239a91f7df5452fa5c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Jan 2016 21:29:43 +0000 Subject: ocaml-ctypes: initial inclusion. dep of llvm --- abs/extra/ocaml-ctypes/PKGBUILD | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 abs/extra/ocaml-ctypes/PKGBUILD diff --git a/abs/extra/ocaml-ctypes/PKGBUILD b/abs/extra/ocaml-ctypes/PKGBUILD new file mode 100644 index 0000000..3d0922c --- /dev/null +++ b/abs/extra/ocaml-ctypes/PKGBUILD @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Evangelos Foutras +# Contributor: Armin K. + +pkgname=ocaml-ctypes +pkgver=0.4.1 +pkgrel=3 +pkgdesc="Library for binding to C libraries using pure OCaml" +arch=('i686' 'x86_64') +url="https://github.com/ocamllabs/ocaml-ctypes" +license=('MIT') +depends=('ocaml' 'libffi') +makedepends=('ocaml-findlib') +options=('!strip' '!makeflags') +source=($pkgname-$pkgver::https://github.com/ocamllabs/ocaml-ctypes/archive/$pkgver.tar.gz) +sha256sums=('74564e049de5d3c0e76ea284c225cb658ac1a2b483345be1efb9be4b3c1702f5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + local _destdir="$pkgdir$(ocamlfind printconf destdir)" + install -d "$_destdir/stublibs" + + make OCAMLFIND_DESTDIR="$_destdir" install + + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: -- cgit v0.12 From a3a169ce68791d6056cbc3a46b2d0296160c9df5 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 29 Jan 2016 22:01:54 +0000 Subject: vdpauinfo: update to 1.0 --- abs/core/vdpauinfo/PKGBUILD | 14 ++++++++++---- abs/core/vdpauinfo/__changelog | 2 -- abs/core/vdpauinfo/vdpauinfo.changelog | 5 ----- 3 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 abs/core/vdpauinfo/__changelog delete mode 100644 abs/core/vdpauinfo/vdpauinfo.changelog diff --git a/abs/core/vdpauinfo/PKGBUILD b/abs/core/vdpauinfo/PKGBUILD index 2df07ba..b42db15 100644 --- a/abs/core/vdpauinfo/PKGBUILD +++ b/abs/core/vdpauinfo/PKGBUILD @@ -1,15 +1,21 @@ -# Maintainer: Bart Verhoeven +# $Id$ +# Maintainer: Timothy Redaelli +# Contributor: Aaron Plattner +# Contributor: Bart Verhoeven pkgname=vdpauinfo -pkgver=0.1 +pkgver=1.0 pkgrel=2 pkgdesc="Command line utility for querying the capabilities of a VDPAU device." arch=('i686' 'x86_64') url="http://cgit.freedesktop.org/~aplattner/vdpauinfo" license=('custom') depends=('libvdpau' 'libx11') -source=("http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz") -sha256sums=('b0c856a6933e306f3f783717a29124c7d145d6027a3175e197249696f5d5019f') +source=("http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz" + "http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz.sig") +validpgpkeys=('BD68A042C603DDAD9AA354B0F56ACC8F09BA9635') # Aaron Plattner +sha256sums=('4054960b7ae618c351ff1ce3e7831b5cbda964ae1fbf9969b7146404d3044bc4' + 'SKIP') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/abs/core/vdpauinfo/__changelog b/abs/core/vdpauinfo/__changelog deleted file mode 100644 index 3acad6e..0000000 --- a/abs/core/vdpauinfo/__changelog +++ /dev/null @@ -1,2 +0,0 @@ -made nvidia-utils an optional dep. Otherwise this program could drag in the nividia drivers when we don't want them. - diff --git a/abs/core/vdpauinfo/vdpauinfo.changelog b/abs/core/vdpauinfo/vdpauinfo.changelog deleted file mode 100644 index 804c565..0000000 --- a/abs/core/vdpauinfo/vdpauinfo.changelog +++ /dev/null @@ -1,5 +0,0 @@ -vdpauinfo 0.0.6-6: -- Fix compilation (include libxfixes) -- split into build() and package() -- - -- cgit v0.12 From 3ca6a9e01009e4a5dfc812bc423895a5ad92f8a2 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sat, 30 Jan 2016 13:16:53 +0000 Subject: llvm: update to 3.7.1 --- ...-New-MSan-mapping-layout-compiler-rt-part.patch | 142 +++ .../0001-New-MSan-mapping-layout-llvm-part.patch | 115 ++ abs/extra/llvm/PKGBUILD | 308 ++--- .../llvm/clang-3.7.0-add-gcc-abi-tag-support.patch | 1267 ++++++++++++++++++++ ...ang-tools-extra-3.7.0-install-clang-query.patch | 9 + .../llvm/lldb-3.7.0-avoid-linking-to-libLLVM.patch | 20 + .../llvm/llvm-3.5.0-fix-cmake-llvm-exports.patch | 39 - abs/extra/llvm/llvm-3.5.0-force-link-pass.o.patch | 28 - .../llvm/llvm-3.7.0-export-more-symbols.patch | 11 + .../llvm-3.7.0-link-tools-against-libLLVM.patch | 440 +++++++ abs/extra/llvm/llvm-Config-config.h | 9 - 11 files changed, 2159 insertions(+), 229 deletions(-) create mode 100644 abs/extra/llvm/0001-New-MSan-mapping-layout-compiler-rt-part.patch create mode 100644 abs/extra/llvm/0001-New-MSan-mapping-layout-llvm-part.patch create mode 100644 abs/extra/llvm/clang-3.7.0-add-gcc-abi-tag-support.patch create mode 100644 abs/extra/llvm/clang-tools-extra-3.7.0-install-clang-query.patch create mode 100644 abs/extra/llvm/lldb-3.7.0-avoid-linking-to-libLLVM.patch delete mode 100644 abs/extra/llvm/llvm-3.5.0-fix-cmake-llvm-exports.patch delete mode 100644 abs/extra/llvm/llvm-3.5.0-force-link-pass.o.patch create mode 100644 abs/extra/llvm/llvm-3.7.0-export-more-symbols.patch create mode 100644 abs/extra/llvm/llvm-3.7.0-link-tools-against-libLLVM.patch delete mode 100644 abs/extra/llvm/llvm-Config-config.h diff --git a/abs/extra/llvm/0001-New-MSan-mapping-layout-compiler-rt-part.patch b/abs/extra/llvm/0001-New-MSan-mapping-layout-compiler-rt-part.patch new file mode 100644 index 0000000..d5e06a7 --- /dev/null +++ b/abs/extra/llvm/0001-New-MSan-mapping-layout-compiler-rt-part.patch @@ -0,0 +1,142 @@ +From 0bee2d927c97454e629b0789c7f4e3d509cf4178 Mon Sep 17 00:00:00 2001 +From: Evgeniy Stepanov +Date: Thu, 8 Oct 2015 21:35:34 +0000 +Subject: [PATCH] New MSan mapping layout (compiler-rt part). + +This is an implementation of +https://github.com/google/sanitizers/issues/579 + +It has a number of advantages over the current mapping: +* Works for non-PIE executables. +* Does not require ASLR; as a consequence, debugging MSan programs in + gdb no longer requires "set disable-randomization off". +* Supports linux kernels >=4.1.2. +* The code is marginally faster and smaller. + +This is an ABI break. We never really promised ABI stability, but +this patch includes a courtesy escape hatch: a compile-time macro +that reverts back to the old mapping layout. + +git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@249754 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + lib/msan/msan.h | 23 ++++++++++++++++++++++ + lib/msan/msan_allocator.cc | 8 +++++++- + test/msan/mmap.cc | 4 +++- + test/msan/strlen_of_shadow.cc | 2 +- + .../TestCases/Posix/decorate_proc_maps.cc | 4 ++-- + 5 files changed, 36 insertions(+), 5 deletions(-) + +diff --git a/lib/msan/msan.h b/lib/msan/msan.h +index 3776fa9..2d77983 100644 +--- a/lib/msan/msan.h ++++ b/lib/msan/msan.h +@@ -135,6 +135,7 @@ const MappingDesc kMemoryLayout[] = { + + #elif SANITIZER_LINUX && SANITIZER_WORDSIZE == 64 + ++#ifdef MSAN_LINUX_X86_64_OLD_MAPPING + // Requries PIE binary and ASLR enabled. + // Main thread stack and DSOs at 0x7f0000000000 (sometimes 0x7e0000000000). + // Heap at 0x600000000000. +@@ -146,6 +147,28 @@ const MappingDesc kMemoryLayout[] = { + + #define MEM_TO_SHADOW(mem) (((uptr)(mem)) & ~0x400000000000ULL) + #define SHADOW_TO_ORIGIN(mem) (((uptr)(mem)) + 0x200000000000ULL) ++#else // MSAN_LINUX_X86_64_OLD_MAPPING ++// All of the following configurations are supported. ++// ASLR disabled: main executable and DSOs at 0x555550000000 ++// PIE and ASLR: main executable and DSOs at 0x7f0000000000 ++// non-PIE: main executable below 0x100000000, DSOs at 0x7f0000000000 ++// Heap at 0x700000000000. ++const MappingDesc kMemoryLayout[] = { ++ {0x000000000000ULL, 0x010000000000ULL, MappingDesc::APP, "app-1"}, ++ {0x010000000000ULL, 0x100000000000ULL, MappingDesc::SHADOW, "shadow-2"}, ++ {0x100000000000ULL, 0x110000000000ULL, MappingDesc::INVALID, "invalid"}, ++ {0x110000000000ULL, 0x200000000000ULL, MappingDesc::ORIGIN, "origin-2"}, ++ {0x200000000000ULL, 0x300000000000ULL, MappingDesc::SHADOW, "shadow-3"}, ++ {0x300000000000ULL, 0x400000000000ULL, MappingDesc::ORIGIN, "origin-3"}, ++ {0x400000000000ULL, 0x500000000000ULL, MappingDesc::INVALID, "invalid"}, ++ {0x500000000000ULL, 0x510000000000ULL, MappingDesc::SHADOW, "shadow-1"}, ++ {0x510000000000ULL, 0x600000000000ULL, MappingDesc::APP, "app-2"}, ++ {0x600000000000ULL, 0x610000000000ULL, MappingDesc::ORIGIN, "origin-1"}, ++ {0x610000000000ULL, 0x700000000000ULL, MappingDesc::INVALID, "invalid"}, ++ {0x700000000000ULL, 0x800000000000ULL, MappingDesc::APP, "app-3"}}; ++#define MEM_TO_SHADOW(mem) (((uptr)(mem)) ^ 0x500000000000ULL) ++#define SHADOW_TO_ORIGIN(mem) (((uptr)(mem)) + 0x100000000000ULL) ++#endif // MSAN_LINUX_X86_64_OLD_MAPPING + + #else + #error "Unsupported platform" +diff --git a/lib/msan/msan_allocator.cc b/lib/msan/msan_allocator.cc +index 865a458..b7d3947 100644 +--- a/lib/msan/msan_allocator.cc ++++ b/lib/msan/msan_allocator.cc +@@ -49,15 +49,21 @@ struct MsanMapUnmapCallback { + typedef SizeClassAllocator32<0, SANITIZER_MMAP_RANGE_SIZE, sizeof(Metadata), + SizeClassMap, kRegionSizeLog, ByteMap, + MsanMapUnmapCallback> PrimaryAllocator; ++ + #elif defined(__x86_64__) ++#if SANITIZER_LINUX && !defined(MSAN_LINUX_X86_64_OLD_MAPPING) ++ static const uptr kAllocatorSpace = 0x700000000000ULL; ++#else + static const uptr kAllocatorSpace = 0x600000000000ULL; +- static const uptr kAllocatorSize = 0x80000000000; // 8T. ++#endif ++ static const uptr kAllocatorSize = 0x80000000000; // 8T. + static const uptr kMetadataSize = sizeof(Metadata); + static const uptr kMaxAllowedMallocSize = 8UL << 30; + + typedef SizeClassAllocator64 PrimaryAllocator; ++ + #elif defined(__powerpc64__) + static const uptr kAllocatorSpace = 0x300000000000; + static const uptr kAllocatorSize = 0x020000000000; // 2T +diff --git a/test/msan/mmap.cc b/test/msan/mmap.cc +index 250ce34..962836c 100644 +--- a/test/msan/mmap.cc ++++ b/test/msan/mmap.cc +@@ -15,7 +15,9 @@ bool AddrIsApp(void *p) { + #if defined(__FreeBSD__) && defined(__x86_64__) + return addr < 0x010000000000ULL || addr >= 0x600000000000ULL; + #elif defined(__x86_64__) +- return addr >= 0x600000000000ULL; ++ return (addr >= 0x000000000000ULL && addr < 0x010000000000ULL) || ++ (addr >= 0x510000000000ULL && addr < 0x600000000000ULL) || ++ (addr >= 0x700000000000ULL && addr < 0x800000000000ULL); + #elif defined(__mips64) + return addr >= 0x00e000000000ULL; + #elif defined(__powerpc64__) +diff --git a/test/msan/strlen_of_shadow.cc b/test/msan/strlen_of_shadow.cc +index fee9223..0594f00 100644 +--- a/test/msan/strlen_of_shadow.cc ++++ b/test/msan/strlen_of_shadow.cc +@@ -12,7 +12,7 @@ + + const char *mem_to_shadow(const char *p) { + #if defined(__x86_64__) +- return (char *)((uintptr_t)p & ~0x400000000000ULL); ++ return (char *)((uintptr_t)p ^ 0x500000000000ULL); + #elif defined (__mips64) + return (char *)((uintptr_t)p & ~0x4000000000ULL); + #elif defined(__powerpc64__) +diff --git a/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc b/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc +index 8744c3f..36d4df5 100644 +--- a/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc ++++ b/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc +@@ -47,8 +47,8 @@ int main(void) { + // CHECK-asan: rw-p {{.*}} [high shadow] + + // CHECK-msan: ---p {{.*}} [invalid] +-// CHECK-msan: rw-p {{.*}} [shadow] +-// CHECK-msan: ---p {{.*}} [origin] ++// CHECK-msan: rw-p {{.*}} [shadow{{.*}}] ++// CHECK-msan: ---p {{.*}} [origin{{.*}}] + + // CHECK-tsan: rw-p {{.*}} [shadow] + // CHECK-tsan: rw-p {{.*}} [meta shadow] +-- +2.6.1 + diff --git a/abs/extra/llvm/0001-New-MSan-mapping-layout-llvm-part.patch b/abs/extra/llvm/0001-New-MSan-mapping-layout-llvm-part.patch new file mode 100644 index 0000000..28fe687 --- /dev/null +++ b/abs/extra/llvm/0001-New-MSan-mapping-layout-llvm-part.patch @@ -0,0 +1,115 @@ +From 2c87d24da09ecd2c14c38a0b4f7a0e3f332b08ee Mon Sep 17 00:00:00 2001 +From: Evgeniy Stepanov +Date: Thu, 8 Oct 2015 21:35:26 +0000 +Subject: [PATCH] New MSan mapping layout (llvm part). + +This is an implementation of +https://github.com/google/sanitizers/issues/579 + +It has a number of advantages over the current mapping: +* Works for non-PIE executables. +* Does not require ASLR; as a consequence, debugging MSan programs in + gdb no longer requires "set disable-randomization off". +* Supports linux kernels >=4.1.2. +* The code is marginally faster and smaller. + +This is an ABI break. We never really promised ABI stability, but +this patch includes a courtesy escape hatch: a compile-time macro +that reverts back to the old mapping layout. + +git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@249753 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + lib/Transforms/Instrumentation/MemorySanitizer.cpp | 22 +++++++++++++++------- + .../MemorySanitizer/origin-alignment.ll | 10 ++++++---- + 2 files changed, 21 insertions(+), 11 deletions(-) + +diff --git a/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/lib/Transforms/Instrumentation/MemorySanitizer.cpp +index 9d4c7de..bc6da5a 100644 +--- a/lib/Transforms/Instrumentation/MemorySanitizer.cpp ++++ b/lib/Transforms/Instrumentation/MemorySanitizer.cpp +@@ -232,10 +232,17 @@ static const MemoryMapParams Linux_I386_MemoryMapParams = { + + // x86_64 Linux + static const MemoryMapParams Linux_X86_64_MemoryMapParams = { ++#ifdef MSAN_LINUX_X86_64_OLD_MAPPING + 0x400000000000, // AndMask + 0, // XorMask (not used) + 0, // ShadowBase (not used) + 0x200000000000, // OriginBase ++#else ++ 0, // AndMask (not used) ++ 0x500000000000, // XorMask ++ 0, // ShadowBase (not used) ++ 0x100000000000, // OriginBase ++#endif + }; + + // mips64 Linux +@@ -926,16 +933,17 @@ struct MemorySanitizerVisitor : public InstVisitor { + /// + /// Offset = (Addr & ~AndMask) ^ XorMask + Value *getShadowPtrOffset(Value *Addr, IRBuilder<> &IRB) { ++ Value *OffsetLong = IRB.CreatePointerCast(Addr, MS.IntptrTy); ++ + uint64_t AndMask = MS.MapParams->AndMask; +- assert(AndMask != 0 && "AndMask shall be specified"); +- Value *OffsetLong = +- IRB.CreateAnd(IRB.CreatePointerCast(Addr, MS.IntptrTy), +- ConstantInt::get(MS.IntptrTy, ~AndMask)); ++ if (AndMask) ++ OffsetLong = ++ IRB.CreateAnd(OffsetLong, ConstantInt::get(MS.IntptrTy, ~AndMask)); + + uint64_t XorMask = MS.MapParams->XorMask; +- if (XorMask != 0) +- OffsetLong = IRB.CreateXor(OffsetLong, +- ConstantInt::get(MS.IntptrTy, XorMask)); ++ if (XorMask) ++ OffsetLong = ++ IRB.CreateXor(OffsetLong, ConstantInt::get(MS.IntptrTy, XorMask)); + return OffsetLong; + } + +diff --git a/test/Instrumentation/MemorySanitizer/origin-alignment.ll b/test/Instrumentation/MemorySanitizer/origin-alignment.ll +index ce0dbfc..562d194 100644 +--- a/test/Instrumentation/MemorySanitizer/origin-alignment.ll ++++ b/test/Instrumentation/MemorySanitizer/origin-alignment.ll +@@ -24,7 +24,7 @@ entry: + ; CHECK-ORIGINS1: [[ORIGIN:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls + ; CHECK-ORIGINS2: [[ORIGIN0:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls + ; CHECK-ORIGINS2: [[ORIGIN:%[01-9a-z]+]] = call i32 @__msan_chain_origin(i32 [[ORIGIN0]]) +-; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 add (i64 and (i64 ptrtoint {{.*}} to i32*), align 8 ++; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 add (i64 xor (i64 ptrtoint (i8* @a8 to i64), i64 {{.*}}), i64 {{.*}}) to i32*), align 8 + ; CHECK: ret void + + +@@ -39,7 +39,7 @@ entry: + ; CHECK-ORIGINS1: [[ORIGIN:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls + ; CHECK-ORIGINS2: [[ORIGIN0:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls + ; CHECK-ORIGINS2: [[ORIGIN:%[01-9a-z]+]] = call i32 @__msan_chain_origin(i32 [[ORIGIN0]]) +-; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 add (i64 and (i64 ptrtoint {{.*}} to i32*), align 4 ++; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 add (i64 xor (i64 ptrtoint (i8* @a4 to i64), i64 {{.*}}), i64 {{.*}}) to i32*), align 4 + ; CHECK: ret void + + +@@ -54,7 +54,8 @@ entry: + ; CHECK-ORIGINS1: [[ORIGIN:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls + ; CHECK-ORIGINS2: [[ORIGIN0:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls + ; CHECK-ORIGINS2: [[ORIGIN:%[01-9a-z]+]] = call i32 @__msan_chain_origin(i32 [[ORIGIN0]]) +-; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 and (i64 add (i64 and (i64 ptrtoint {{.*}} i64 -4) to i32*), align 4 ++; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 and (i64 add (i64 xor (i64 ptrtoint (i8* @a2 to i64), i64 {{.*}}), i64 {{.*}}), i64 -4) to i32*), align 4 ++ + ; CHECK: ret void + + +@@ -69,5 +70,6 @@ entry: + ; CHECK-ORIGINS1: [[ORIGIN:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls + ; CHECK-ORIGINS2: [[ORIGIN0:%[01-9a-z]+]] = load {{.*}} @__msan_param_origin_tls + ; CHECK-ORIGINS2: [[ORIGIN:%[01-9a-z]+]] = call i32 @__msan_chain_origin(i32 [[ORIGIN0]]) +-; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 and (i64 add (i64 and (i64 ptrtoint {{.*}} i64 -4) to i32*), align 4 ++; CHECK: store i32 [[ORIGIN]], i32* inttoptr (i64 and (i64 add (i64 xor (i64 ptrtoint (i8* @a1 to i64), i64 {{.*}}), i64 {{.*}}), i64 -4) to i32*), align 4 ++ + ; CHECK: ret void +-- +2.6.1 + diff --git a/abs/extra/llvm/PKGBUILD b/abs/extra/llvm/PKGBUILD index 00a7eaa..960fa13 100644 --- a/abs/extra/llvm/PKGBUILD +++ b/abs/extra/llvm/PKGBUILD @@ -9,38 +9,52 @@ # Contributor: Roberto Alsina # Contributor: Gerardo Exequiel Pozzi -pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer' +pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'lldb' 'clang' 'clang-analyzer' 'clang-tools-extra') -pkgver=3.5.0 -pkgrel=2.1 +pkgver=3.7.1 +pkgrel=1 +_ocaml_ver=4.02.3 arch=('i686' 'x86_64') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('libffi' 'python2' 'ocaml' 'python2-sphinx' 'chrpath') +makedepends=('cmake' 'libffi' 'python2' "ocaml=$_ocaml_ver" 'python2-sphinx' + 'ocaml-ctypes' 'ocaml-findlib' 'libedit' 'swig') # Use gcc-multilib to build 32-bit compiler-rt libraries on x86_64 (FS#41911) -#[[ $CARCH = x86_64 ]] && makedepends+=('gcc-multilib') -[[ $CARCH = x86_64 ]] +#makedepends_x86_64=('gcc-multilib') options=('staticlibs') source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz{,.sig} http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz{,.sig} http://llvm.org/releases/$pkgver/clang-tools-extra-$pkgver.src.tar.xz{,.sig} http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.xz{,.sig} - llvm-3.5.0-force-link-pass.o.patch - llvm-3.5.0-fix-cmake-llvm-exports.patch - llvm-Config-config.h + http://llvm.org/releases/$pkgver/lldb-$pkgver.src.tar.xz{,.sig} + llvm-3.7.0-link-tools-against-libLLVM.patch + llvm-3.7.0-export-more-symbols.patch + clang-3.7.0-add-gcc-abi-tag-support.patch + clang-tools-extra-3.7.0-install-clang-query.patch + lldb-3.7.0-avoid-linking-to-libLLVM.patch + 0001-New-MSan-mapping-layout-llvm-part.patch + 0001-New-MSan-mapping-layout-compiler-rt-part.patch llvm-Config-llvm-config.h) -sha256sums=('28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03' +sha256sums=('be7794ed0cec42d6c682ca8e3517535b54555a3defabec83554dbc74db545ad5' 'SKIP' - 'fc80992e004b06f6c7afb612de1cdaa9ac9d25811c55f94fcf7331d9b81cdb8b' + '56e2164c7c2a1772d5ed2a3e57485ff73ff06c97dff12edbeea1acc4412b0674' 'SKIP' - '2981beb378afb5aa5c50ed017720a42a33e77e902c7086ad2d412ef4fa931f69' + '4a91edaccad1ce984c7c49a4a87db186b7f7b21267b2b03bcf4bd7820715bc6b' 'SKIP' - 'a4b3e655832bf8d9a357ea2c771db347237460e131988cbb96cda40ff39a8136' + '9d4769e4a927d3824bcb7a9c82b01e307c68588e6de4e7f04ab82d82c5af8181' 'SKIP' - '5702053503d49448598eda1b8dc8c263f0df9ad7486833273e3987b5dec25a19' - '841a153d0e9d2d196ea5318388ff295e69c41547eb73b24edf92a1b2cc3cccdd' - '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3' + '9a0bc315ef55f44c98cdf92d064df0847f453ed156dd0ef6a87e04f5fd6a0e01' + 'SKIP' + 'cf9c8b4d70b4547eda162644658c5c203c3139fcea6c75003b6cd7dc11a8cccc' + 'a1c9f36b97c639666ab6a1bd647a08a027e93e3d3cfd6f5af9c36e757599ce81' + '5ed52d54612829402b63bc500bfefae75b3dc444a1524849c26cadf7e0ae4b7d' + '3abf85430c275ecb8dbb526ecb82b1c9f4b4f782a8a43b5a06d040ec0baba7e7' + '2d53b6ed4c7620eeade87e7761b98093a0434801ddd599056daed7881141fb01' + 'c5f4e329143bef36b623ba5daf311b5a73fa99ab05fed4ba506c1c3bc4cf5ee7' + 'f44e8fe3cef9b6f706d651f443922261e1dcf53bcaabdd0ac7edb1758e4bc44d' '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48') +validpgpkeys=('11E521D646982372EB577A1F8F0871F202119294' + 'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') prepare() { cd "$srcdir/llvm-$pkgver.src" @@ -53,52 +67,72 @@ prepare() { mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt - # Fix docs installation directory - sed -i 's:$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ - Makefile.config.in + mv "$srcdir/lldb-$pkgver.src" tools/lldb + + # Backport LLVM_LINK_LLVM_DYLIB option + # https://bugs.archlinux.org/task/46392 + patch -Np1 -i ../llvm-3.7.0-link-tools-against-libLLVM.patch + + # https://llvm.org/bugs/show_bug.cgi?id=24157 + patch -Np2 -i ../llvm-3.7.0-export-more-symbols.patch + + # https://llvm.org/bugs/show_bug.cgi?id=23529 + # http://reviews.llvm.org/D12834 + patch -d tools/clang -Np0 <../clang-3.7.0-add-gcc-abi-tag-support.patch - # Fix definition of LLVM_CMAKE_DIR in LLVMConfig.cmake - sed -i '/@LLVM_CONFIG_CMAKE_DIR@/s:$(PROJ_cmake):$(PROJ_prefix)/share/llvm/cmake:' \ - cmake/modules/Makefile + # https://llvm.org/bugs/show_bug.cgi?id=24046 + # Upstreamed - http://reviews.llvm.org/D13206 + patch -d tools/clang/tools/extra -Np1 <../clang-tools-extra-3.7.0-install-clang-query.patch - # Fix build with GCC 4.9 (patch from Debian) - # http://llvm.org/bugs/show_bug.cgi?id=20067 - patch -Np1 -i "$srcdir/llvm-3.5.0-force-link-pass.o.patch" + # https://llvm.org/bugs/show_bug.cgi?id=24953 + patch -d tools/lldb -Np1 <../lldb-3.7.0-avoid-linking-to-libLLVM.patch + + # https://llvm.org/bugs/show_bug.cgi?id=24155 + patch -Np1 -i ../0001-New-MSan-mapping-layout-llvm-part.patch + patch -d projects/compiler-rt -Np1 <../0001-New-MSan-mapping-layout-compiler-rt-part.patch + + # Use Python 2 + find tools/lldb -name Makefile -exec sed -i 's/python-config/python2-config/' {} + + sed -i 's|/usr/bin/env python|&2|' \ + tools/lldb/scripts/Python/{build-swig-Python,finish-swig-Python-LLDB}.sh - # Fix generation of broken LLVMExports.cmake file - # http://llvm.org/bugs/show_bug.cgi?id=20884 - patch -Np0 -i "$srcdir/llvm-3.5.0-fix-cmake-llvm-exports.patch" + mkdir build } build() { - cd "$srcdir/llvm-$pkgver.src" + cd "$srcdir/llvm-$pkgver.src/build" + + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLLVM_BUILD_LLVM_DYLIB=ON \ + -DLLVM_DYLIB_EXPORT_ALL=ON \ + -DLLVM_LINK_LLVM_DYLIB=ON \ + -DLLVM_ENABLE_RTTI=ON \ + -DLLVM_ENABLE_FFI=ON \ + -DLLVM_BUILD_TESTS=ON \ + -DLLVM_BUILD_DOCS=ON \ + -DLLVM_ENABLE_SPHINX=ON \ + -DLLVM_ENABLE_DOXYGEN=OFF \ + -DSPHINX_WARNINGS_AS_ERRORS=OFF \ + -DFFI_INCLUDE_DIR=$(pkg-config --variable=includedir libffi) \ + -DLLVM_BINUTILS_INCDIR=/usr/include \ + .. + + make + make ocaml_doc + + # Disable automatic installation of components that go into subpackages + sed -i '/\(clang\|lldb\)\/cmake_install.cmake/d' tools/cmake_install.cmake + sed -i '/extra\/cmake_install.cmake/d' tools/clang/tools/cmake_install.cmake + sed -i '/compiler-rt\/cmake_install.cmake/d' projects/cmake_install.cmake +} - # Apply strip option to configure - _optimized_switch="enable" - [[ $(check_option strip) == n ]] && _optimized_switch="disable" - - # Include location of libffi headers in CPPFLAGS - CPPFLAGS+=" $(pkg-config --cflags libffi)" - - # Force the use of GCC instead of clang - CC=gcc CXX=g++ \ - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --enable-shared \ - --enable-libffi \ - --enable-targets=all \ - --disable-expensive-checks \ - --disable-debug-runtime \ - --disable-assertions \ - --with-binutils-include=/usr/include \ - --with-python=/usr/bin/python2 \ - --$_optimized_switch-optimized - - make REQUIRES_RTTI=1 - make -C docs -f Makefile.sphinx man - make -C docs -f Makefile.sphinx html - make -C tools/clang/docs -f Makefile.sphinx html +check() { + cd "$srcdir/llvm-$pkgver.src/build" + make check + make check-clang || warning \ + 'Ignoring Clang test failures caused by name mangling differences' } package_llvm() { @@ -107,143 +141,107 @@ package_llvm() { cd "$srcdir/llvm-$pkgver.src" - # We move the clang directory out of the tree so it won't get installed and - # then we bring it back in for the clang package - mv tools/clang "$srcdir" + make -C build DESTDIR="$pkgdir" install - # -j1 is due to race conditions during the installation of the OCaml bindings - make -j1 DESTDIR="$pkgdir" install - mv "$srcdir/clang" tools + # Remove documentation sources + rm -r "$pkgdir"/usr/share/doc/$pkgname/html/{_sources,.buildinfo} - # The runtime library goes into llvm-libs - mv -f "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir/" - mv -f "$pkgdir/usr/lib/libLLVM-${pkgver%.*}.so" "$srcdir/" + # The runtime libraries go into llvm-libs + mv -f "$pkgdir"/usr/lib/lib{LLVM,LTO}.so* "$srcdir" + mv -f "$pkgdir"/usr/lib/LLVMgold.so "$srcdir" # OCaml bindings go to a separate package - rm -rf "$srcdir"/{ocaml,ocamldoc} - mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir" - - # Remove duplicate files installed by the OCaml bindings - rm "$pkgdir"/usr/{lib/libllvm*,share/doc/llvm/ocamldoc.tar.gz} - - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/*.a - - # Get rid of example Hello transformation - rm "$pkgdir"/usr/lib/*LLVMHello.* - - # Symlink LLVMgold.so from /usr/lib/bfd-plugins - # https://bugs.archlinux.org/task/28479 - install -d "$pkgdir/usr/lib/bfd-plugins" - ln -s ../LLVMgold.so "$pkgdir/usr/lib/bfd-plugins/LLVMgold.so" + rm -rf "$srcdir"/ocaml.{lib,doc} + mv "$pkgdir/usr/lib/ocaml" "$srcdir/ocaml.lib" + mv "$pkgdir/usr/docs/ocaml/html" "$srcdir/ocaml.doc" + rm -r "$pkgdir/usr/docs" if [[ $CARCH == x86_64 ]]; then # Needed for multilib (https://bugs.archlinux.org/task/29951) - # Header stubs are taken from Fedora - for _header in config llvm-config; do - mv "$pkgdir/usr/include/llvm/Config/$_header"{,-64}.h - cp "$srcdir/llvm-Config-$_header.h" \ - "$pkgdir/usr/include/llvm/Config/$_header.h" - done + # Header stub is taken from Fedora + mv "$pkgdir/usr/include/llvm/Config/llvm-config"{,-64}.h + cp "$srcdir/llvm-Config-llvm-config.h" \ + "$pkgdir/usr/include/llvm/Config/llvm-config.h" fi - # Install man pages - install -d "$pkgdir/usr/share/man/man1" - cp docs/_build/man/*.1 "$pkgdir/usr/share/man/man1/" - - # Install html docs - cp -r docs/_build/html/* "$pkgdir/usr/share/doc/$pkgname/html/" - rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources" - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } package_llvm-libs() { - pkgdesc="Low Level Virtual Machine (runtime library)" - depends=('gcc-libs' 'zlib' 'libffi' 'ncurses') + pkgdesc="Low Level Virtual Machine (runtime libraries)" + depends=('gcc-libs' 'zlib' 'libffi' 'libedit' 'ncurses') install -d "$pkgdir/usr/lib" cp -P \ - "$srcdir/libLLVM-$pkgver.so" \ - "$srcdir/libLLVM-${pkgver%.*}.so" \ + "$srcdir"/lib{LLVM,LTO}.so* \ + "$srcdir"/LLVMgold.so \ "$pkgdir/usr/lib/" + # Symlink LLVMgold.so from /usr/lib/bfd-plugins + # https://bugs.archlinux.org/task/28479 + install -d "$pkgdir/usr/lib/bfd-plugins" + ln -s ../LLVMgold.so "$pkgdir/usr/lib/bfd-plugins/LLVMgold.so" + install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } package_llvm-ocaml() { pkgdesc="OCaml bindings for LLVM" - depends=("llvm=$pkgver-$pkgrel" 'ocaml') + depends=("llvm=$pkgver-$pkgrel" "ocaml=$_ocaml_ver" 'ocaml-ctypes') cd "$srcdir/llvm-$pkgver.src" - install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm} - cp -r "$srcdir/ocaml" "$pkgdir/usr/lib" - cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm" - - # Remove execute bit from static libraries - chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a - - # Remove insecure rpath - chrpath -d "$pkgdir"/usr/lib/ocaml/*.so + install -d "$pkgdir"/{usr/lib,usr/share/doc} + cp -a "$srcdir/ocaml.lib" "$pkgdir/usr/lib/ocaml" + cp -a "$srcdir/ocaml.doc" "$pkgdir/usr/share/doc/$pkgname" install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -package_clang() { - pkgdesc="C language family frontend for LLVM" - url="http://clang.llvm.org/" - depends=("llvm=$pkgver-$pkgrel" 'gcc') +package_lldb() { + pkgdesc="Next generation, high-performance debugger" + url="http://lldb.llvm.org/" + depends=('libedit' 'libxml2' 'python2') + + cd "$srcdir/llvm-$pkgver.src" - # Fix installation path for clang docs - sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \ - "$srcdir/llvm-$pkgver.src/Makefile.config" + make -C build/tools/lldb DESTDIR="$pkgdir" install - cd "$srcdir/llvm-$pkgver.src/tools/clang" + # Compile Python scripts + python2 -m compileall "$pkgdir/usr/lib/python2.7/site-packages/lldb" + python2 -O -m compileall "$pkgdir/usr/lib/python2.7/site-packages/lldb" - # We move the extra tools directory out of the tree so it won't get - # installed and then we bring it back in for the clang-tools-extra package - mv tools/extra "$srcdir" + install -Dm644 tools/lldb/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} - make DESTDIR="$pkgdir" install - mv "$srcdir/extra" tools/ +package_clang() { + pkgdesc="C language family frontend for LLVM" + url="http://clang.llvm.org/" + depends=("llvm-libs=$pkgver-$pkgrel" 'gcc') + optdepends=('python2: for git-clang-format') - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/*.a + cd "$srcdir/llvm-$pkgver.src" - # Revert the path change in case we want to do a repackage later - sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \ - "$srcdir/llvm-$pkgver.src/Makefile.config" + make -C build/tools/clang DESTDIR="$pkgdir" install + make -C build/projects/compiler-rt DESTDIR="$pkgdir" install - # Install html docs - cp -r docs/_build/html/* "$pkgdir/usr/share/doc/$pkgname/html/" - rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources" + # Remove documentation sources + rm -r "$pkgdir"/usr/share/doc/$pkgname/html/{_sources,.buildinfo} # Install Python bindings install -d "$pkgdir/usr/lib/python2.7/site-packages" - cp -r bindings/python/clang "$pkgdir/usr/lib/python2.7/site-packages/" + cp -a tools/clang/bindings/python/clang "$pkgdir/usr/lib/python2.7/site-packages/" python2 -m compileall "$pkgdir/usr/lib/python2.7/site-packages/clang" python2 -O -m compileall "$pkgdir/usr/lib/python2.7/site-packages/clang" - # Install clang-format editor integration files (FS#38485) - # Destination paths are copied from clang-format/CMakeLists.txt - install -d "$pkgdir/usr/share/$pkgname" - ( - cd tools/clang-format - cp \ - clang-format-diff.py \ - clang-format-sublime.py \ - clang-format.el \ - clang-format.py \ - "$pkgdir/usr/share/$pkgname/" - cp git-clang-format "$pkgdir/usr/bin/" - sed -i 's|/usr/bin/python$|&2|' \ - "$pkgdir/usr/bin/git-clang-format" \ - "$pkgdir/usr/share/$pkgname/clang-format-diff.py" - ) + # Use Python 2 + sed -i 's|/usr/bin/env python|&2|' \ + "$pkgdir/usr/bin/git-clang-format" \ + "$pkgdir/usr/share/$pkgname/clang-format-diff.py" - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 tools/clang/LICENSE.TXT \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } package_clang-analyzer() { @@ -255,7 +253,7 @@ package_clang-analyzer() { install -d "$pkgdir"/usr/{bin,lib/clang-analyzer} for _tool in scan-{build,view}; do - cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/" + cp -a tools/$_tool "$pkgdir/usr/lib/clang-analyzer/" ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/" done @@ -286,14 +284,18 @@ package_clang-tools-extra() { url="http://clang.llvm.org/" depends=("clang=$pkgver-$pkgrel") - cd "$srcdir/llvm-$pkgver.src/tools/clang/tools/extra" + cd "$srcdir/llvm-$pkgver.src" - make DESTDIR="$pkgdir" install + make -C build/tools/clang/tools/extra DESTDIR="$pkgdir" install - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/*.a + # Use Python 2 + sed -i \ + -e 's|env python$|&2|' \ + -e 's|/usr/bin/python$|&2|' \ + "$pkgdir"/usr/share/clang/{clang-tidy-diff,run-clang-tidy}.py - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 tools/clang/tools/extra/LICENSE.TXT \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/abs/extra/llvm/clang-3.7.0-add-gcc-abi-tag-support.patch b/abs/extra/llvm/clang-3.7.0-add-gcc-abi-tag-support.patch new file mode 100644 index 0000000..9d2dddd --- /dev/null +++ b/abs/extra/llvm/clang-3.7.0-add-gcc-abi-tag-support.patch @@ -0,0 +1,1267 @@ +Index: docs/ItaniumMangleAbiTags.rst +=================================================================== +--- /dev/null ++++ docs/ItaniumMangleAbiTags.rst +@@ -0,0 +1,90 @@ ++======== ++Abi Tags ++======== ++ ++Introduction ++============ ++ ++This text tries to describe gcc semantic for mangling "abi_tag" attributes ++described in https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html ++ ++There is no guarantee the following rules are correct, complete or make sense ++in any way as they were determined empirically by experiments with gcc5. ++ ++Declaration ++=========== ++ ++Abi tags are declared in an abi_tag attribute and can be applied to a ++function, variable, class or inline namespace declaration. The attribute takes ++one or more strings (called tags); the order does not matter. ++ ++See https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Attributes.html for ++details. ++ ++Tags on an inline namespace are called "implicit tags", all other tags are ++"explicit tags". ++ ++Mangling ++======== ++ ++All tags that are "active" on a are emitted after the ++, before or , and are part of ++the same the is. ++ ++They are mangled as: ++ ++ ::= * # sort by name ++ ::= B ++ ++Example: ++ ++ __attribute__((abi_tag("test"))) ++ void Func(); ++ ++ gets mangled as: _Z4FuncB4testv (prettified as `Func[abi:test]()`) ++ ++Active tags ++=========== ++ ++A namespace has never any active tags; for types (class / struct / union / ++enum) the explicit tags are the active tags. ++ ++For variables and functions the active tags are the explicit tags plus any ++"required tags" which are not in the "available tags" set: ++ ++ derived-tags := (required-tags - available-tags) ++ active-tags := explicit-tags + derived-tags ++ ++Required tags for a function ++============================ ++ ++If a function is used as a local scope for another name, and is part of ++another function as local scope, it doesn't have any required tags. ++ ++If a function is used as a local scope for a guard variable name, it doesn't ++have any required tags. ++ ++Otherwise the function requires any implicit or explicit tag used in the name ++for the return type. ++ ++Required tags for a variable ++============================ ++ ++A variable requires any implicit or explicit tag used in its type. ++ ++Available tags ++============== ++ ++All tags used in the prefix and in the template arguments for a name are ++available; for functions also all tags from the (which ++might include the return type for template functions) are available. ++ ++For s all active tags used in the local part () are available, but not implicit tags which were not active! ++ ++Implicit and explicit tags used in the for a function (as ++in the type of a cast operator) are NOT available. ++ ++Example: a cast operator to std::string (which is ++std::__cxx11::basic_string<...>) will use 'cxx11' as active tag, as it is ++required from the return type `std::string` but not available. +Index: include/clang/Basic/Attr.td +=================================================================== +--- include/clang/Basic/Attr.td ++++ include/clang/Basic/Attr.td +@@ -349,6 +349,14 @@ + // Attributes begin here + // + ++def AbiTag : Attr { ++ let Spellings = [GCC<"abi_tag">]; ++ let Args = [VariadicStringArgument<"Tags">]; ++ let Subjects = SubjectList<[Struct, Var, Function, Namespace], ErrorDiag, ++ "ExpectedStructClassVariableFunctionMethodOrInlineNamespace">; ++ let Documentation = [Undocumented]; ++} ++ + def AddressSpace : TypeAttr { + let Spellings = [GNU<"address_space">]; + let Args = [IntArgument<"AddressSpace">]; +Index: include/clang/Basic/DiagnosticSemaKinds.td +=================================================================== +--- include/clang/Basic/DiagnosticSemaKinds.td ++++ include/clang/Basic/DiagnosticSemaKinds.td +@@ -2434,7 +2434,8 @@ + "Objective-C instance methods|init methods of interface or class extension declarations|" + "variables, functions and classes|Objective-C protocols|" + "functions and global variables|structs, unions, and typedefs|structs and typedefs|" +- "interface or protocol declarations|kernel functions}1">, ++ "interface or protocol declarations|kernel functions|" ++ "structs, classes, variables, functions, methods and inline namespaces}1">, + InGroup; + def err_attribute_wrong_decl_type : Error; + def warn_type_attribute_wrong_type : Warning< +@@ -4144,6 +4145,15 @@ + def err_redefinition_extern_inline : Error< + "redefinition of a 'extern inline' function %0 is not supported in " + "%select{C99 mode|C++}1">; ++def err_attr_abi_tag_only_on_inline_namespace : ++ Error<"abi_tag attribute only allowed on inline namespaces">; ++def err_attr_abi_tag_only_on_named_namespace : ++ Error<"abi_tag attribute only allowed on named namespaces">; ++def err_abi_tag_on_redeclaration : ++ Error<"cannot add abi_tag attribute in redeclaration">; ++def err_new_abi_tag_on_redeclaration : ++ Error<"abi_tag %0 missing in original declaration">; ++ + + def note_deleted_dtor_no_operator_delete : Note< + "virtual destructor requires an unambiguous, accessible 'operator delete'">; +Index: include/clang/Sema/AttributeList.h +=================================================================== +--- include/clang/Sema/AttributeList.h ++++ include/clang/Sema/AttributeList.h +@@ -855,7 +855,8 @@ + ExpectedStructOrUnionOrTypedef, + ExpectedStructOrTypedef, + ExpectedObjectiveCInterfaceOrProtocol, +- ExpectedKernelFunction ++ ExpectedKernelFunction, ++ ExpectedStructClassVariableFunctionMethodOrInlineNamespace + }; + + } // end namespace clang +Index: lib/AST/ItaniumMangle.cpp +=================================================================== +--- lib/AST/ItaniumMangle.cpp ++++ lib/AST/ItaniumMangle.cpp +@@ -31,6 +31,7 @@ + #include "llvm/ADT/StringExtras.h" + #include "llvm/Support/ErrorHandling.h" + #include "llvm/Support/raw_ostream.h" ++#include + + #define MANGLE_CHECKER 0 + +@@ -212,6 +212,8 @@ + class CXXNameMangler { + ItaniumMangleContextImpl &Context; + raw_ostream &Out; ++ bool NullOut = false; ++ bool DisableDerivedAbiTags = false; + + /// The "structor" is the top-level declaration being mangled, if + /// that's not a template specialization; otherwise it's the pattern +@@ -261,6 +263,167 @@ + + } FunctionTypeDepth; + ++ // abi_tag is a gcc attribute, taking one or more strings called "tags". ++ // ++ // the goal is to annotage against which version of a library an object was ++ // build and to be able to provide backwards compatibility ("dual abi"). ++ // ++ // for this the emitted mangled names have to be different, while you don't ++ // want the user to have to use different names in the source. ++ // ++ // the abi_tag can be present on Struct, Var and Function declarations as ++ // "explicit" tag, and on inline Namespace as "implicit" tag. Explicit tags ++ // are always emitted after the unqualified name, and (implicit) tags on ++ // namespace are not. ++ // ++ // For functions and variables there is a set of "implicitly available" ++ // tags. These tags are: all tags from the namespace/structs the name is ++ // embedded in, all tags from any template arguments of the name, and, for ++ // functions, alls tags used anywhere in the (i.e. ++ // parameters and sometimes the return type). ++ // ++ // For functions this is basically the list of all tags from the signature ++ // without the unqualified name and usually without the return type of the ++ // function. In `operator Type()` Type is NOT part of that list, as it is ++ // part of the unqualified name! ++ // ++ // Now all tags from the function return type/variable type which are not ++ // "implicitly available" must be added to the explicit list of tags, and ++ // are emitted after the unqualified name. ++ // ++ // Example: ++ // namespace std { ++ // inline namespace __cxx11 __attribute__((__abi_tag__("cxx11"))) { } ++ // inline namespace __cxx11 { ++ // struct string { }; ++ // } ++ // } ++ // ++ // std::string foo(); // needs abi tag "cxx11" on foo ++ // std::string foo(std::string); // does NOT need abi tag "cxx11" on foo ++ // __attribute__((__abi_tag__("cxx11"))) ++ // std::string foo2(std::string); // emit abi tag "cxx11" on foo anyway ++ // ++ // The tags are sorted by name before emitting, and are serialized as ++ // ::= B <"tag" source-name> ++ ++ typedef SmallVector AbiTagList; ++ ++ // state to gather all implicit and explicit tags used in a mangled name. ++ // must always have an instance of this while emitting any name to keep ++ // track. ++ // ++ // TODO(abitags): how to handle substituted names? they should add the tags used in ++ // the substitution to the list of available tags. ++ class AbiTagState final { ++ public: ++ //! all abi tags used implicitly or explicitly ++ std::set UsedAbiTags; ++ //! all explicit abi tags (i.e. not from namespace) ++ std::set EmittedAbiTags; ++ ++ AbiTagState* &LinkHead; ++ AbiTagState *Parent{nullptr}; ++ ++ bool LinkActive{false}; ++ ++ explicit AbiTagState(AbiTagState* &linkHead) ++ : LinkHead(linkHead) { ++ Parent = LinkHead; ++ LinkHead = this; ++ LinkActive = true; ++ } ++ ++ // no copy, no move ++ AbiTagState(AbiTagState const&) = delete; ++ AbiTagState& operator=(AbiTagState const&) = delete; ++ ++ ~AbiTagState() { ++ pop(); ++ } ++ ++ void pop() { ++ if (!LinkActive) return; ++ ++ assert(LinkHead == this && "abi tag link head must point to us on destruction"); ++ LinkActive = false; ++ if (Parent) { ++ Parent->UsedAbiTags.insert(UsedAbiTags.begin(), UsedAbiTags.end()); ++ Parent->EmittedAbiTags.insert(EmittedAbiTags.begin(), EmittedAbiTags.end()); ++ } ++ LinkHead = Parent; ++ } ++ ++ void write(raw_ostream &Out, const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) { ++ ND = cast(ND->getCanonicalDecl()); ++ ++ if (dyn_cast(ND) || dyn_cast(ND)) { ++ // assert(AdditionalAbiTags && "function and variables need a list of additional abi tags"); ++ } else { ++ assert(!AdditionalAbiTags && "only function and variables need a list of additional abi tags"); ++ if (const auto* NS = dyn_cast(ND)) { ++ if (const auto* AbiTag = NS->getAttr()) { ++ for (const auto& Tag: AbiTag->tags()) { ++ UsedAbiTags.insert(Tag); ++ } ++ } ++ // don't emit abi tags for namespaces ++ return; ++ } ++ } ++ ++ AbiTagList TagList; ++ if (const auto* AbiTag = ND->getAttr()) { ++ for (const auto& Tag: AbiTag->tags()) { ++ UsedAbiTags.insert(Tag); ++ // AbiTag->tags() is sorted and has no duplicates ++ TagList.push_back(Tag); ++ } ++ } ++ ++ if (AdditionalAbiTags) { ++ for (const auto& Tag: *AdditionalAbiTags) { ++ UsedAbiTags.insert(Tag); ++ if (std::find(TagList.begin(), TagList.end(), Tag) == TagList.end()) { ++ // don't insert duplicates ++ TagList.push_back(Tag); ++ } ++ } ++ // AbiTag->tags() are already sorted; only add if we had additional tags ++ std::sort(TagList.begin(), TagList.end()); ++ } ++ ++ writeSortedUniqueAbiTags(Out, TagList); ++ } ++ ++ protected: ++ template ++ void writeSortedUniqueAbiTags(raw_ostream &Out, TagList const& AbiTags) { ++ for (const auto& Tag: AbiTags) { ++ EmittedAbiTags.insert(Tag); ++ Out << "B"; ++ Out << Tag.size(); ++ Out << Tag; ++ } ++ } ++ } *AbiTags = nullptr; ++ AbiTagState AbiTagsRoot{AbiTags}; ++ ++ struct TemporaryDisableDerivedAbiTags { ++ bool& StateRef; ++ bool OldState; ++ ++ TemporaryDisableDerivedAbiTags(bool& State, bool Disable = true) ++ : StateRef(State) { ++ OldState = StateRef; ++ StateRef = Disable; ++ } ++ TemporaryDisableDerivedAbiTags(TemporaryDisableDerivedAbiTags const&) = delete; ++ ~TemporaryDisableDerivedAbiTags() { ++ StateRef = OldState; ++ } ++ }; ++ + llvm::DenseMap Substitutions; + + ASTContext &getASTContext() const { return Context.getASTContext(); } +@@ -283,6 +446,10 @@ + : Context(C), Out(Out_), Structor(getStructor(D)), StructorType(Type), + SeqID(0) { } + ++ CXXNameMangler(CXXNameMangler &Outer, llvm::raw_null_ostream &Out_) ++ : Context(Outer.Context), Out(Out_), NullOut(true), Structor(Outer.Structor), StructorType(Outer.StructorType), ++ SeqID(Outer.SeqID) { } ++ + #if MANGLE_CHECKER + ~CXXNameMangler() { + if (Out.str()[0] == '\01') +@@ -296,18 +463,21 @@ + #endif + raw_ostream &getStream() { return Out; } + ++ void disableDerivedAbiTags() { DisableDerivedAbiTags = true; } ++ + void mangle(const NamedDecl *D); + void mangleCallOffset(int64_t NonVirtual, int64_t Virtual); + void mangleNumber(const llvm::APSInt &I); + void mangleNumber(int64_t Number); + void mangleFloat(const llvm::APFloat &F); +- void mangleFunctionEncoding(const FunctionDecl *FD); ++ void mangleFunctionEncoding(const FunctionDecl *FD, bool ExcludeUnqualifiedName = false); + void mangleSeqID(unsigned SeqID); +- void mangleName(const NamedDecl *ND); ++ void mangleName(const NamedDecl *ND, bool ExcludeUnqualifiedName = false); + void mangleType(QualType T); + void mangleNameOrStandardSubstitution(const NamedDecl *ND); + + private: ++ void writeAbiTags(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags = nullptr); + + bool mangleSubstitution(const NamedDecl *ND); + bool mangleSubstitution(QualType T); +@@ -334,31 +504,49 @@ + DeclarationName name, + unsigned KnownArity = UnknownArity); + +- void mangleName(const TemplateDecl *TD, ++ void mangleFunctionEncodingBareType(const FunctionDecl *FD); ++ ++ void mangleNameWithAbiTags(const NamedDecl *ND, ++ const AbiTagList *AdditionalAbiTags, ++ bool ExcludeUnqualifiedName); ++ void mangleTemplateName(const TemplateDecl *TD, ++ const AbiTagList *AdditionalAbiTags, ++ bool ExcludeUnqualifiedName, + const TemplateArgument *TemplateArgs, + unsigned NumTemplateArgs); +- void mangleUnqualifiedName(const NamedDecl *ND) { +- mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity); ++ void mangleUnqualifiedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) { ++ mangleUnqualifiedName(ND, ND->getDeclName(), UnknownArity, AdditionalAbiTags); + } + void mangleUnqualifiedName(const NamedDecl *ND, DeclarationName Name, +- unsigned KnownArity); +- void mangleUnscopedName(const NamedDecl *ND); +- void mangleUnscopedTemplateName(const TemplateDecl *ND); +- void mangleUnscopedTemplateName(TemplateName); ++ unsigned KnownArity, const AbiTagList *AdditionalAbiTags); ++ void mangleUnscopedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags); ++ void mangleUnscopedTemplateName(const TemplateDecl *ND, ++ const AbiTagList *AdditionalAbiTags); ++ void mangleUnscopedTemplateName(TemplateName, ++ const AbiTagList *AdditionalAbiTags); + void mangleSourceName(const IdentifierInfo *II); +- void mangleLocalName(const Decl *D); ++ void mangleLocalName(const Decl *D, ++ const AbiTagList *AdditionalAbiTags, ++ bool ExcludeUnqualifiedName); + void mangleBlockForPrefix(const BlockDecl *Block); + void mangleUnqualifiedBlock(const BlockDecl *Block); + void mangleLambda(const CXXRecordDecl *Lambda); + void mangleNestedName(const NamedDecl *ND, const DeclContext *DC, +- bool NoFunction=false); ++ const AbiTagList *AdditionalAbiTags, ++ bool NoFunction, ++ bool ExcludeUnqualifiedName); + void mangleNestedName(const TemplateDecl *TD, ++ const AbiTagList *AdditionalAbiTags, ++ bool ExcludeUnqualifiedName, + const TemplateArgument *TemplateArgs, + unsigned NumTemplateArgs); + void manglePrefix(NestedNameSpecifier *qualifier); + void manglePrefix(const DeclContext *DC, bool NoFunction=false); + void manglePrefix(QualType type); +- void mangleTemplatePrefix(const TemplateDecl *ND, bool NoFunction=false); ++ void mangleTemplatePrefix(const TemplateDecl *ND, ++ const AbiTagList *AdditionalAbiTags, ++ bool NoFunction = false, ++ bool ExcludeUnqualifiedName = false); + void mangleTemplatePrefix(TemplateName Template); + bool mangleUnresolvedTypeOrSimpleId(QualType DestroyedType, + StringRef Prefix = ""); +@@ -405,6 +593,10 @@ + void mangleTemplateParameter(unsigned Index); + + void mangleFunctionParam(const ParmVarDecl *parm); ++ ++ std::set getTagsFromPrefixAndTemplateArguments(const NamedDecl *ND); ++ AbiTagList makeAdditionalTagsForFunction(const FunctionDecl *FD); ++ AbiTagList makeAdditionalTagsForVariable(const VarDecl *VD); + }; + + } +@@ -455,6 +647,11 @@ + return true; + } + ++void CXXNameMangler::writeAbiTags(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) { ++ assert(AbiTags && "require AbiTagState"); ++ if (AbiTags) AbiTags->write(Out, ND, DisableDerivedAbiTags ? nullptr : AdditionalAbiTags); ++} ++ + void CXXNameMangler::mangle(const NamedDecl *D) { + // ::= _Z + // ::= +@@ -470,14 +667,28 @@ + mangleName(cast(D)); + } + +-void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD) { +- // ::= +- mangleName(FD); +- ++void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD, bool ExcludeUnqualifiedName) { + // Don't mangle in the type if this isn't a decl we should typically mangle. +- if (!Context.shouldMangleDeclName(FD)) ++ if (!Context.shouldMangleDeclName(FD)) { ++ mangleNameWithAbiTags(FD, /* AdditionalAbiTags */ nullptr, ExcludeUnqualifiedName); + return; ++ } ++ ++ // ::= + ++ if (ExcludeUnqualifiedName) ++ { ++ // running makeAdditionalTagsForFunction would loop, don't need it here anyway ++ mangleNameWithAbiTags(FD, /* AdditionalAbiTags */ nullptr, ExcludeUnqualifiedName); ++ } else { ++ AbiTagList AdditionalAbiTags = makeAdditionalTagsForFunction(FD); ++ mangleNameWithAbiTags(FD, &AdditionalAbiTags, ExcludeUnqualifiedName); ++ } ++ ++ mangleFunctionEncodingBareType(FD); ++} ++ ++void CXXNameMangler::mangleFunctionEncodingBareType(const FunctionDecl *FD) { + if (FD->hasAttr()) { + FunctionTypeDepthState Saved = FunctionTypeDepth.push(); + Out << "Ua9enable_ifI"; +@@ -581,7 +792,21 @@ + return nullptr; + } + +-void CXXNameMangler::mangleName(const NamedDecl *ND) { ++// must not be run from mangleLocalName for the as it would loop otherwise. ++void CXXNameMangler::mangleName(const NamedDecl *ND, bool ExcludeUnqualifiedName) { ++ if (!ExcludeUnqualifiedName) { ++ if (const VarDecl *VD = dyn_cast(ND)) { ++ AbiTagList VariableAdditionalAbiTags = makeAdditionalTagsForVariable(VD); ++ mangleNameWithAbiTags(VD, &VariableAdditionalAbiTags, ExcludeUnqualifiedName); ++ return; ++ } ++ } ++ mangleNameWithAbiTags(ND, nullptr, ExcludeUnqualifiedName); ++} ++ ++void CXXNameMangler::mangleNameWithAbiTags(const NamedDecl *ND, ++ const AbiTagList *AdditionalAbiTags, ++ bool ExcludeUnqualifiedName) { + // ::= + // ::= + // ::= +@@ -597,7 +822,7 @@ + while (!DC->isNamespace() && !DC->isTranslationUnit()) + DC = getEffectiveParentContext(DC); + else if (GetLocalClassDecl(ND)) { +- mangleLocalName(ND); ++ mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName); + return; + } + +@@ -607,76 +832,88 @@ + // Check if we have a template. + const TemplateArgumentList *TemplateArgs = nullptr; + if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) { +- mangleUnscopedTemplateName(TD); ++ if (!ExcludeUnqualifiedName) ++ mangleUnscopedTemplateName(TD, AdditionalAbiTags); + mangleTemplateArgs(*TemplateArgs); + return; + } + +- mangleUnscopedName(ND); ++ if (!ExcludeUnqualifiedName) ++ mangleUnscopedName(ND, AdditionalAbiTags); + return; + } + + if (isLocalContainerContext(DC)) { +- mangleLocalName(ND); ++ mangleLocalName(ND, AdditionalAbiTags, ExcludeUnqualifiedName); + return; + } + +- mangleNestedName(ND, DC); ++ mangleNestedName(ND, DC, AdditionalAbiTags, /* NoFunction */ false, ExcludeUnqualifiedName); + } +-void CXXNameMangler::mangleName(const TemplateDecl *TD, +- const TemplateArgument *TemplateArgs, +- unsigned NumTemplateArgs) { ++ ++void CXXNameMangler::mangleTemplateName(const TemplateDecl *TD, ++ const AbiTagList *AdditionalAbiTags, ++ bool ExcludeUnqualifiedName, ++ const TemplateArgument *TemplateArgs, ++ unsigned NumTemplateArgs) { + const DeclContext *DC = IgnoreLinkageSpecDecls(getEffectiveDeclContext(TD)); + + if (DC->isTranslationUnit() || isStdNamespace(DC)) { +- mangleUnscopedTemplateName(TD); ++ if (!ExcludeUnqualifiedName) ++ mangleUnscopedTemplateName(TD, AdditionalAbiTags); + mangleTemplateArgs(TemplateArgs, NumTemplateArgs); + } else { +- mangleNestedName(TD, TemplateArgs, NumTemplateArgs); ++ mangleNestedName(TD, AdditionalAbiTags, ExcludeUnqualifiedName, TemplateArgs, NumTemplateArgs); + } + } + +-void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND) { ++void CXXNameMangler::mangleUnscopedName(const NamedDecl *ND, const AbiTagList *AdditionalAbiTags) { + // ::= + // ::= St # ::std:: + + if (isStdNamespace(IgnoreLinkageSpecDecls(getEffectiveDeclContext(ND)))) + Out << "St"; + +- mangleUnqualifiedName(ND); ++ mangleUnqualifiedName(ND, AdditionalAbiTags); + } + +-void CXXNameMangler::mangleUnscopedTemplateName(const TemplateDecl *ND) { ++void CXXNameMangler::mangleUnscopedTemplateName(const TemplateDecl *ND, ++ const AbiTagList *AdditionalAbiTags) { + // ::= + // ::= + if (mangleSubstitution(ND)) + return; + + // ::= +- if (const auto *TTP = dyn_cast(ND)) ++ if (const auto *TTP = dyn_cast(ND)) { ++ assert(!AdditionalAbiTags && "template template param cannot have abi tags"); // TODO(abitags) + mangleTemplateParameter(TTP->getIndex()); +- else +- mangleUnscopedName(ND->getTemplatedDecl()); ++ } else { ++ mangleUnscopedName(ND->getTemplatedDecl(), AdditionalAbiTags); ++ } + + addSubstitution(ND); + } + +-void CXXNameMangler::mangleUnscopedTemplateName(TemplateName Template) { ++void CXXNameMangler::mangleUnscopedTemplateName(TemplateName Template, ++ const AbiTagList *AdditionalAbiTags) { + // ::= + // ::= + if (TemplateDecl *TD = Template.getAsTemplateDecl()) +- return mangleUnscopedTemplateName(TD); ++ return mangleUnscopedTemplateName(TD, AdditionalAbiTags); + + if (mangleSubstitution(Template)) + return; + ++ assert(!AdditionalAbiTags && "dependent template name cannot have abi tags"); // TODO(abitags) ++ + DependentTemplateName *Dependent = Template.getAsDependentTemplateName(); + assert(Dependent && "Not a dependent template name?"); + if (const IdentifierInfo *Id = Dependent->getIdentifier()) + mangleSourceName(Id); + else + mangleOperatorName(Dependent->getOperator(), UnknownArity); +- ++ + addSubstitution(Template); + } + +@@ -835,14 +1072,16 @@ + else + Out << "sr"; + mangleSourceName(qualifier->getAsNamespace()->getIdentifier()); ++ writeAbiTags(qualifier->getAsNamespace()); + break; + case NestedNameSpecifier::NamespaceAlias: + if (qualifier->getPrefix()) + mangleUnresolvedPrefix(qualifier->getPrefix(), + /*recursive*/ true); + else + Out << "sr"; + mangleSourceName(qualifier->getAsNamespaceAlias()->getIdentifier()); ++ writeAbiTags(qualifier->getAsNamespaceAlias()); + break; + + case NestedNameSpecifier::TypeSpec: +@@ -877,6 +1116,7 @@ + Out << "sr"; + + mangleSourceName(qualifier->getAsIdentifier()); ++ // an Identifier has no type information, so we can't emit abi tags for it + break; + } + +@@ -922,7 +1162,8 @@ + + void CXXNameMangler::mangleUnqualifiedName(const NamedDecl *ND, + DeclarationName Name, +- unsigned KnownArity) { ++ unsigned KnownArity, ++ const AbiTagList *AdditionalAbiTags) { + unsigned Arity = KnownArity; + // ::= + // ::= +@@ -941,6 +1182,7 @@ + Out << 'L'; + + mangleSourceName(II); ++ writeAbiTags(ND, AdditionalAbiTags); + break; + } + +@@ -980,6 +1222,7 @@ + assert(FD->getIdentifier() && "Data member name isn't an identifier!"); + + mangleSourceName(FD->getIdentifier()); ++ // TODO(abitags): not emitting abi tags: internal name anyway + break; + } + +@@ -1000,6 +1243,9 @@ + assert(D->getDeclName().getAsIdentifierInfo() && + "Typedef was not named!"); + mangleSourceName(D->getDeclName().getAsIdentifierInfo()); ++ assert(!AdditionalAbiTags && "Type cannot have additional abi tags"); ++ // explicit abi tags are still possible; take from underlying type, not from typedef. ++ writeAbiTags(TD, nullptr); + break; + } + +@@ -1009,6 +1255,7 @@ + // ::= + # Parameter types or 'v' for 'void'. + if (const CXXRecordDecl *Record = dyn_cast(TD)) { + if (Record->isLambda() && Record->getLambdaManglingNumber()) { ++ assert(!AdditionalAbiTags && "Lambda type cannot have additional abi tags"); + mangleLambda(Record); + break; + } +@@ -1020,6 +1267,7 @@ + if (UnnamedMangle > 1) + Out << UnnamedMangle - 2; + Out << '_'; ++ writeAbiTags(TD, AdditionalAbiTags); + break; + } + +@@ -1052,6 +1300,7 @@ + // Otherwise, use the complete constructor name. This is relevant if a + // class with a constructor is declared within a constructor. + mangleCXXCtorType(Ctor_Complete); ++ writeAbiTags(ND, AdditionalAbiTags); + break; + + case DeclarationName::CXXDestructorName: +@@ -1063,6 +1312,7 @@ + // Otherwise, use the complete destructor name. This is relevant if a + // class with a destructor is declared within a destructor. + mangleCXXDtorType(Dtor_Complete); ++ writeAbiTags(ND, AdditionalAbiTags); + break; + + case DeclarationName::CXXOperatorName: +@@ -1078,6 +1328,7 @@ + case DeclarationName::CXXConversionFunctionName: + case DeclarationName::CXXLiteralOperatorName: + mangleOperatorName(Name, Arity); ++ writeAbiTags(ND, AdditionalAbiTags); + break; + + case DeclarationName::CXXUsingDirective: +@@ -1094,7 +1345,9 @@ + + void CXXNameMangler::mangleNestedName(const NamedDecl *ND, + const DeclContext *DC, +- bool NoFunction) { ++ const AbiTagList *AdditionalAbiTags, ++ bool NoFunction, ++ bool ExcludeUnqualifiedName) { + // + // ::= N [] [] E + // ::= N [] [] +@@ -1114,30 +1367,35 @@ + // Check if we have a template. + const TemplateArgumentList *TemplateArgs = nullptr; + if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) { +- mangleTemplatePrefix(TD, NoFunction); ++ mangleTemplatePrefix(TD, AdditionalAbiTags, NoFunction, ExcludeUnqualifiedName); + mangleTemplateArgs(*TemplateArgs); + } + else { + manglePrefix(DC, NoFunction); +- mangleUnqualifiedName(ND); ++ if (!ExcludeUnqualifiedName) ++ mangleUnqualifiedName(ND, AdditionalAbiTags); + } + + Out << 'E'; + } + void CXXNameMangler::mangleNestedName(const TemplateDecl *TD, ++ const AbiTagList *AdditionalAbiTags, ++ bool ExcludeUnqualifiedName, + const TemplateArgument *TemplateArgs, + unsigned NumTemplateArgs) { + // ::= N [] E + + Out << 'N'; + +- mangleTemplatePrefix(TD); ++ mangleTemplatePrefix(TD, AdditionalAbiTags, ExcludeUnqualifiedName); + mangleTemplateArgs(TemplateArgs, NumTemplateArgs); + + Out << 'E'; + } + +-void CXXNameMangler::mangleLocalName(const Decl *D) { ++void CXXNameMangler::mangleLocalName(const Decl *D, ++ const AbiTagList *AdditionalAbiTags, ++ bool ExcludeUnqualifiedName) { + // := Z E [] + // := Z E s [] + // := Z E d [ ] +@@ -1149,15 +1407,25 @@ + + Out << 'Z'; + +- if (const ObjCMethodDecl *MD = dyn_cast(DC)) +- mangleObjCMethodName(MD); +- else if (const BlockDecl *BD = dyn_cast(DC)) +- mangleBlockForPrefix(BD); +- else +- mangleFunctionEncoding(cast(DC)); ++ { ++ AbiTagState localAbiTags(AbiTags); ++ ++ if (const ObjCMethodDecl *MD = dyn_cast(DC)) ++ mangleObjCMethodName(MD); ++ else if (const BlockDecl *BD = dyn_cast(DC)) ++ mangleBlockForPrefix(BD); ++ else ++ mangleFunctionEncoding(cast(DC)); ++ ++ // implicit abi tags (from namespace) are not available in the following ++ // entity; reset to actually emitted tags, which are available. ++ localAbiTags.UsedAbiTags = localAbiTags.EmittedAbiTags; ++ } + + Out << 'E'; + ++ TemporaryDisableDerivedAbiTags TemporyDisable(DisableDerivedAbiTags, getStructor(dyn_cast(D)) != Structor); ++ + if (RD) { + // The parameter number is omitted for the last parameter, 0 for the + // second-to-last parameter, 1 for the third-to-last parameter, etc. The +@@ -1182,13 +1450,17 @@ + // Mangle the name relative to the closest enclosing function. + // equality ok because RD derived from ND above + if (D == RD) { +- mangleUnqualifiedName(RD); ++ if (!ExcludeUnqualifiedName) ++ mangleUnqualifiedName(RD, AdditionalAbiTags); + } else if (const BlockDecl *BD = dyn_cast(D)) { + manglePrefix(getEffectiveDeclContext(BD), true /*NoFunction*/); +- mangleUnqualifiedBlock(BD); ++ assert(!AdditionalAbiTags && "Block cannot have additional abi tags"); ++ if (!ExcludeUnqualifiedName) ++ mangleUnqualifiedBlock(BD); + } else { + const NamedDecl *ND = cast(D); +- mangleNestedName(ND, getEffectiveDeclContext(ND), true /*NoFunction*/); ++ mangleNestedName(ND, getEffectiveDeclContext(ND), ++ AdditionalAbiTags, true /*NoFunction*/, ExcludeUnqualifiedName); + } + } else if (const BlockDecl *BD = dyn_cast(D)) { + // Mangle a block in a default parameter; see above explanation for +@@ -1205,30 +1477,35 @@ + } + } + +- mangleUnqualifiedBlock(BD); ++ assert(!AdditionalAbiTags && "Block cannot have additional abi tags"); ++ if (!ExcludeUnqualifiedName) ++ mangleUnqualifiedBlock(BD); + } else { +- mangleUnqualifiedName(cast(D)); +- } +- +- if (const NamedDecl *ND = dyn_cast(RD ? RD : D)) { +- unsigned disc; +- if (Context.getNextDiscriminator(ND, disc)) { +- if (disc < 10) +- Out << '_' << disc; +- else +- Out << "__" << disc << '_'; ++ if (!ExcludeUnqualifiedName) ++ mangleUnqualifiedName(cast(D), AdditionalAbiTags); ++ } ++ ++ if (!ExcludeUnqualifiedName) { ++ if (const NamedDecl *ND = dyn_cast(RD ? RD : D)) { ++ unsigned disc; ++ if (Context.getNextDiscriminator(ND, disc)) { ++ if (disc < 10) ++ Out << '_' << disc; ++ else ++ Out << "__" << disc << '_'; ++ } + } + } + } + + void CXXNameMangler::mangleBlockForPrefix(const BlockDecl *Block) { + if (GetLocalClassDecl(Block)) { +- mangleLocalName(Block); ++ mangleLocalName(Block, /* AdditionalAbiTags */ nullptr, /* ExcludeUnqualifiedName */ false); + return; + } + const DeclContext *DC = getEffectiveDeclContext(Block); + if (isLocalContainerContext(DC)) { +- mangleLocalName(Block); ++ mangleLocalName(Block, /* AdditionalAbiTags */ nullptr, /* ExcludeUnqualifiedName */ false); + return; + } + manglePrefix(getEffectiveDeclContext(Block)); +@@ -1239,10 +1516,11 @@ + if (Decl *Context = Block->getBlockManglingContextDecl()) { + if ((isa(Context) || isa(Context)) && + Context->getDeclContext()->isRecord()) { +- if (const IdentifierInfo *Name +- = cast(Context)->getIdentifier()) { ++ const auto *ND = cast(Context); ++ if (const IdentifierInfo *Name = ND->getIdentifier()) { + mangleSourceName(Name); +- Out << 'M'; ++ writeAbiTags(ND, /* AdditionalAbiTags */ nullptr); ++ Out << 'M'; + } + } + } +@@ -1275,7 +1553,7 @@ + if (const IdentifierInfo *Name + = cast(Context)->getIdentifier()) { + mangleSourceName(Name); +- Out << 'M'; ++ Out << 'M'; + } + } + } +@@ -1358,11 +1636,11 @@ + // Check if we have a template. + const TemplateArgumentList *TemplateArgs = nullptr; + if (const TemplateDecl *TD = isTemplate(ND, TemplateArgs)) { +- mangleTemplatePrefix(TD); ++ mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr); + mangleTemplateArgs(*TemplateArgs); + } else { + manglePrefix(getEffectiveDeclContext(ND), NoFunction); +- mangleUnqualifiedName(ND); ++ mangleUnqualifiedName(ND, /* AdditionalAbiTags */ nullptr); + } + + addSubstitution(ND); +@@ -1373,27 +1651,30 @@ + // ::= + // ::= + if (TemplateDecl *TD = Template.getAsTemplateDecl()) +- return mangleTemplatePrefix(TD); ++ return mangleTemplatePrefix(TD, /* AdditionalAbiTags */ nullptr); + + if (QualifiedTemplateName *Qualified = Template.getAsQualifiedTemplateName()) + manglePrefix(Qualified->getQualifier()); +- ++ + if (OverloadedTemplateStorage *Overloaded + = Template.getAsOverloadedTemplate()) { + mangleUnqualifiedName(nullptr, (*Overloaded->begin())->getDeclName(), +- UnknownArity); ++ UnknownArity, ++ /* AdditionalAbiTags */ nullptr); + return; + } +- ++ + DependentTemplateName *Dependent = Template.getAsDependentTemplateName(); + assert(Dependent && "Unknown template name kind?"); + if (NestedNameSpecifier *Qualifier = Dependent->getQualifier()) + manglePrefix(Qualifier); +- mangleUnscopedTemplateName(Template); ++ mangleUnscopedTemplateName(Template, /* AdditionalAbiTags */ nullptr); + } + + void CXXNameMangler::mangleTemplatePrefix(const TemplateDecl *ND, +- bool NoFunction) { ++ const AbiTagList *AdditionalAbiTags, ++ bool NoFunction, ++ bool ExcludeUnqualifiedName) { + // ::=