diff options
Diffstat (limited to 'abs')
29 files changed, 114 insertions, 81 deletions
diff --git a/abs/core-testing/filesystem/PKGBUILD b/abs/core-testing/filesystem/PKGBUILD index b68b73a..aca2a86 100644 --- a/abs/core-testing/filesystem/PKGBUILD +++ b/abs/core-testing/filesystem/PKGBUILD @@ -4,7 +4,7 @@ pkgname=filesystem pkgver=2009.01 -pkgrel=3 +pkgrel=4 pkgdesc="Base filesystem" arch=(i686 x86_64) license=('GPL') @@ -18,25 +18,6 @@ backup=(etc/fstab etc/crypttab etc/group etc/hosts etc/ld.so.conf etc/passwd source=(group issue nsswitch.conf securetty host.conf ld.so.conf passwd shadow fstab crypttab hosts motd resolv.conf shells gshadow services protocols profile modprobe.d.usb-load-ehci-first) -md5sums=('f4cf8d0a2de2658165148d5f64d81675' - '1bdc5dba66947d74866a5df8ce9ef3b1' - '775464ba7588b4976e0c2a02b83123f4' - '655071da46d2ac03e0fb8a071bf193ea' - 'f28150d4c0b22a017be51b9f7f9977ed' - '2c24792d97ef3cf0d73b60d4c429730b' - '8a9042a2cedf6b6b47eb8973f14289cb' - '019e5c24f9befef395a28e7ef2e4e5b9' - 'c4f23a66a1bcc08fd164639bdafbc60a' - 'e5d8323a4dbee7a6d0d2a19cbf4b819f' - '81b3cb42a6ddabc2ed2310511ee9c859' - 'd41d8cd98f00b204e9800998ecf8427e' - '6f48288b6fcaf0065fcb7b0e525413e0' - '40dac0de4c6b99c8ca97effbd7527c84' - 'ab9c2a40eba287b2918589ab8e0b2fbf' - 'f436d2e0ed02b7b73bd10c6693e95ac3' - '65d78e621ed69eed69f854c3ee2e5942' - '288a2e8d63c5ea2c2d852c7147e59d28' - '8098ffd9fbf890468d3198277596b85a') build() { @@ -92,3 +73,23 @@ build() # Add /etc/modprobe.d/ install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first ${pkgdir}/etc/modprobe.d/usb-load-ehci-first } + +md5sums=('f4cf8d0a2de2658165148d5f64d81675' + '1bdc5dba66947d74866a5df8ce9ef3b1' + '042ab2ae8ee489908ae87e0598070a11' + '655071da46d2ac03e0fb8a071bf193ea' + 'f28150d4c0b22a017be51b9f7f9977ed' + '2c24792d97ef3cf0d73b60d4c429730b' + '8a9042a2cedf6b6b47eb8973f14289cb' + '019e5c24f9befef395a28e7ef2e4e5b9' + 'c4f23a66a1bcc08fd164639bdafbc60a' + 'e5d8323a4dbee7a6d0d2a19cbf4b819f' + '81b3cb42a6ddabc2ed2310511ee9c859' + 'd41d8cd98f00b204e9800998ecf8427e' + '6f48288b6fcaf0065fcb7b0e525413e0' + '40dac0de4c6b99c8ca97effbd7527c84' + 'ab9c2a40eba287b2918589ab8e0b2fbf' + 'f436d2e0ed02b7b73bd10c6693e95ac3' + '65d78e621ed69eed69f854c3ee2e5942' + '288a2e8d63c5ea2c2d852c7147e59d28' + '8098ffd9fbf890468d3198277596b85a') diff --git a/abs/core-testing/filesystem/nsswitch.conf b/abs/core-testing/filesystem/nsswitch.conf index 7d86691..ec84725 100644 --- a/abs/core-testing/filesystem/nsswitch.conf +++ b/abs/core-testing/filesystem/nsswitch.conf @@ -15,5 +15,6 @@ ethers: db files rpc: db files netgroup: db files +automount:files # End /etc/nsswitch.conf diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD index e77d22a..d4bdc50 100644 --- a/abs/core-testing/linhes-scripts/PKGBUILD +++ b/abs/core-testing/linhes-scripts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-scripts pkgver=1 -pkgrel=76 +pkgrel=77 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') @@ -56,6 +56,7 @@ build() { mkdir -p $startdir/pkg/etc/logrotate.d/ cp pause_mythcommflag $startdir/pkg/etc/logrotate.d/ } + md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' '9a2181cdc0bc9cc8b42101f19620def8' '9ae2cd7a0c42d57ad8b5f515d7d60196' @@ -79,7 +80,7 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5' 'c537c44156d8404016cc4b405b092d45' '4e66f302a77f1a857476e7f289d0c157' 'be324dba44ae96676973a74421944853' - 'c9dc0dd07369622879a000247ac55074' + 'ccca6bdbbd86b203a3eecdbbe363e701' '65629302a4d2c3adf88cdf0ebc10d493' '2734054f08c4c885bb9070dce239d4c3' '87b0dc855181f98516acb18a7d551601' diff --git a/abs/core-testing/linhes-scripts/install_hulu.sh b/abs/core-testing/linhes-scripts/install_hulu.sh index 28e855c..9b06b2e 100644 --- a/abs/core-testing/linhes-scripts/install_hulu.sh +++ b/abs/core-testing/linhes-scripts/install_hulu.sh @@ -11,11 +11,11 @@ echo "Please download it from http://www.hulu.com/labs/hulu-desktop-linux" echo "Then copy (or move) it to /tmp" exit fi -if grep -q Hulu /usr/share/mythtv/is.xml +if grep -q Hulu /usr/share/mythtv/themes/defaultmenu/is.xml then echo "Hulu Desktop exist in Online Streams!" else - mv /usr/share/mythtv/is.xml /tmp + mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp echo "<!--#Hulu-->" >> /tmp/is.xml.tmp echo " <button>" >> /tmp/is.xml.tmp @@ -26,7 +26,7 @@ else echo "<!--#Hulu-->" >> /tmp/is.xml.tmp echo "" >> /tmp/is.xml.tmp echo "</mythmenu>" >> /tmp/is.xml.tmp - mv /tmp/is.xml.tmp /usr/share/mythtv/is.xml + mv /tmp/is.xml.tmp /usr/share/mythtv/themes/defaultmenu/is.xml echo "Hulu Desktop has been added to Online Streams!" fi if [ -e /home/mythtv/.huludesktop ] diff --git a/abs/core-testing/mythinstall/PKGBUILD b/abs/core-testing/mythinstall/PKGBUILD index 7c89e24..387358f 100644 --- a/abs/core-testing/mythinstall/PKGBUILD +++ b/abs/core-testing/mythinstall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jams pkgname=mythinstall pkgver=2 -pkgrel=46 +pkgrel=47 pkgdesc="LinHES installer/systemconfig GUI." arch=i686 depends=() diff --git a/abs/core-testing/mythstream/PKGBUILD b/abs/core-testing/mythstream/PKGBUILD index 8c58fae..023bf01 100644 --- a/abs/core-testing/mythstream/PKGBUILD +++ b/abs/core-testing/mythstream/PKGBUILD @@ -4,7 +4,7 @@ pkgname=mythstream pkgver=0.18_3 -pkgrel=6 +pkgrel=8 pkgdesc="Unofficial MythTV plugin for Internet audio and video streams." arch=('i686' 'x86_64') url="http://home.kabelfoon.nl/~moongies/streamtuned.html" @@ -31,6 +31,7 @@ build() { make INSTALL_ROOT=$startdir/pkg install cp $srcdir/streams.res $pkgdir/usr/share/mythtv/mythstream } + md5sums=('ba354b83fefe6028c5379fb832a44b6a' '0131d9e05b55141357bc66e2a88a8132' 'b7fb47a56b6809938f237632174faeb2') diff --git a/abs/core-testing/mythstream/mythstream.install b/abs/core-testing/mythstream/mythstream.install index 5af96f2..3b87835 100644 --- a/abs/core-testing/mythstream/mythstream.install +++ b/abs/core-testing/mythstream/mythstream.install @@ -1,6 +1,6 @@ # arg 1: the new package version post_install() { - mv /usr/share/mythtv/is.xml /tmp + mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp echo "<!--#MythStream-->" >> /tmp/is.xml.tmp echo " <button>" >> /tmp/is.xml.tmp @@ -11,11 +11,11 @@ post_install() { echo "<!--#MythStream-->" >> /tmp/is.xml.tmp echo "" >> /tmp/is.xml.tmp echo "</mythmenu>" >> /tmp/is.xml.tmp - mv /tmp/is.xml.tmp /usr/share/mythtv/is.xml + mv /tmp/is.xml.tmp /usr/share/mythtv/themes/defaultmenu/is.xml } post_remove() { - mv /usr/share/mythtv/is.xml /tmp/is.xml.tmp - sed -e '/\#MythStream/,/\#MythStream/d' < /tmp/is.xml.tmp > /usr/share/mythtv/is.xml + mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp/is.xml.tmp + sed -e '/\#MythStream/,/\#MythStream/d' < /tmp/is.xml.tmp > /usr/share/mythtv/themes/defaultmenu/is.xml } op=$1 diff --git a/abs/core-testing/mythtv/stable-0.23/mytharchive/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mytharchive/PKGBUILD index 2f0446c..d34d397 100644 --- a/abs/core-testing/mythtv/stable-0.23/mytharchive/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/mytharchive/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mytharchive pkgver=0.23 -pkgrel=5 +pkgrel=6 pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows." url="http://www.mythtv.org" license="GPL" diff --git a/abs/core-testing/mythtv/stable-0.23/mythbrowser/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythbrowser/PKGBUILD index 916cb86..dfa3c0e 100644 --- a/abs/core-testing/mythtv/stable-0.23/mythbrowser/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/mythbrowser/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythbrowser pkgver=0.23 -pkgrel=4 +pkgrel=5 pkgdesc="Mini web browser for MythTV" url="http://www.mythtv.org" license="GPL" diff --git a/abs/core-testing/mythtv/stable-0.23/mythgallery/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythgallery/PKGBUILD index 12b81e4..5c2eff1 100644 --- a/abs/core-testing/mythtv/stable-0.23/mythgallery/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/mythgallery/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythgallery pkgver=0.23 -pkgrel=5 +pkgrel=6 pkgdesc="Image gallery plugin for MythTV" url="http://www.mythtv.org" license="GPL" diff --git a/abs/core-testing/mythtv/stable-0.23/mythgame/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythgame/PKGBUILD index 224491e..6f9d445 100644 --- a/abs/core-testing/mythtv/stable-0.23/mythgame/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/mythgame/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythgame pkgver=0.23 -pkgrel=4 +pkgrel=5 pkgdesc="Emulation plugin for MythTV" url="http://www.mythtv.org" license="GPL" diff --git a/abs/core-testing/mythtv/stable-0.23/mythmovies/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythmovies/PKGBUILD index 7e7726f..a53453a 100644 --- a/abs/core-testing/mythtv/stable-0.23/mythmovies/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/mythmovies/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythmovies pkgver=0.23 -pkgrel=4 +pkgrel=6 pkgdesc="Displays information about movies playing in the area." url="http://www.mythtv.org" license="GPL" diff --git a/abs/core-testing/mythtv/stable-0.23/mythmusic/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythmusic/PKGBUILD index 72657c4..70cd6d9 100644 --- a/abs/core-testing/mythtv/stable-0.23/mythmusic/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/mythmusic/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythmusic pkgver=0.23 -pkgrel=6 +pkgrel=8 pkgdesc="Music playing plugin for MythTV" url="http://www.mythtv.org" license="GPL" diff --git a/abs/core-testing/mythtv/stable-0.23/mythnetvision/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythnetvision/PKGBUILD index 5ecbd78..6cd5059 100644 --- a/abs/core-testing/mythtv/stable-0.23/mythnetvision/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/mythnetvision/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythnetvision pkgver=0.23 -pkgrel=6 +pkgrel=7 pkgdesc="Internet video plugin for MythTV" url="http://www.mythtv.org" license="GPL" diff --git a/abs/core-testing/mythtv/stable-0.23/mythnews/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythnews/PKGBUILD index c719323..1bf285e 100644 --- a/abs/core-testing/mythtv/stable-0.23/mythnews/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/mythnews/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythnews pkgver=0.23 -pkgrel=5 +pkgrel=6 pkgdesc="News checking plugin for MythTV" url="http://www.mythtv.org" license="GPL" diff --git a/abs/core-testing/mythtv/stable-0.23/mythsmolt/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythsmolt/PKGBUILD index 6ec22a8..0fa1e40 100644 --- a/abs/core-testing/mythtv/stable-0.23/mythsmolt/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/mythsmolt/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythsmolt pkgver=0.23 -pkgrel=2 +pkgrel=3 pkgdesc="mythsmolt, a hardware profileing tool" arch=('i686' 'x86_64') url="http://www.mythvantage.com" diff --git a/abs/core-testing/mythtv/stable-0.23/myththemes/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/myththemes/PKGBUILD index 371ce97..1d9eab5 100755 --- a/abs/core-testing/mythtv/stable-0.23/myththemes/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/myththemes/PKGBUILD @@ -1,6 +1,6 @@ pkgname=myththemes pkgver=0.23 -pkgrel=5 +pkgrel=7 pkgdesc="Themes for MythTV" url="http://www.mythtv.org" license="GPL" diff --git a/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD index 72934da..bf4f404 100755 --- a/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.23 -pkgrel=24 +pkgrel=26 pkgdesc="A personal video recorder for Linux" url="http://www.mythtv.org" license="GPL" diff --git a/abs/core-testing/mythtv/stable-0.23/mythvideo/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythvideo/PKGBUILD index 0761d6a..6783dbc 100644 --- a/abs/core-testing/mythtv/stable-0.23/mythvideo/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/mythvideo/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythvideo pkgver=0.23 -pkgrel=6 +pkgrel=9 pkgdesc="Video playback and browsing plugin for MythTV" url="http://www.mythtv.org" license="GPL" diff --git a/abs/core-testing/mythtv/stable-0.23/mythweather/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythweather/PKGBUILD index de3abaf..b8224ee 100644 --- a/abs/core-testing/mythtv/stable-0.23/mythweather/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/mythweather/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweather pkgver=0.23 -pkgrel=5 +pkgrel=7 pkgdesc="Weather checking plugin for MythTV" url="http://www.mythtv.org" license="GPL" diff --git a/abs/core-testing/mythtv/stable-0.23/mythzoneminder/PKGBUILD b/abs/core-testing/mythtv/stable-0.23/mythzoneminder/PKGBUILD index a7fa2e7..58ebb93 100644 --- a/abs/core-testing/mythtv/stable-0.23/mythzoneminder/PKGBUILD +++ b/abs/core-testing/mythtv/stable-0.23/mythzoneminder/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythzoneminder pkgver=0.23 -pkgrel=5 +pkgrel=6 pkgdesc="Integrates ZoneMinder into MythTV" url="http://www.mythtv.org" license="GPL" diff --git a/abs/extra-testing/autofs/Changelog b/abs/extra-testing/autofs/Changelog index 7807b97..d8df4dc 100755 --- a/abs/extra-testing/autofs/Changelog +++ b/abs/extra-testing/autofs/Changelog @@ -2,3 +2,5 @@ Cecil - Added run and finish files for runit. 6/28/10 Britney - Updated run to manage automount; removed finish and /etc/rc.d/autofs; added logger +5.0.5-1 6/12/10 +Britney - Updated to 5.0.5 based on arch autofs 5.0.5 PKGBUILD and heimdal.patch with runit support added. diff --git a/abs/extra-testing/autofs/PKGBUILD b/abs/extra-testing/autofs/PKGBUILD index a06e83d..ac317d2 100755 --- a/abs/extra-testing/autofs/PKGBUILD +++ b/abs/extra-testing/autofs/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 36638 2009-04-26 19:00:46Z andrea $ +# $Id: PKGBUILD 75323 2010-04-01 10:16:24Z allan $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=autofs -pkgver=5.0.4 -pkgrel=6 -pkgdesc="A kernel-based automounter for Linux." +pkgver=5.0.5 +pkgrel=1 +pkgdesc="A kernel-based automounter for Linux" arch=('i686' 'x86_64') url="http://wiki.autofs.net/FrontPage" license=('GPL2') depends=('libldap' 'libxml2' 'heimdal') backup=(etc/autofs/auto.master etc/autofs/auto.misc etc/conf.d/autofs) -install=autofs.install +install=${pkgname}.install source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2" 'autofs.conf.d' 'auto.master' 'auto.misc' - 'heimdal.patch' 'run' 'log.run') + 'heimdal.patch' 'run' 'log.run' 'finish') build() { export MAKEFLAGS="-j1" @@ -29,26 +29,29 @@ build() { --with-mapdir=/etc/autofs \ --without-hesiod make || return 1 + + sed -i "s:/etc:/etc/autofs:g" man/auto.master.5 +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} make INSTALLROOT=${pkgdir} install - local conf_file - for conf_file in auto.{master,misc}; do - install -D -m 644 ${srcdir}/$conf_file ${pkgdir}/etc/autofs/$conf_file - done - - sed -i "s:/etc:/etc/autofs:g" ${pkgdir}/usr/share/man/man5/auto.master.5 - install -D -m 644 ${srcdir}/autofs.conf.d ${pkgdir}/etc/conf.d/autofs + install -Dm644 ${srcdir}/auto.master ${pkgdir}/etc/autofs/auto.master || return 1 + install -Dm644 ${srcdir}/auto.misc ${pkgdir}/etc/autofs/auto.misc || return 1 + install -Dm644 ${srcdir}/autofs.conf.d ${pkgdir}/etc/conf.d/autofs || return 1 mkdir -p ${pkgdir}/etc/sv/autofs/supervise mkdir -p ${pkgdir}/etc/sv/autofs/log/supervise - install -D -m 744 ${srcdir}/run ${pkgdir}/etc/sv/autofs - install -D -m 744 ${srcdir}/log.run ${pkgdir}/etc/sv/autofs/log/run + install -Dm744 ${srcdir}/run ${pkgdir}/etc/sv/autofs || return 1 + install -Dm744 ${srcdir}/finish ${pkgdir}/etc/sv/autofs || return 1 + install -Dm744 ${srcdir}/log.run ${pkgdir}/etc/sv/autofs/log/run || return 1 } -# vim: ts=2 sw=2 et ft=sh -md5sums=('2646dde61edd08dd952255558c733c08' +md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a' '47f597c870410055e0fdb66103daf928' 'a6cefb591e77b31b79dbb7243646c96b' 'd8a15ec9186c5c0b36e5cea1e2739e8a' - '1ee4825e26ad72bfe86acec3d3da5d2a' - 'de5341a56e0c6c5ec89ed361f9107b3b' - '518e277f960a1af837ba6c5cca13c615') + 'efd46b6406b940cb48f7c6197790fb8e' + 'f2048c24da7fa1421c2e8b0b90fb17f9' + '518e277f960a1af837ba6c5cca13c615' + '5b30948886b6d71287652d784fccf1fb') diff --git a/abs/extra-testing/autofs/autofs.install b/abs/extra-testing/autofs/autofs.install index 61120bb..7806efa 100644 --- a/abs/extra-testing/autofs/autofs.install +++ b/abs/extra-testing/autofs/autofs.install @@ -1,5 +1,5 @@ post_install(){ - echo "########################################################" - echo "In autofs5 --ghost option isn't valid. In order to start" - echo "autofs you must remove it from your /etc/conf.d/autofs. " + echo "#########################################################" + echo "In autofs5 --ghost option isn't valid. In order to start autofs" + echo "you must remove that option from your /etc/conf.d/autofs. " } diff --git a/abs/extra-testing/autofs/finish b/abs/extra-testing/autofs/finish new file mode 100755 index 0000000..40d2fdc --- /dev/null +++ b/abs/extra-testing/autofs/finish @@ -0,0 +1,9 @@ +#!/bin/sh +exec 2>&1 + +. /etc/rc.conf +. /etc/rc.d/functions + +stat_runit "Stopping autofs4 kernel module" && echo "" +set -e # barf if modprobe fails +/sbin/modprobe -r autofs4 diff --git a/abs/extra-testing/autofs/heimdal.patch b/abs/extra-testing/autofs/heimdal.patch index c49b1fd..4aa3218 100644 --- a/abs/extra-testing/autofs/heimdal.patch +++ b/abs/extra-testing/autofs/heimdal.patch @@ -1,5 +1,5 @@ ---- autofs-5.0.4/modules/cyrus-sasl.c~ 2009-01-11 17:18:55.000000000 +0100 -+++ autofs-5.0.4/modules/cyrus-sasl.c 2009-01-11 17:18:55.000000000 +0100 +--- autofs-5.0.5/modules/cyrus-sasl.c~ 2010-03-03 01:38:41.582901786 +0100 ++++ autofs-5.0.5/modules/cyrus-sasl.c 2010-03-03 01:41:32.313704755 +0100 @@ -66,6 +66,15 @@ #endif #endif @@ -16,19 +16,29 @@ /* * Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME * environment variable so that the library knows where to find it. -@@ -451,11 +460,11 @@ +@@ -452,11 +452,11 @@ /* setup a principal for the ticket granting service */ ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ, - krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, - krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, -+ krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), -+ krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), ++ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), ++ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), strlen(KRB5_TGS_NAME), KRB5_TGS_NAME, - krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, - krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, -+ krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), -+ krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), ++ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), ++ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), 0); if (ret) { error(logopt, +--- autofs-5.0.5/modules/Makefile~ 2010-03-03 01:42:18.532868539 +0100 ++++ autofs-5.0.5/modules/Makefile 2010-03-03 01:42:35.360367371 +0100 +@@ -43,7 +43,7 @@ + ifeq ($(SASL), 1) + SASL_OBJ = cyrus-sasl.o + LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) -DLDAP_THREAD_SAFE +- LIBLDAP += $(LIBSASL) $(XML_LIBS) ++ LIBLDAP += $(LIBSASL) $(XML_LIBS) -lkrb5 + endif + endif
\ No newline at end of file diff --git a/abs/extra-testing/autofs/run b/abs/extra-testing/autofs/run index 7d146fc..342ade6 100755 --- a/abs/extra-testing/autofs/run +++ b/abs/extra-testing/autofs/run @@ -1,9 +1,14 @@ #!/bin/sh exec 2>&1 + +. /etc/rc.conf +. /etc/rc.d/functions + +stat_runit "Starting autofs4 kernel module" && echo "" set -e # barf if modprobe fails /sbin/modprobe autofs4 -#exec /etc/rc.d/autofs start +stat_runit "Starting autofs automount" && echo "" # source application-specific settings [ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs diff --git a/abs/extra-testing/mythappletrailers/PKGBUILD b/abs/extra-testing/mythappletrailers/PKGBUILD index c8399fc..2f36a4d 100644 --- a/abs/extra-testing/mythappletrailers/PKGBUILD +++ b/abs/extra-testing/mythappletrailers/PKGBUILD @@ -3,7 +3,7 @@ pkgname=mythappletrailers pkgver=0.04.3 -pkgrel=40 +pkgrel=41 pkgdesc="Unofficial Add-on for MythTV to get Apple.com Movie Trailers." arch=('i686' 'x86_64') license=('GPL2') diff --git a/abs/extra-testing/mythappletrailers/mythappletrailers.install b/abs/extra-testing/mythappletrailers/mythappletrailers.install index 3937d09..96f6717 100644 --- a/abs/extra-testing/mythappletrailers/mythappletrailers.install +++ b/abs/extra-testing/mythappletrailers/mythappletrailers.install @@ -1,7 +1,7 @@ # arg 1: the new package version post_install() { ln -s /home/mythtv/appletrailer.xml /usr/share/mythtv/themes/defaultmenu/appletrailer.xml - mv /usr/share/mythtv/is.xml /tmp + mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp echo "<!--#MythAppleTrailers-->" >> /tmp/is.xml.tmp echo " <button>" >> /tmp/is.xml.tmp @@ -12,7 +12,7 @@ post_install() { echo "<!--#MythAppleTrailers-->" >> /tmp/is.xml.tmp echo "" >> /tmp/is.xml.tmp echo "</mythmenu>" >> /tmp/is.xml.tmp - mv /tmp/is.xml.tmp /usr/share/mythtv/is.xml + mv /tmp/is.xml.tmp /usr/share/mythtv/themes/defaultmenu/is.xml } # arg 1: the new package version # arg 2: the old package version @@ -28,8 +28,8 @@ post_upgrade() { # arg 1: the old package version post_remove() { rm -fr /usr/share/mythtv/appletrailer.xml /usr/share/mythtv/themes/defaulmenu/mythappletrailer.xml - mv /usr/share/mythtv/is.xml /tmp/is.xml.tmp - sed -e '/\#MythAp/,/\#MythAp/d' < /tmp/is.xml.tmp > /usr/share/mythtv/is.xml + mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp/is.xml.tmp + sed -e '/\#MythAp/,/\#MythAp/d' < /tmp/is.xml.tmp > /usr/share/mythtv/themes/defaultmenu/is.xml } op=$1 |