From efe55b74c9eb96356fb9308a6648739652c450b2 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sat, 30 Jul 2011 14:23:14 -0500 Subject: init scripts: 2011.06.5 with patches for LinHES rc.multi- don't try to remove bootlogger if the pid file isn't present --- abs/core/initscripts/PKGBUILD | 42 +++++++++++++++++++------------- abs/core/initscripts/initscripts.install | 4 +++ abs/core/initscripts/rc.multi.patch | 12 +++++++++ abs/core/initscripts/rc.shutdown.patch | 29 +++++++++++++--------- abs/core/initscripts/rc.sysinit.patch | 11 ++++----- abs/core/initscripts/wireless.conf.d | 12 +++++++++ 6 files changed, 75 insertions(+), 35 deletions(-) create mode 100644 abs/core/initscripts/rc.multi.patch create mode 100644 abs/core/initscripts/wireless.conf.d diff --git a/abs/core/initscripts/PKGBUILD b/abs/core/initscripts/PKGBUILD index df2897e..1b93983 100644 --- a/abs/core/initscripts/PKGBUILD +++ b/abs/core/initscripts/PKGBUILD @@ -1,33 +1,41 @@ -# $Id: PKGBUILD 85250 2010-07-11 09:54:57Z thomas $ +# $Id: PKGBUILD 127034 2011-06-09 22:34:09Z tomegun $ +# Maintainer: Tom Gundersen # Maintainer: Thomas Bächler # Maintainer: Aaron Griffin pkgname=initscripts -pkgver=2010.07 -pkgrel=1 +pkgver=2011.06.4 +pkgrel=2 pkgdesc="System initialization/bootup scripts" arch=('i686' 'x86_64') url="http://www.archlinux.org" -license=('GPL') +license=('GPL2') groups=('base') -backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown) -depends=('glibc' 'bash' 'awk' 'grep' 'coreutils' 'sed' 'udev>=139-1' - 'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit') +backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless) +depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=171' 'iproute2' + 'ncurses' 'kbd' 'findutils' 'sysvinit') optdepends=('bridge-utils: Network bridging support' 'dhcpcd: DHCP network configuration' + 'net-tools: legacy network support' 'wireless_tools: Wireless networking') install=initscripts.install -source=(ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}-${pkgrel}.tar.xz rc.sysinit.patch rc.shutdown.patch) +source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz" + 'wireless.conf.d' 'rc.sysinit.patch' 'rc.shutdown.patch' 'rc.multi.patch') -build() { - cd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}/ + + + + +package() { + cd ${srcdir}/${pkgname}-${pkgver} patch -p0 < ${srcdir}/rc.sysinit.patch || exit 1 patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1 - DESTDIR=${pkgdir} ./install.sh + patch -p0 < ${srcdir}/rc.multi.patch || exit 1 + make DESTDIR=${pkgdir} install + install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } -sha256sums=('16b89a9108deacb7d2afd965e59e31aa4b313fc4d1a660fb3cc1fa5c28cfc053' - '3a8a82edd680263c4ffa7289fdb6dac69d4611905d093ee3457c00e008e95a1a' - 'caeb8d9e56783d01001875ffa12d207bc78e06d0fbe3883ce1b68efdfa6ce195') -sha256sums=('16b89a9108deacb7d2afd965e59e31aa4b313fc4d1a660fb3cc1fa5c28cfc053' - '3a8a82edd680263c4ffa7289fdb6dac69d4611905d093ee3457c00e008e95a1a' - 'fd5248ccfc927ca0d8722cec61c041083b4bf79126176d18d51d5e21378ec5fa') +md5sums=('34cbe55f3f42069c59237db935d0511b' + '027576534885b8d5dded9be546057b12' + 'eaa31b96513d834b50d116cb51f9ebbe' + '73abaf06450104bddf16d409015f81ab' + 'a166ea014a1c75860b14fc98825686cc') diff --git a/abs/core/initscripts/initscripts.install b/abs/core/initscripts/initscripts.install index 360101c..56f6924 100644 --- a/abs/core/initscripts/initscripts.install +++ b/abs/core/initscripts/initscripts.install @@ -4,4 +4,8 @@ post_upgrade() { echo "==> Original file saved as /etc/inittab.pacsave" sed -i'.pacsave' 's#vc/\([0-9]\)#tty\1#' /etc/inittab fi + if [ "$(vercmp $2 2011.06.1)" -lt 0 ]; then + echo "Blacklisting of modules is no longer supported in rc.conf," + echo "please add blacklist entries to /etc/modprobe.d/ instead." + fi } diff --git a/abs/core/initscripts/rc.multi.patch b/abs/core/initscripts/rc.multi.patch new file mode 100644 index 0000000..b426408 --- /dev/null +++ b/abs/core/initscripts/rc.multi.patch @@ -0,0 +1,12 @@ +*** rc.multi.orig Sun Jul 31 02:34:55 2011 +--- rc.multi Sun Jul 31 02:35:28 2011 +*************** run_hook multi_end +*** 30,31 **** +! kill `/bin/cat /run/bootlogd.pid` +! /bin/rm /run/bootlogd.pid +--- 30,34 ---- +! if [ -e /run/bootlogd.pid ] +! then +! kill `/bin/cat /run/bootlogd.pid` +! /bin/rm /run/bootlogd.pid +! fi diff --git a/abs/core/initscripts/rc.shutdown.patch b/abs/core/initscripts/rc.shutdown.patch index 329164d..973ff41 100644 --- a/abs/core/initscripts/rc.shutdown.patch +++ b/abs/core/initscripts/rc.shutdown.patch @@ -1,15 +1,20 @@ ---- rc.shutdown.orig 2010-08-08 23:50:24.000000000 +0000 -+++ rc.shutdown 2010-08-08 23:51:37.000000000 +0000 -@@ -32,6 +32,12 @@ - fi - done +--- rc.shutdown.orig 2011-06-09 22:23:09.000000000 +0000 ++++ rc.shutdown 2011-07-31 02:47:22.686835949 +0000 +@@ -51,6 +51,17 @@ fi + + stat_busy "Unmounting Filesystems" +#unmount network filesystems for runit -+#if [ -e /var/services/netfs ] -+#then -+ /etc/rc.d/netfs stop -+#fi ++INIT=`ps -p1 -o comm=` ++if [ x$INIT = xrunit ] ++then ++ if [ -e /var/services/netfs ] ++ then ++ /etc/rc.d/netfs stop ++ fi ++fi + - # Shutdown daemons in reverse order - let i=${#DAEMONS[@]}-1 - while [ $i -ge 0 ]; do ++ + if /bin/grep -q devtmpfs /proc/filesystems &>/dev/null; then + /bin/umount -a -r -t nosysfs,noproc,nodevtmpfs,nodevpts -O no_netdev + else diff --git a/abs/core/initscripts/rc.sysinit.patch b/abs/core/initscripts/rc.sysinit.patch index b0253d0..903cf80 100644 --- a/abs/core/initscripts/rc.sysinit.patch +++ b/abs/core/initscripts/rc.sysinit.patch @@ -1,16 +1,15 @@ ---- rc.sysinit.orig 2010-08-08 23:42:36.000000000 +0000 -+++ rc.sysinit 2010-08-08 23:44:28.000000000 +0000 -@@ -7,10 +7,9 @@ +--- rc.sysinit.orig 2011-07-31 02:39:05.726815241 +0000 ++++ rc.sysinit 2011-07-31 02:42:45.103491048 +0000 +@@ -7,8 +7,10 @@ . /etc/rc.d/functions echo " " -printhl "Arch Linux\n" -printhl "${C_H2}http://www.archlinux.org" --printhl "Copyright 2002-2007 Judd Vinet" --printhl "Copyright 2007-2010 Aaron Griffin" +printhl "LinHES\n" +printhl "The Linux Home Entertainment System\n" +printhl "${C_H2}http://www.linhes.org" - printhl "Distributed under the GNU General Public License (GPL)" ++ printsep + run_hook sysinit_start diff --git a/abs/core/initscripts/wireless.conf.d b/abs/core/initscripts/wireless.conf.d new file mode 100644 index 0000000..47540ef --- /dev/null +++ b/abs/core/initscripts/wireless.conf.d @@ -0,0 +1,12 @@ +# +# Settings for wireless cards +# +# For each wireless interface declared in INTERFACES (in rc.conf), declare +# a wlan_${IF} variable that contains the arguments to be passed to +# iwconfig(8). Then list the original interface name in the +# WLAN_INTERFACES array. +# + +#wlan_eth0="eth0 mode managed essid default" +#WLAN_INTERFACES=(eth0) + -- cgit v0.12 From 9c9505429b54c286503d01cb1c8dba37243f1c27 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sat, 30 Jul 2011 14:24:22 -0500 Subject: linhes-config/system-config: update fstab template to use the newer format devpts /dev/pts devpts defaults 0 0 shm /dev/shm tmpfs nodev,nosuid 0 0 --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/mv_install.py | 4 ++-- abs/core/system-templates/PKGBUILD | 2 +- abs/core/system-templates/system-templates-2.0-4.src.tar.gz | 1 + abs/core/system-templates/templates/fstab.conf.template | 9 +++++++-- 5 files changed, 13 insertions(+), 7 deletions(-) create mode 120000 abs/core/system-templates/system-templates-2.0-4.src.tar.gz diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 2136a64..2289196 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.2 -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' @@ -101,7 +101,7 @@ build() { install -m 0755 issue $startdir/pkg/etc/issue } -md5sums=('4bece36b26e390e609fd7a4f5c710986' +md5sums=('c1f6bd445284408767ab8ab4c4164aed' '1a4694fcd694b362c339bda781ed0f3e' 'e36da536dd651ef182e7642337889e77' '985891a43f7c4c983eb2a362162f1a0f' diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py index 5892444..9dcc7b7 100755 --- a/abs/core/LinHES-config/mv_install.py +++ b/abs/core/LinHES-config/mv_install.py @@ -526,9 +526,9 @@ def create_fstab(extralines): f = open(fstabfile, 'w') line = '''# \n''' fstab_list.append(line) - line = '''none /dev/pts devpts defaults 0 0 \n''' + line = '''devpts /dev/pts devpts defaults 0 0 \n''' fstab_list.append(line) - line = '''none /dev/shm tmpfs defaults 0 0\n''' + line = '''shm /dev/shm tmpfs nodev,nosuid 0 0 \n''' fstab_list.append(line) line = '''/dev/sr0 /media/cdrom auto ro,user,noauto,unhide 0 0\n''' fstab_list.append(line) diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD index 1b3e3e3..bd53e14 100755 --- a/abs/core/system-templates/PKGBUILD +++ b/abs/core/system-templates/PKGBUILD @@ -1,6 +1,6 @@ pkgname=system-templates pkgver=2.0 -pkgrel=3 +pkgrel=4 conflicts=( ) pkgdesc="Templates used for system configuration" depends=() diff --git a/abs/core/system-templates/system-templates-2.0-4.src.tar.gz b/abs/core/system-templates/system-templates-2.0-4.src.tar.gz new file mode 120000 index 0000000..111669c --- /dev/null +++ b/abs/core/system-templates/system-templates-2.0-4.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/system-templates-2.0-4.src.tar.gz \ No newline at end of file diff --git a/abs/core/system-templates/templates/fstab.conf.template b/abs/core/system-templates/templates/fstab.conf.template index f8544cf..2bf5547 100755 --- a/abs/core/system-templates/templates/fstab.conf.template +++ b/abs/core/system-templates/templates/fstab.conf.template @@ -2,8 +2,13 @@ # /etc/fstab: static file system information # # -none /dev/pts devpts defaults 0 0 -none /dev/shm tmpfs defaults 0 0 +#none /dev/pts devpts defaults 0 0 +#none /dev/shm tmpfs defaults 0 0 + +# +devpts /dev/pts devpts defaults 0 0 +shm /dev/shm tmpfs nodev,nosuid 0 0 + /dev/cdrom /mnt/cd iso9660 ro,user,noauto,unhide 0 0 /dev/dvd /mnt/dvd udf ro,user,noauto,unhide 0 0 -- cgit v0.12 From c4ea04ca36cb1401ba4fc4a43668180a7e01d280 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Sun, 31 Jul 2011 10:03:25 -0500 Subject: ethtool: add epoch tag to force an update. pacman must be at 3.5+ for this to have any effect. --- abs/extra/ethtool/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/extra/ethtool/PKGBUILD b/abs/extra/ethtool/PKGBUILD index 2d5ab42..b137e4a 100644 --- a/abs/extra/ethtool/PKGBUILD +++ b/abs/extra/ethtool/PKGBUILD @@ -4,7 +4,7 @@ pkgname=ethtool pkgver=2.6.39 pkgrel=3 -#epoch=1 +epoch=2 pkgdesc="gkernel ethtool" arch=(i686 x86_64) url="http://www.kernel.org/pub/software/network/ethtool/" -- cgit v0.12 From e088246e81c88f1f7cbef74d7df7f5359cc9b72c Mon Sep 17 00:00:00 2001 From: James Meyer Date: Mon, 1 Aug 2011 03:52:39 -0500 Subject: initscripts: move conf.d/wireless to wireless.example. Quick and easy way to get around a file conflict --- abs/core/initscripts/PKGBUILD | 4 ++-- abs/core/initscripts/__changelog | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/abs/core/initscripts/PKGBUILD b/abs/core/initscripts/PKGBUILD index 1b93983..0e07da3 100644 --- a/abs/core/initscripts/PKGBUILD +++ b/abs/core/initscripts/PKGBUILD @@ -5,7 +5,7 @@ pkgname=initscripts pkgver=2011.06.4 -pkgrel=2 +pkgrel=3 pkgdesc="System initialization/bootup scripts" arch=('i686' 'x86_64') url="http://www.archlinux.org" @@ -32,7 +32,7 @@ package() { patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1 patch -p0 < ${srcdir}/rc.multi.patch || exit 1 make DESTDIR=${pkgdir} install - install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless + install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless.example } md5sums=('34cbe55f3f42069c59237db935d0511b' '027576534885b8d5dded9be546057b12' diff --git a/abs/core/initscripts/__changelog b/abs/core/initscripts/__changelog index 8d03d24..58bfd36 100644 --- a/abs/core/initscripts/__changelog +++ b/abs/core/initscripts/__changelog @@ -1 +1,7 @@ Patch init scripts + patch -p0 < ${srcdir}/rc.sysinit.patch || exit 1 + patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1 + patch -p0 < ${srcdir}/rc.multi.patch || exit 1 + + +rename wireless.conf -> wireless.conf.example -- cgit v0.12 From cca1c731c7ff1d31304e0096505942dd5e100478 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Mon, 1 Aug 2011 03:52:56 -0500 Subject: madwifi: remove from repo --- abs/core/madwifi-utils/PKGBUILD | 35 ------------------------------ abs/core/madwifi/PKGBUILD | 42 ------------------------------------ abs/core/madwifi/kernel-2.6.30.patch | 14 ------------ abs/core/madwifi/madwifi-ng.install | 14 ------------ 4 files changed, 105 deletions(-) delete mode 100644 abs/core/madwifi-utils/PKGBUILD delete mode 100644 abs/core/madwifi/PKGBUILD delete mode 100644 abs/core/madwifi/kernel-2.6.30.patch delete mode 100644 abs/core/madwifi/madwifi-ng.install diff --git a/abs/core/madwifi-utils/PKGBUILD b/abs/core/madwifi-utils/PKGBUILD deleted file mode 100644 index 35feeea..0000000 --- a/abs/core/madwifi-utils/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 70649 2010-02-27 18:41:30Z tpowa $ -# Originally by kleptophobiac -# Modified by James Rayner for the repositories - -pkgname=madwifi-utils -pkgver=0.9.4.4119 -_kernver=2.6.33-ARCH -pkgrel=1 -pkgdesc="Userspace tools of madwifi drivers for Atheros wireless chipsets." -arch=(i686 x86_64) -license=('GPL') -url="http://madwifi-project.org" -depends=('wireless_tools') -makedepends=('sharutils') -provides=("madwifi-ng-utils") -conflicts=("madwifi-ng-utils") -replaces=("madwifi-ng-utils") -# subversion source: svn checkout http://madwifi-project.org/svn/madwifi/trunk madwifi -source=(ftp://ftp.archlinux.org/other/madwifi/madwifi-${pkgver}.tar.bz2 - #http://downloads.sourceforge.net/sourceforge/madwifi/madwifi-$pkgver.tar.gz - ) - -build() { - [ "${CARCH}" == "i686" ] && export ARCH=i386 - - export KERNELPATH=/lib/modules/${_kernver}/build - #cd $startdir/src/madwifi-$pkgver - cd $startdir/src/madwifi - make tools|| return 1 - make DESTDIR=$startdir/pkg \ - BINDIR=/usr/bin \ - MANDIR=/usr/share/man \ - install-tools -} -md5sums=('a720a20264b312c0ff906b9888bb49ae') diff --git a/abs/core/madwifi/PKGBUILD b/abs/core/madwifi/PKGBUILD deleted file mode 100644 index b4cbae3..0000000 --- a/abs/core/madwifi/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 97001 2010-10-25 21:03:02Z tpowa $ -# Originally by kleptophobiac -# Modified by James Rayner for the repositories - -_kernver=2.6.37-LinHES - -pkgname=madwifi -pkgver=0.9.4.4133 -pkgrel=4 -pkgdesc="Madwifi drivers for Atheros wireless chipsets. For stock arch 2.6 kernel" -arch=(i686 x86_64) -license=('GPL') -url="http://madwifi-project.org" -#depends=('madwifi-utils' 'kernel26>=2.6.36' 'kernel26<2.6.37') -#makedepends=('kernel26-headers>=2.6.36' 'kernel26-headers<2.6.37') -depends=('madwifi-utils' 'kernel26>=2.6.37') -makedepends=('kernel26-headers>=2.6.37') -makedepends=('sharutils') -install=madwifi-ng.install -# subversion source: svn checkout http:/madwifi-project.org/svn/madwifi/trunk madwifi -source=(ftp://ftp.archlinux.org/other/madwifi/madwifi-${pkgver}.tar.bz2 - #http://downloads.sourceforge.net/madwifi/madwifi-${pkgver}.tar.gz - ) - -build() { - [ "${CARCH}" = "i686" ] && export ARCH=i386 - - #cd $startdir/src/$pkgname-$pkgver - cd $startdir/src/$pkgname - sed -i -e 's/-Werror//g' Makefile.inc - make KERNELPATH=/lib/modules/$_kernver/build KERNELRELEASE=$_kernver modules|| return 1 - make KERNELPATH=/lib/modules/$_kernver/build KERNELRELEASE=$_kernver modules \ - DESTDIR=$startdir/pkg KERNELRELEASE=$_kernver install-modules - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install - - # install to wireless kernel directory - mkdir -p $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/madwifi - mv $startdir/pkg/lib/modules/$_kernver/net/* $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/madwifi - rm -r $startdir/pkg/lib/modules/$_kernver/net/ -} - -md5sums=('ca3c3504d000e7b3d7063af46271c932') diff --git a/abs/core/madwifi/kernel-2.6.30.patch b/abs/core/madwifi/kernel-2.6.30.patch deleted file mode 100644 index f844668..0000000 --- a/abs/core/madwifi/kernel-2.6.30.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ath/if_athvar.h~ 2009-06-13 09:38:53.000000000 +0200 -+++ ath/if_athvar.h 2009-06-13 09:38:53.000000000 +0200 -@@ -103,11 +103,6 @@ - /* - * Guess how the interrupt handler should work. - */ --#if !defined(IRQ_NONE) --typedef void irqreturn_t; --#define IRQ_NONE --#define IRQ_HANDLED --#endif /* !defined(IRQ_NONE) */ - - #ifndef SET_MODULE_OWNER - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) diff --git a/abs/core/madwifi/madwifi-ng.install b/abs/core/madwifi/madwifi-ng.install deleted file mode 100644 index 3771719..0000000 --- a/abs/core/madwifi/madwifi-ng.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - KERNEL_VERSION='2.6.37-LinHES' - depmod -ae $KERNEL_VERSION > /dev/null 2>&1 -} - -post_upgrade() { - KERNEL_VERSION='2.6.37-LinHES' - depmod -ae $KERNEL_VERSION > /dev/null 2>&1 -} - -post_remove() { - KERNEL_VERSION='2.6.37-LinHES' - depmod -ae $KERNEL_VERSION > /dev/null 2>&1 -} -- cgit v0.12 From 2a9517075a4b69a6b76c60218d882edfd1bfb17c Mon Sep 17 00:00:00 2001 From: James Meyer Date: Mon, 1 Aug 2011 03:53:39 -0500 Subject: netcfg: added back to repo. Shouldn't be used by linhes, but somebody may read a wiki somewhere and want to use it. --- abs/core/netcfg/PKGBUILD | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 abs/core/netcfg/PKGBUILD diff --git a/abs/core/netcfg/PKGBUILD b/abs/core/netcfg/PKGBUILD new file mode 100644 index 0000000..7e7ea7b --- /dev/null +++ b/abs/core/netcfg/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 126281 2011-06-04 04:21:49Z eric $ +# Maintainer: James Rayner + +pkgname=netcfg +pkgver=2.5.5 +pkgrel=1 +pkgdesc="Network configuration and profile scripts" +url="http://archlinux.org" +license=("BSD") +backup=(etc/iftab) +depends=(wireless_tools coreutils "wpa_supplicant>=0.6.8" net-tools "dhcpcd>=4.0" "iproute2") +optdepends=('dialog: Required for menu based profile selector' + 'wpa_actiond: Required for automatic wireless connection with rc.d/net-auto-wireless' + 'ifplugd: Required for automatic wired connection with rc.d/net-auto-wired') +source=(ftp://ftp.archlinux.org/other/netcfg/netcfg-${pkgver}.tar.gz) +arch=(any) +md5sums=('6e98bae291eb206d92f9a92bbab8fe80') + +package() { + cd "$srcdir/netcfg-${pkgver}" + + make DESTDIR="$pkgdir" install + install -D -m644 LICENSE "$pkgdir/usr/share/licenses/netcfg/LICENSE" + ln -s /usr/lib/network/connections/wireless "$pkgdir/usr/lib/network/connections/wireless-dbus" + ln -s /usr/bin/netcfg2 "$pkgdir/usr/bin/netcfg" +} + -- cgit v0.12 From d72fabb66ba4c41dacfa9d18faaa5840bf73fffa Mon Sep 17 00:00:00 2001 From: James Meyer Date: Mon, 1 Aug 2011 03:54:28 -0500 Subject: perlxml: remove from repo perl-xml-parser: no functional change. --- abs/core/perl_modules/perl-xml-parser/PKGBUILD | 6 ++++-- abs/core/perl_modules/perlxml/PKGBUILD | 29 -------------------------- 2 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 abs/core/perl_modules/perlxml/PKGBUILD diff --git a/abs/core/perl_modules/perl-xml-parser/PKGBUILD b/abs/core/perl_modules/perl-xml-parser/PKGBUILD index 78c404d..962dc0b 100644 --- a/abs/core/perl_modules/perl-xml-parser/PKGBUILD +++ b/abs/core/perl_modules/perl-xml-parser/PKGBUILD @@ -7,18 +7,20 @@ pkgname=perl-xml-parser _realname=XML-Parser pkgver=2.40 -pkgrel=1 +pkgrel=3 pkgdesc="Expat-based XML parser module for perl" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl' 'expat') replaces=('perlxml') +depends=('perl' 'expat') provides=("perlxml=${pkgver}") options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/${_realname}-${pkgver}.tar.gz") md5sums=('c66e9adba003d0667cc40115ccd837a5') + + build() { cd "${srcdir}/${_realname}-${pkgver}" diff --git a/abs/core/perl_modules/perlxml/PKGBUILD b/abs/core/perl_modules/perlxml/PKGBUILD deleted file mode 100644 index c9b2f30..0000000 --- a/abs/core/perl_modules/perlxml/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: dorphell -# Contributor: herb - -pkgname=perlxml -_realname=XML-Parser -pkgver=2.36 -pkgrel=1 -pkgdesc="XML::Parser - an XML parser module for perl" -arch=(i686 x86_64) -license=('GPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl>=5.10.0' 'expat>=2.0') -options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/${_realname}-${pkgver}.tar.gz) -md5sums=('1b868962b658bd87e1563ecd56498ded') - -build() { - cd ${startdir}/src/${_realname}-${pkgver} - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make MAN1EXT=1p MAN3EXT=3pm || return 1 - make install MAN1EXT=1p MAN3EXT=3pm DESTDIR=${startdir}/pkg || return 1 - - # remove perllocal.pod and .packlist. - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete -} -- cgit v0.12 From 49b7c832798c1c395fba1895145ebed632e4ffb3 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Mon, 1 Aug 2011 03:55:11 -0500 Subject: tdb: 1.2.9 and added epoch epoch may be removed after R7 is released. --- abs/core/tdb/PKGBUILD | 26 +++++++++++++------------- abs/core/tdb/gcc3.patch | 41 ----------------------------------------- 2 files changed, 13 insertions(+), 54 deletions(-) delete mode 100644 abs/core/tdb/gcc3.patch diff --git a/abs/core/tdb/PKGBUILD b/abs/core/tdb/PKGBUILD index 44f1e69..ffa330b 100644 --- a/abs/core/tdb/PKGBUILD +++ b/abs/core/tdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89866 2010-09-04 14:37:32Z remy $ +# $Id: PKGBUILD 116933 2011-03-26 14:55:24Z tpowa $ # Maintainer: Tobias Powalowski -# Contributorr: eric +# Contributor: eric # Contributor: Tom Newsom pkgname=tdb -pkgver=1.2.1 -pkgrel=3 +pkgver=1.2.9 +pkgrel=1 pkgdesc="A Trivia Database similar to GDBM but allows simultaneous commits" arch=(i686 x86_64) license=('GPL3') @@ -13,23 +13,23 @@ url="http://tdb.samba.org/" source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz) makedepends=('python2' 'libxslt' 'docbook-xsl') optdepends=('python2: for python bindings') -options=(force) +epoch=1 build() { cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's#python2\.6\([^ ]*\)#python2.7\1 python2.6\1#' configure + sed -i -e 's#python#python2#g' buildtools/bin/waf + #sed -i 's#python2\.6\([^ ]*\)#python2.7\1 python2.6\1#' configure # Use system docbook.xsl - _manstyle="/usr/share/xml/docbook/xsl-stylesheets-1.76.0/manpages/docbook.xsl" - sed -i "s#http.*xsl#$_manstyle#" tdb.mk - + #_manstyle="/usr/share/xml/docbook/xsl-stylesheets-1.76.1/manpages/docbook.xsl" + #sed -i "s#http.*xsl#$_manstyle#" tdb.mk ./configure --prefix=/usr \ --localstatedir=/var \ --sysconfdir=/etc/samba - make || return 1 + make } + package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + make DESTDIR=$pkgdir/ install } -md5sums=('73ea81282a82e5c959d9c082af2d0215') - +md5sums=('4d97d18bbe9040038d4e003495bb8cd1') diff --git a/abs/core/tdb/gcc3.patch b/abs/core/tdb/gcc3.patch deleted file mode 100644 index c88c2e7..0000000 --- a/abs/core/tdb/gcc3.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- tdb-1.0.6/tdbtool.c 2001-12-10 22:45:47.000000000 -0500 -+++ ./tdbtool.c 2003-12-31 19:44:50.000000000 -0500 -@@ -169,22 +169,22 @@ - - static void help(void) - { -- printf(" --tdbtool: -- create dbname : create a database -- open dbname : open an existing database -- erase : erase the database -- dump dumpname : dump the database as strings -- insert key data : insert a record -- store key data : store a record (replace) -- show key : show a record by key -- delete key : delete a record by key -- list : print the database hash table and freelist -- free : print the database freelist -- 1 | first : print the first record -- n | next : print the next record -- q | quit : terminate -- \\n : repeat 'next' command -+ printf("\ -+tdbtool: \ -+ create dbname : create a database\ -+ open dbname : open an existing database\ -+ erase : erase the database\ -+ dump dumpname : dump the database as strings\ -+ insert key data : insert a record\ -+ store key data : store a record (replace)\ -+ show key : show a record by key\ -+ delete key : delete a record by key\ -+ list : print the database hash table and freelist\ -+ free : print the database freelist\ -+ 1 | first : print the first record\ -+ n | next : print the next record\ -+ q | quit : terminate\ -+ \\n : repeat 'next' command\ - "); - } - -- cgit v0.12 From da0250d306f5b12252c75f0574aea5cf4e2a63b9 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Mon, 1 Aug 2011 03:56:42 -0500 Subject: libcrystalhd-git: updated pkg to 08-01-2011 checkout --- abs/extra/libcrystalhd-git/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/abs/extra/libcrystalhd-git/PKGBUILD b/abs/extra/libcrystalhd-git/PKGBUILD index 27d8fff..94c7be8 100644 --- a/abs/extra/libcrystalhd-git/PKGBUILD +++ b/abs/extra/libcrystalhd-git/PKGBUILD @@ -33,3 +33,4 @@ build() { make install DESTDIR=$pkgdir || return 1 } +md5sums=() -- cgit v0.12 From 01c20a7d13169e2d77e63296de33000a7afc190d Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Tue, 2 Aug 2011 20:12:48 +0000 Subject: runit-scripts: Ensure /var/run/mysqld exists --- abs/core/runit-scripts/PKGBUILD | 2 +- abs/core/runit-scripts/runit-scripts-2.1.1-22.src.tar.gz | 1 + abs/core/runit-scripts/runitscripts/services/mysql/run | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 120000 abs/core/runit-scripts/runit-scripts-2.1.1-22.src.tar.gz diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 6c8a5ed..f6cace4 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=2.1.1 -pkgrel=21 +pkgrel=22 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runit-scripts-2.1.1-22.src.tar.gz b/abs/core/runit-scripts/runit-scripts-2.1.1-22.src.tar.gz new file mode 120000 index 0000000..9fba9d2 --- /dev/null +++ b/abs/core/runit-scripts/runit-scripts-2.1.1-22.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/runit-scripts-2.1.1-22.src.tar.gz \ No newline at end of file diff --git a/abs/core/runit-scripts/runitscripts/services/mysql/run b/abs/core/runit-scripts/runitscripts/services/mysql/run index 4b1a604..9589e6d 100755 --- a/abs/core/runit-scripts/runitscripts/services/mysql/run +++ b/abs/core/runit-scripts/runitscripts/services/mysql/run @@ -11,13 +11,13 @@ MYSQLD_ROOT="/data/srv/mysql" if [ ! `egrep '^mysql:' /etc/group` ]; then stat_runit "Adding mysql group" groupadd -g 89 mysql - + fi if [ ! `egrep '^mysql:' /etc/passwd` ]; then stat_runit "Adding mysql user" useradd -u 89 -g mysql -d $MYSQLD_ROOT -s /bin/false mysql [ -d $MYSQLD_ROOT ] && chown -R mysql.mysql $MYSQLD_ROOT - + fi if [ ! -d $MYSQLD_ROOT ]; then @@ -30,5 +30,10 @@ if [ ! -e /var/log/mysqld.log ]; then touch /var/log/mysqld.log chown mysql /var/log/mysqld.log fi -#exec /usr/sbin/mysqld --skip-name-resolve -u mysql 2>/dev/null >/dev/null + +if [ ! -d /var/run/mysqld ]; then + mkdir -p /var/run/mysqld + chown mysql /var/run/mysqld +fi + exec /usr/sbin/mysqld -u mysql 2>/dev/null >/dev/null -- cgit v0.12 From 84fa467f2da787088a7deb1f51eaf7815b3bb35f Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Tue, 2 Aug 2011 22:41:41 +0000 Subject: pacman: Updated pacman.conf and make pacman-db-upgrade run on old db. --- abs/core/pacman/PKGBUILD | 10 ++----- abs/core/pacman/__changelog | 1 + abs/core/pacman/pacman-3.5.3-2.src.tar.gz | 1 + abs/core/pacman/pacman.conf | 48 +++++++++++++++++++++++++++---- abs/core/pacman/pacman.conf.x86_64 | 2 +- abs/core/pacman/pacman.install | 13 +++++++-- 6 files changed, 59 insertions(+), 16 deletions(-) create mode 120000 abs/core/pacman/pacman-3.5.3-2.src.tar.gz diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD index 59ff582..bfaeb67 100644 --- a/abs/core/pacman/PKGBUILD +++ b/abs/core/pacman/PKGBUILD @@ -3,7 +3,7 @@ pkgname=pacman pkgver=3.5.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" @@ -19,10 +19,6 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf pacman.conf.x86_64 makepkg.conf) -md5sums=('b4f1fdbc17100923071ebe8fe9377be5' - 'e99eb721b6b704f68c5f47468507c102' - 'f8b939d9b2beb79a0436961a2d707d7c' - 'a8684989d3dfad5a6e1bcf95af3e571b') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' @@ -70,6 +66,6 @@ package() { # vim: set ts=2 sw=2 et: md5sums=('c36c18ed4d8ec69c0ecb4f9684266901' - '8f7e5462469cfc7520b3aade58ff28de' - 'f8b939d9b2beb79a0436961a2d707d7c' + '161584f2b18e7672b0c47bd6ea5b6133' + 'ae905192b4bf71772173e8abbd53291e' 'a8684989d3dfad5a6e1bcf95af3e571b') diff --git a/abs/core/pacman/__changelog b/abs/core/pacman/__changelog index 4d2a9e3..f028169 100644 --- a/abs/core/pacman/__changelog +++ b/abs/core/pacman/__changelog @@ -1 +1,2 @@ make cache dir /data/var/cache/pacman/pkg +add custom message to post_upgrade() of pacman.install diff --git a/abs/core/pacman/pacman-3.5.3-2.src.tar.gz b/abs/core/pacman/pacman-3.5.3-2.src.tar.gz new file mode 120000 index 0000000..3ed024f --- /dev/null +++ b/abs/core/pacman/pacman-3.5.3-2.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/pacman-3.5.3-2.src.tar.gz \ No newline at end of file diff --git a/abs/core/pacman/pacman.conf b/abs/core/pacman/pacman.conf index ae584e2..d1129a8 100644 --- a/abs/core/pacman/pacman.conf +++ b/abs/core/pacman/pacman.conf @@ -26,6 +26,8 @@ Architecture = auto #IgnoreGroup = #NoUpgrade = +NoUpgrade = data/srv/hobbit/etc/bb-hosts +NoUpgrade = etc/func/minion.conf #NoExtract = # Misc options (all disabled by default) @@ -58,22 +60,56 @@ Architecture = auto # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. +[core] +Server = http://knoppmyth.net/repo/$arch/$repo + +[extra] +Server = http://knoppmyth.net/repo/$arch/$repo + +#[chroot-devel] +#Server = http://knoppmyth.net/repo/$arch/$repo + +#[core-testing] +#Server = http://knoppmyth.net/repo/$arch/$repo + +#[extra-testing] +#Server = http://knoppmyth.net/repo/$arch/$repo + #[testing] #Include = /etc/pacman.d/mirrorlist -[core] -Include = /etc/pacman.d/mirrorlist +#[core] +#Include = /etc/pacman.d/mirrorlist -[extra] -Include = /etc/pacman.d/mirrorlist +#[extra] +#Include = /etc/pacman.d/mirrorlist #[community-testing] #Include = /etc/pacman.d/mirrorlist -[community] -Include = /etc/pacman.d/mirrorlist +#[community] +#Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] #Server = file:///home/custompkgs + +########################ARCH DEFAULTS############# +#[ARCH-core] +# Add your preferred servers here, they will be used first +#Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/i686 + +#[ARCH-extra] +# Add your preferred servers here, they will be used first +#Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/i686 + +#[community] +# Add your preferred servers here, they will be used first +#Include = /etc/pacman.d/mirrorlist + +# Unstable is disabled by default. To enable, uncomment the following +# two lines. You can add preferred servers immediately after the header, +# and they will be used before the default mirrors. +#[unstable] +#Include = /etc/pacman.d/mirrorlist diff --git a/abs/core/pacman/pacman.conf.x86_64 b/abs/core/pacman/pacman.conf.x86_64 index 6f04236..f76dba2 100644 --- a/abs/core/pacman/pacman.conf.x86_64 +++ b/abs/core/pacman/pacman.conf.x86_64 @@ -12,6 +12,7 @@ #RootDir = / #DBPath = /var/lib/pacman/ #CacheDir = /var/cache/pacman/pkg/ +CacheDir = /data/var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first @@ -86,4 +87,3 @@ Include = /etc/pacman.d/mirrorlist # tips on creating your own repositories. #[custom] #Server = file:///home/custompkgs - diff --git a/abs/core/pacman/pacman.install b/abs/core/pacman/pacman.install index b735399..4921fd8 100644 --- a/abs/core/pacman/pacman.install +++ b/abs/core/pacman/pacman.install @@ -9,12 +9,21 @@ post_upgrade() { if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then _warnupgrade fi + echo ">>>" + echo ">>> ATTENTION! ATTENTION! ATTENTION!" + echo ">>> /etc/pacman.conf has changed. If you have customized your" + echo ">>> pacman.conf file, please merge your changes into" + echo ">>> /etc/pacman.conf.pacnew. Backup your old pacman.conf and" + echo ">>> then move pacman.conf.pacnew to pacman.conf" + echo ">>>" } _warnupgrade() { + echo ">>>" echo ">>> The pacman database format has changed as of pacman 3.5.0." - echo ">>> You will need to run \`pacman-db-upgrade\` as root." + echo ">>> I will now run \`pacman-db-upgrade\`. Please wait..." echo ">>>" + /usr/bin/pacman-db-upgrade } _resetbackups() { @@ -59,4 +68,4 @@ _resetbackups() { echo ">>> -> $file is unowned." fi done -} +} -- cgit v0.12 From dc4ebdfd07818a200009fa2b638698e47a9ed557 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Tue, 2 Aug 2011 23:16:04 +0000 Subject: pacman: change servers to linhes.org in pacman.conf --- abs/core/pacman/PKGBUILD | 4 ++-- abs/core/pacman/pacman-3.5.3-3.src.tar.gz | 1 + abs/core/pacman/pacman.conf | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) create mode 120000 abs/core/pacman/pacman-3.5.3-3.src.tar.gz diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD index bfaeb67..79976dc 100644 --- a/abs/core/pacman/PKGBUILD +++ b/abs/core/pacman/PKGBUILD @@ -3,7 +3,7 @@ pkgname=pacman pkgver=3.5.3 -pkgrel=2 +pkgrel=3 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" @@ -66,6 +66,6 @@ package() { # vim: set ts=2 sw=2 et: md5sums=('c36c18ed4d8ec69c0ecb4f9684266901' - '161584f2b18e7672b0c47bd6ea5b6133' + '8ec73ab08305cdbe3671aedbbb4ceede' 'ae905192b4bf71772173e8abbd53291e' 'a8684989d3dfad5a6e1bcf95af3e571b') diff --git a/abs/core/pacman/pacman-3.5.3-3.src.tar.gz b/abs/core/pacman/pacman-3.5.3-3.src.tar.gz new file mode 120000 index 0000000..2736d3b --- /dev/null +++ b/abs/core/pacman/pacman-3.5.3-3.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/pacman-3.5.3-3.src.tar.gz \ No newline at end of file diff --git a/abs/core/pacman/pacman.conf b/abs/core/pacman/pacman.conf index d1129a8..25ab6b6 100644 --- a/abs/core/pacman/pacman.conf +++ b/abs/core/pacman/pacman.conf @@ -61,19 +61,19 @@ NoUpgrade = etc/func/minion.conf # after the header, and they will be used before the default mirrors. [core] -Server = http://knoppmyth.net/repo/$arch/$repo +Server = http://linhes.org/repo/$arch/$repo [extra] -Server = http://knoppmyth.net/repo/$arch/$repo +Server = http://linhes.org/repo/$arch/$repo #[chroot-devel] -#Server = http://knoppmyth.net/repo/$arch/$repo +#Server = http://linhes.org/repo/$arch/$repo #[core-testing] -#Server = http://knoppmyth.net/repo/$arch/$repo +#Server = http://linhes.org/repo/$arch/$repo #[extra-testing] -#Server = http://knoppmyth.net/repo/$arch/$repo +#Server = http://linhes.org/repo/$arch/$repo #[testing] #Include = /etc/pacman.d/mirrorlist -- cgit v0.12 From 76459453d4067db1560b683c283e05611c6f6819 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 2 Aug 2011 18:45:53 -0500 Subject: freetype2: Bump to latest. Replaces freetype2-static. Ref #774 --- abs/core/freetype2/PKGBUILD | 14 ++++++++------ abs/core/freetype2/__changelog | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 abs/core/freetype2/__changelog diff --git a/abs/core/freetype2/PKGBUILD b/abs/core/freetype2/PKGBUILD index 8244313..8445cc4 100644 --- a/abs/core/freetype2/PKGBUILD +++ b/abs/core/freetype2/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 94196 2010-10-05 08:06:59Z jgc $ +# $Id$ # Maintainer: Jan de Groot pkgname=freetype2 -pkgver=2.4.3 +pkgver=2.4.6 pkgrel=1 pkgdesc="TrueType font rendering library" -arch=('i686' 'x86_64') +arch=(i686 x86_64) license=('GPL') url="http://freetype.sourceforge.net" +replaces=('freetype2-static') depends=('zlib') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 freetype-2.3.0-enable-spr.patch freetype-2.2.1-enable-valid.patch) -md5sums=('75ac7082bde7b3805dc5d6bc806fa045' +md5sums=('5e6510613f612809d2d7862592b92ab7' '816dc8619a6904a7385769433c0a8653' '214119610444c9b02766ccee5e220680') @@ -23,9 +24,10 @@ build() { patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" ./configure --prefix=/usr - make || return 1 + make } + package() { cd "${srcdir}/freetype-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/freetype2/__changelog b/abs/core/freetype2/__changelog new file mode 100644 index 0000000..a1edbbd --- /dev/null +++ b/abs/core/freetype2/__changelog @@ -0,0 +1 @@ +- added replaces=('freetype2-static') to PKGBUILD -- cgit v0.12 From 41fce201fbb0d695844a69e84d5b8a7aa9df6445 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 2 Aug 2011 18:47:41 -0500 Subject: freetype2-static: Remove replaced by freetype2. Ref #774 --- abs/core/freetype2-static/PKGBUILD | 32 ---------------------- .../freetype-2.2.1-enable-valid.patch | 20 -------------- .../freetype-2.3.0-enable-spr.patch | 11 -------- 3 files changed, 63 deletions(-) delete mode 100644 abs/core/freetype2-static/PKGBUILD delete mode 100644 abs/core/freetype2-static/freetype-2.2.1-enable-valid.patch delete mode 100644 abs/core/freetype2-static/freetype-2.3.0-enable-spr.patch diff --git a/abs/core/freetype2-static/PKGBUILD b/abs/core/freetype2-static/PKGBUILD deleted file mode 100644 index f974151..0000000 --- a/abs/core/freetype2-static/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 94196 2010-10-05 08:06:59Z jgc $ -# Maintainer: Jan de Groot - -pkgname=freetype2-static -pkgver=2.4.3 -pkgrel=1 -pkgdesc="TrueType font rendering library" -arch=('i686' 'x86_64') -license=('GPL') -url="http://freetype.sourceforge.net" -depends=('zlib') -replaces=('freetype2') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 - freetype-2.3.0-enable-spr.patch - freetype-2.2.1-enable-valid.patch) -md5sums=('75ac7082bde7b3805dc5d6bc806fa045' - '816dc8619a6904a7385769433c0a8653' - '214119610444c9b02766ccee5e220680') - -build() { - cd "${srcdir}/freetype-${pkgver}" - patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" - patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" - - ./configure --prefix=/usr --enable-static - make || return 1 -} -package() { - cd "${srcdir}/freetype-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/abs/core/freetype2-static/freetype-2.2.1-enable-valid.patch b/abs/core/freetype2-static/freetype-2.2.1-enable-valid.patch deleted file mode 100644 index c78b6b7..0000000 --- a/abs/core/freetype2-static/freetype-2.2.1-enable-valid.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 -+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 -@@ -110,7 +110,7 @@ - AUX_MODULES += cache - - # TrueType GX/AAT table validation. Needs ftgxval.c below. --# AUX_MODULES += gxvalid -+AUX_MODULES += gxvalid - - # Support for streams compressed with gzip (files with suffix .gz). - # -@@ -124,7 +124,7 @@ - - # OpenType table validation. Needs ftotval.c below. - # --# AUX_MODULES += otvalid -+AUX_MODULES += otvalid - - # Auxiliary PostScript driver component to share common code. - # diff --git a/abs/core/freetype2-static/freetype-2.3.0-enable-spr.patch b/abs/core/freetype2-static/freetype-2.3.0-enable-spr.patch deleted file mode 100644 index 8432e28..0000000 --- a/abs/core/freetype2-static/freetype-2.3.0-enable-spr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 -+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 -@@ -92,7 +92,7 @@ - /* This is done to allow FreeType clients to run unmodified, forcing */ - /* them to display normal gray-level anti-aliased glyphs. */ - /* */ --/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ -+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - - /*************************************************************************/ -- cgit v0.12 From fd6ce7a9788aeb0800a18cf5b99e615c90d16677 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Wed, 3 Aug 2011 01:33:41 +0000 Subject: lirc: Add upgrade logic to change LircSocket to /var/run/lirc/lircd. Closes #745 --- abs/core/lirc/PKGBUILD | 24 ++++++++++++------------ abs/core/lirc/lirc-0.9.0-5.src.tar.gz | 1 + abs/core/lirc/lirc.install | 18 ++++++++++++++++++ 3 files changed, 31 insertions(+), 12 deletions(-) create mode 120000 abs/core/lirc/lirc-0.9.0-5.src.tar.gz diff --git a/abs/core/lirc/PKGBUILD b/abs/core/lirc/PKGBUILD index 2f63d9a..14c4962 100644 --- a/abs/core/lirc/PKGBUILD +++ b/abs/core/lirc/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=4 +pkgrel=5 #epoch=1 _kernver=2.6.39-LinHES arch=('i686' 'x86_64') @@ -18,17 +18,6 @@ source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.b lirc_atiusb-kfifo.patch kernel-2.6.39.patch lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd) -md5sums=('b232aef26f23fe33ea8305d276637086' - '1cce37e18e3f6f46044abab29016d18f' - 'b70cc9640505205446ec47b7d4779f38' - '1f8b104a2365d9f93404b143f499059b' - '087a7d102e1c96bf1179f38db2b0b237' - '8d0e238dc0eda95e340fe570605da492' - '85f7fdac55e5256967241864049bf5e9' - '3deb02604b37811d41816e9b4385fcc3' - '5b1f8c9cd788a39a6283f93302ce5c6e' - 'f0c0ac930326168035f0c8e24357ae55' - '69d099e6deedfa3c1ee2b6e82d9b8bfb') build() { cd "${srcdir}/lirc-${pkgver}" @@ -101,3 +90,14 @@ package_lirc-utils() { # remove built modules rm -r "${pkgdir}/lib/" } +md5sums=('b232aef26f23fe33ea8305d276637086' + '1cce37e18e3f6f46044abab29016d18f' + 'b70cc9640505205446ec47b7d4779f38' + '1f8b104a2365d9f93404b143f499059b' + '087a7d102e1c96bf1179f38db2b0b237' + '8d0e238dc0eda95e340fe570605da492' + '85f7fdac55e5256967241864049bf5e9' + '1f5611304c1cdcd1f0696468f58b87de' + '5b1f8c9cd788a39a6283f93302ce5c6e' + 'f0c0ac930326168035f0c8e24357ae55' + '69d099e6deedfa3c1ee2b6e82d9b8bfb') diff --git a/abs/core/lirc/lirc-0.9.0-5.src.tar.gz b/abs/core/lirc/lirc-0.9.0-5.src.tar.gz new file mode 120000 index 0000000..c758f27 --- /dev/null +++ b/abs/core/lirc/lirc-0.9.0-5.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/lirc-0.9.0-5.src.tar.gz \ No newline at end of file diff --git a/abs/core/lirc/lirc.install b/abs/core/lirc/lirc.install index 814312e..1f8fd7c 100644 --- a/abs/core/lirc/lirc.install +++ b/abs/core/lirc/lirc.install @@ -8,6 +8,24 @@ post_install() { post_upgrade() { post_install + + . /etc/systemconfig + + # Fix LircSocket in mythtv database + SOCKET=`mysql -u mythtv -pmythtv -B --skip-column-names -h "${dbhost}" -D mythconverg -e \ + "SELECT data FROM settings WHERE value = 'LircSocket' AND hostname = '${hostname}';"` + if [ "${SOCKET}" != "/var/run/lirc/lircd" ]; then + mysql -u mythtv -pmythtv -B --skip-column-names -h "${dbhost}" -D mythconverg -e \ + "UPDATE settings SET data = '/var/run/lirc/lircd' WHERE hostname = '${hostname}';" + else + echo ">>>" + echo ">>> ATTENTION! ATTENTION! ATTENTION!" + echo ">>> Unable to connect the the MySQL database to make needed" + echo ">>> changes to the LIRC socket." + echo ">>> LIRC now uses /var/run/lirc/lircd and /dev/lirc is now" + echo ">>> obsolete. Update your MythTV settings to reflect this." + echo ">>>" + fi } # arg 1: the old package version -- cgit v0.12 From 95917b4db6ef38648c1e5a2a4af4de966f1c2239 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 2 Aug 2011 20:36:42 -0500 Subject: mythdb-initial: Change video player to Internal --- abs/core/mythdb-initial/PKGBUILD | 5 ++--- abs/core/mythdb-initial/mc.sql | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/abs/core/mythdb-initial/PKGBUILD b/abs/core/mythdb-initial/PKGBUILD index 160c4e6..e97775e 100755 --- a/abs/core/mythdb-initial/PKGBUILD +++ b/abs/core/mythdb-initial/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythdb-initial pkgver=2 -pkgrel=8 +pkgrel=9 pkgdesc="setup the initial mythtv database for linhes" url="" license="" @@ -11,7 +11,6 @@ replaces=() backup=() install=mythdb.install source=(mc.sql permissions.sql custom.sql ) -md5sums=() arch=('i686') build() { cd $startdir/src @@ -20,6 +19,6 @@ build() { cp permissions.sql $startdir/pkg/data/database/permissions.sql cp custom.sql $startdir/pkg/data/database/custom.sql } -md5sums=('3211ddff36d76b1dabc48389052cfbd8' +md5sums=('a5770b4bf3621058e41536c3878a5402' 'ad0e57ac5e7c3677808a670e16634bba' '8b0fc984d879b100ae047c157604080b') diff --git a/abs/core/mythdb-initial/mc.sql b/abs/core/mythdb-initial/mc.sql index 00099f1..54bf0ec 100644 --- a/abs/core/mythdb-initial/mc.sql +++ b/abs/core/mythdb-initial/mc.sql @@ -2469,7 +2469,7 @@ CREATE TABLE `settings` ( LOCK TABLES `settings` WRITE; /*!40000 ALTER TABLE `settings` DISABLE KEYS */; -INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES ('mythfilldatabaseLastRunStart','',NULL),('mythfilldatabaseLastRunEnd','',NULL),('mythfilldatabaseLastRunStatus','',NULL),('DataDirectMessage','',NULL),('HaveRepeats','0',NULL),('DBSchemaVer','1264',NULL),('DefaultTranscoder','0',NULL),('MythFillSuggestedRunTime','1970-01-01T00:00:00',NULL),('MythFillGrabberSuggestsTime','1',NULL),('MythFillFixProgramIDsHasRunOnce','1','larch5'),('Language','EN_US','larch5'),('BackendServerIP','127.0.0.1','larch5'),('BackendServerPort','6543','larch5'),('BackendStatusPort','6544','larch5'),('SecurityPin','','larch5'),('MasterServerIP','127.0.0.1',NULL),('MasterServerPort','6543',NULL),('TVFormat','NTSC',NULL),('VbiFormat','None',NULL),('FreqTable','us-bcast',NULL),('TimeOffset','None',NULL),('MasterBackendOverride','1',NULL),('DeletesFollowLinks','1',NULL),('TruncateDeletesSlowly','0','larch5'),('HDRingbufferSize','9400',NULL),('MiscStatusScript','','larch5'),('DisableFirewireReset','0','larch5'),('EITTransportTimeout','5',NULL),('EITIgnoresSource','0',NULL),('EITCrawIdleStart','60',NULL),('startupCommand','',NULL),('blockSDWUwithoutClient','1',NULL),('idleWaitForRecordingTime','15',NULL),('StartupSecsBeforeRecording','120',NULL),('WakeupTimeFormat','hh:mm yyyy-MM-dd',NULL),('SetWakeuptimeCommand','',NULL),('ServerHaltCommand','sudo /sbin/halt -p',NULL),('preSDWUCheckCommand','',NULL),('WOLbackendConnectRetry','5',NULL),('WOLbackendCommand','',NULL),('WOLslaveBackendsCommand','',NULL),('JobQueueMaxSimultaneousJobs','1','larch5'),('JobQueueCheckFrequency','60','larch5'),('JobQueueWindowStart','00:00','larch5'),('JobQueueWindowEnd','23:59','larch5'),('JobQueueCPU','0','larch5'),('JobAllowCommFlag','1','larch5'),('JobAllowTranscode','1','larch5'),('JobAllowUserJob1','0','larch5'),('JobAllowUserJob2','0','larch5'),('JobAllowUserJob3','0','larch5'),('JobAllowUserJob4','0','larch5'),('JobsRunOnRecordHost','0',NULL),('AutoCommflagWhileRecording','0',NULL),('JobQueueCommFlagCommand','mythcommflag',NULL),('JobQueueTranscodeCommand','mythtranscode',NULL),('AutoTranscodeBeforeAutoCommflag','0',NULL),('SaveTranscoding','0',NULL),('UserJobDesc1','User Job #1',NULL),('UserJob1','',NULL),('UserJobDesc2','User Job #2',NULL),('UserJob2','',NULL),('UserJobDesc3','User Job #3',NULL),('UserJob3','',NULL),('UserJobDesc4','User Job #4',NULL),('UserJob4','',NULL),('DefaultVideoPlaybackProfile','CPU+','larch5'),('RealtimePriority','1','larch5'),('DecodeExtraAudio','1','larch5'),('AudioNag','1','larch5'),('UseVideoTimebase','0','larch5'),('ClearSavedPosition','1','larch5'),('AltClearSavedPosition','1','larch5'),('JumpToProgramOSD','1','larch5'),('ContinueEmbeddedTVPlay','0','larch5'),('AutomaticSetWatched','0','larch5'),('AlwaysStreamFiles','1','larch5'),('UseOpenGLVSync','0','larch5'),('UseOutputPictureControls','1','larch5'),('AspectOverride','0','larch5'),('AdjustFill','0','larch5'),('LetterboxColour','0','larch5'),('PIPLocation','0','larch5'),('PlaybackExitPrompt','2','larch5'),('EndOfRecordingExitPrompt','1','larch5'),('PlayBoxOrdering','1','larch5'),('PlayBoxEpisodeSort','Date','larch5'),('GeneratePreviewPixmaps','0','larch5'),('PreviewPixmapOffset','64',NULL),('PreviewFromBookmark','1','larch5'),('PlaybackPreview','1','larch5'),('PlaybackBoxStartInTitle','1','larch5'),('ShowGroupInfo','0','larch5'),('DisplayRecGroup','All Programs','larch5'),('QueryInitialFilter','0','larch5'),('RememberRecGroup','1','larch5'),('DispRecGroupAsAllProg','0','larch5'),('LiveTVInAllPrograms','0','larch5'),('DisplayGroupDefaultView','0','larch5'),('DisplayGroupTitleSort','0','larch5'),('PlaybackWatchList','1','larch5'),('PlaybackWLStart','0','larch5'),('PlaybackWLAutoExpire','0','larch5'),('PlaybackWLMaxAge','60','larch5'),('PlaybackWLBlackOut','2','larch5'),('SmartForward','0','larch5'),('StickyKeys','0','larch5'),('FFRewReposTime','100','larch5'),('FFRewReverse','1','larch5'),('ExactSeeking','0','larch5'),('AutoCommercialSkip','0','larch5'),('MaximumCommercialSkip','3600',NULL),('CommSkipAllBlanks','1',NULL),('PVR350OutputEnable','0','larch5'),('PVR350EPGAlphaValue','164','larch5'),('PVR350InternalAudioOnly','0','larch5'),('OSDTheme','blueosd','larch5'),('OSDGeneralTimeout','2','larch5'),('OSDProgramInfoTimeout','3','larch5'),('OSDFont','FreeMono.ttf','larch5'),('OSDThemeFontSizeType','default','larch5'),('EnableMHEG','0','larch5'),('PersistentBrowseMode','1','larch5'),('OSDNotifyTimeout','5','larch5'),('UDPNotifyPort','6948','larch5'),('OSDCCFont','FreeMono.ttf','larch5'),('CCBackground','0','larch5'),('DefaultCCMode','0','larch5'),('Prefer708Captions','1','larch5'),('OSDCC708TextZoom','100','larch5'),('OSDCC708DefaultFontType','MonoSerif','larch5'),('OSDCC708MonoSerifFont','FreeMono.ttf','larch5'),('OSDCC708PropSerifFont','FreeMono.ttf','larch5'),('OSDCC708MonoSansSerifFont','FreeMono.ttf','larch5'),('OSDCC708PropSansSerifFont','FreeMono.ttf','larch5'),('OSDCC708CasualFont','FreeMono.ttf','larch5'),('OSDCC708CursiveFont','FreeMono.ttf','larch5'),('OSDCC708CapitalsFont','FreeMono.ttf','larch5'),('OSDCC708MonoSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708PropSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708MonoSansSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708PropSansSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708CasualItalicFont','FreeMono.ttf','larch5'),('OSDCC708CursiveItalicFont','FreeMono.ttf','larch5'),('OSDCC708CapitalsItalicFont','FreeMono.ttf','larch5'),('ChannelOrdering','channum','larch5'),('ChannelFormat',' ','larch5'),('LongChannelFormat',' ','larch5'),('SmartChannelChange','0','larch5'),('LastFreeCard','0',NULL),('LiveTVPriority','0',NULL),('AutoExpireMethod','2',NULL),('AutoExpireDefault','1',NULL),('RerecordWatched','1',NULL),('AutoExpireWatchedPriority','0',NULL),('AutoExpireLiveTVMaxAge','1',NULL),('AutoExpireDayPriority','3',NULL),('AutoExpireExtraSpace','1',NULL),('AutoExpireInsteadOfDelete','0',NULL),('DeletedFifoOrder','0',NULL),('CommercialSkipMethod','7',NULL),('AggressiveCommDetect','1',NULL),('AutoCommercialFlag','1',NULL),('AutoTranscode','0',NULL),('AutoRunUserJob1','0',NULL),('AutoRunUserJob2','0',NULL),('AutoRunUserJob3','0',NULL),('AutoRunUserJob4','0',NULL),('OverTimeCategory','category name',NULL),('CategoryOverTime','30',NULL),('EPGFillType','12','larch5'),('EPGShowCategoryColors','1','larch5'),('EPGShowCategoryText','1','larch5'),('EPGScrollType','1','larch5'),('EPGShowChannelIcon','1','larch5'),('EPGShowFavorites','0','larch5'),('WatchTVGuide','0','larch5'),('chanPerPage','5','larch5'),('timePerPage','4','larch5'),('UnknownTitle','Unknown','larch5'),('UnknownCategory','Unknown','larch5'),('DefaultTVChannel','3','larch5'),('SelectChangesChannel','0','larch5'),('SelChangeRecThreshold','16','larch5'),('EPGEnableJumpToChannel','0',NULL),('Theme','LinHES','larch5'),('RandomTheme','0','larch5'),('ThemeCacheSize','1','larch5'),('ThemePainter','qt','larch5'),('Style','Desktop Style','larch5'),('ThemeFontSizeType','default','larch5'),('MenuTheme','default','larch5'),('XineramaScreen','0','larch5'),('XineramaMonitorAspectRatio','1.3333','larch5'),('GuiSizeForTV','1','larch5'),('HideMouseCursor','1','larch5'),('RunFrontendInWindow','0','larch5'),('UseVideoModes','0','larch5'),('GuiVidModeResolution','640x480','larch5'),('TVVidModeResolution','320x200','larch5'),('TVVidModeForceAspect','0.0','larch5'),('TVVidModeResolution0','320x200','larch5'),('TVVidModeForceAspect0','0.0','larch5'),('TVVidModeResolution1','320x200','larch5'),('TVVidModeForceAspect1','0.0','larch5'),('TVVidModeResolution2','320x200','larch5'),('TVVidModeForceAspect2','0.0','larch5'),('ISO639Language0','eng',NULL),('ISO639Language1','eng',NULL),('DateFormat','ddd MMM d','larch5'),('ShortDateFormat','M/d','larch5'),('TimeFormat','h:mm AP','larch5'),('QtFontSmall','12','larch5'),('QtFontMedium','16','larch5'),('QtFontBig','25','larch5'),('PlayBoxTransparency','1','larch5'),('PlayBoxShading','0','larch5'),('UseVirtualKeyboard','1','larch5'),('LCDEnable','0','larch5'),('LCDShowTime','1','larch5'),('LCDShowMenu','1','larch5'),('LCDShowMusic','1','larch5'),('LCDShowMusicItems','ArtistTitle','larch5'),('LCDShowChannel','1','larch5'),('LCDShowRecStatus','0','larch5'),('LCDShowVolume','1','larch5'),('LCDShowGeneric','1','larch5'),('LCDBacklightOn','1','larch5'),('LCDHeartBeatOn','0','larch5'),('LCDBigClock','0','larch5'),('LCDKeyString','ABCDEF','larch5'),('LCDPopupTime','5','larch5'),('AudioOutputDevice','ALSA:default','larch5'),('PassThruOutputDevice','Default','larch5'),('MaxChannels','2','larch5'),('AudioUpmixType','0','larch5'),('AC3PassThru','0','larch5'),('DTSPassThru','0','larch5'),('AggressiveSoundcardBuffer','0','larch5'),('MythControlsVolume','1','larch5'),('MixerDevice','ALSA:default','larch5'),('MixerControl','PCM','larch5'),('MasterMixerVolume','100','larch5'),('PCMMixerVolume','50','larch5'),('IndividualMuteControl','0','larch5'),('LircKeyPressedApp','','larch5'),('AllowQuitShutdown','4','larch5'),('NoPromptOnExit','1','larch5'),('UseArrowAccels','1','larch5'),('NetworkControlEnabled','0','larch5'),('NetworkControlPort','6546','larch5'),('MonitorDrives','0','larch5'),('MediaChangeEvents','0','larch5'),('IgnoreDevices','','larch5'),('SetupPinCodeRequired','0','larch5'),('OverrideExitMenu','3','larch5'),('HaltCommand','sudo /sbin/halt','larch5'),('RebootCommand','sudo /sbin/reboot','larch5'),('EnableXbox','0','larch5'),('LogEnabled','0',NULL),('LogMaxCount','100','larch5'),('LogPrintLevel','8','larch5'),('LogCleanEnabled','0','larch5'),('LogCleanPeriod','14','larch5'),('LogCleanDays','14','larch5'),('LogCleanMax','30','larch5'),('MythFillEnabled','1',NULL),('MythFillDatabasePath','mythfilldatabase',NULL),('MythFillDatabaseArgs','',NULL),('MythFillDatabaseLog','',NULL),('MythFillPeriod','1',NULL),('MythFillMinHour','2',NULL),('MythFillMaxHour','5',NULL),('SchedMoveHigher','1',NULL),('SchedOpenEnd','0',NULL),('ComplexPriority','0',NULL),('PrefInputPriority','2',NULL),('SingleRecordRecPriority','1',NULL),('FindOneRecordRecPriority','-1',NULL),('ArchiveDBSchemaVer','1005',NULL),('MythArchiveTempDir','/myth/tmp','larch5'),('MythArchiveShareDir','/usr/share/mythtv/mytharchive/','larch5'),('MythArchiveVideoFormat','NTSC','larch5'),('MythArchiveFileFilter','*.mpg *.mov *.avi *.mpeg *.nuv','larch5'),('MythArchiveDVDLocation','/dev/dvd','larch5'),('MythArchiveDVDPlayerCmd','Internal','larch5'),('MythArchiveEncodeToAc3','0','larch5'),('MythArchiveCopyRemoteFiles','0','larch5'),('MythArchiveAlwaysUseMythTranscode','1','larch5'),('MythArchiveUseProjectX','0','larch5'),('MythArchiveAddSubtitles','0','larch5'),('MythArchiveUseFIFO','1','larch5'),('MythArchiveDefaultEncProfile','SP','larch5'),('MythArchiveMainMenuAR','16:9','larch5'),('MythArchiveChapterMenuAR','Video','larch5'),('MythArchiveDateFormat','%a %b %d','larch5'),('MythArchiveTimeFormat','%I:%M %p','larch5'),('MythArchiveFfmpegCmd','ffmpeg','larch5'),('MythArchiveMplexCmd','mplex','larch5'),('MythArchiveDvdauthorCmd','dvdauthor','larch5'),('MythArchiveSpumuxCmd','spumux','larch5'),('MythArchiveMpeg2encCmd','mpeg2enc','larch5'),('MythArchiveMkisofsCmd','mkisofs','larch5'),('MythArchiveGrowisofsCmd','growisofs','larch5'),('MythArchiveTcrequantCmd','tcrequant','larch5'),('MythArchiveJpeg2yuvCmd','jpeg2yuv','larch5'),('MythArchiveProjectXCmd','projectx','larch5'),('FlixDBSchemaVer','1004',NULL),('GalleryDBSchemaVer','1003',NULL),('GalleryDir','/myth/gallery','larch5'),('GalleryThumbnailLocation','1','larch5'),('GallerySortOrder','20','larch5'),('GalleryImportDirs','/mnt/cdrom:/mnt/camera','larch5'),('GalleryMoviePlayerCmd','mplayer -fs %s','larch5'),('SlideshowUseOpenGL','0','larch5'),('SlideshowDelay','5','larch5'),('SlideshowOpenGLTransition','none','larch5'),('SlideshowOpenGLTransitionLength','2000','larch5'),('SlideshowTransition','random','larch5'),('SlideshowBackground','black','larch5'),('GameDBSchemaVer','1017',NULL),('MusicDBSchemaVer','1017',NULL),('VisualMode','','larch5'),('MusicLocation','/myth/music/','larch5'),('MusicAudioDevice','default','larch5'),('CDDevice','/dev/cdrom','larch5'),('AutoLookupCD','1','larch5'),('AutoPlayCD','0','larch5'),('KeyboardAccelerators','1','larch5'),('TreeLevels','splitartist artist album title','larch5'),('ArtistTreeGroups','0','larch5'),('NonID3FileNameFormat','GENRE/ARTIST/ALBUM/TRACK_TITLE','larch5'),('Ignore_ID3','0','larch5'),('MusicTagEncoding','utf16','larch5'),('CDWriterEnabled','1','larch5'),('CDDiskSize','1','larch5'),('CDCreateDir','1','larch5'),('CDWriteSpeed','0','larch5'),('CDBlankType','fast','larch5'),('PlayMode','none','larch5'),('ResumeMode','off','larch5'),('MaxSearchResults','300','larch5'),('MusicShowRatings','0','larch5'),('ShowWholeTree','0','larch5'),('ListAsShuffled','0','larch5'),('IntelliRatingWeight','35','larch5'),('IntelliPlayCountWeight','25','larch5'),('IntelliLastPlayWeight','25','larch5'),('IntelliRandomWeight','15','larch5'),('VisualCycleOnSongChange','0','larch5'),('VisualAlbumArtOnSongChange','0','larch5'),('VisualRandomize','0','larch5'),('VisualModeDelay','0','larch5'),('VisualScaleWidth','1','larch5'),('VisualScaleHeight','1','larch5'),('ParanoiaLevel','Full','larch5'),('FilenameTemplate','ARTIST/ALBUM/TRACK-TITLE','larch5'),('NoWhitespace','0','larch5'),('PostCDRipScript','','larch5'),('EjectCDAfterRipping','1','larch5'),('EncoderType','ogg','larch5'),('DefaultRipQuality','1','larch5'),('Mp3UseVBR','0','larch5'),('PhoneDBSchemaVer','1001',NULL),('SipRegisterWithProxy','1','larch5'),('SipProxyName','fwd.pulver.com','larch5'),('SipProxyAuthName','','larch5'),('SipProxyAuthPassword','','larch5'),('MySipName','Me','larch5'),('SipAutoanswer','0','larch5'),('SipBindInterface','eth0','larch5'),('SipLocalPort','5060','larch5'),('NatTraversalMethod','None','larch5'),('NatIpAddress','http://checkip.dyndns.org','larch5'),('AudioLocalPort','21232','larch5'),('VideoLocalPort','21234','larch5'),('MicrophoneDevice','None','larch5'),('CodecPriorityList','GSM;G.711u;G.711a','larch5'),('PlayoutAudioCall','40','larch5'),('PlayoutVideoCall','110','larch5'),('TxResolution','176x144','larch5'),('TransmitFPS','5','larch5'),('TransmitBandwidth','256','larch5'),('CaptureResolution','352x288','larch5'),('TimeToAnswer','10','larch5'),('DefaultVxmlUrl','http://127.0.0.1/vxml/index.vxml','larch5'),('DefaultVoicemailPrompt','I am not at home, please leave a message after the tone','larch5'),('mythvideo.DBSchemaVer','1038',NULL),('VideoStartupDir','/myth/video','larch5'),('VideoArtworkDir','/myth/video_stuff/coverart','larch5'),('Default MythVideo View','2','larch5'),('VideoListUnknownFiletypes','1','larch5'),('VideoBrowserNoDB','1','larch5'),('VideoGalleryNoDB','1','larch5'),('VideoTreeNoDB','1','larch5'),('VideoTreeLoadMetaData','1','larch5'),('VideoNewBrowsable','1','larch5'),('mythvideo.sort_ignores_case','1','larch5'),('mythvideo.db_folder_view','1','larch5'),('mythvideo.VideoTreeRemember','1','larch5'),('mythvideo.ImageCacheSize','50','larch5'),('DVDDeviceLocation','/dev/dvd','larch5'),('VCDDeviceLocation','/dev/cdrom','larch5'),('DVDOnInsertDVD','1','larch5'),('DVDDriveSpeed','2','larch5'),('EnableDVDBookmark','1','larch5'),('DVDBookmarkPrompt','1','larch5'),('DVDBookmarkDays','10','larch5'),('mythvideo.fanartDir','/myth/video_stuff/fanart','larch5'),('mythvideo.screenshotDir','/myth/video_stuff/screenshots','larch5'),('mythvideo.bannerDir','/myth/video_stuff/banners','larch5'),('VideoGalleryColsPerPage','4','larch5'),('VideoGalleryRowsPerPage','3','larch5'),('VideoGallerySubtitle','1','larch5'),('VideoDefaultParentalLevel','4','larch5'),('VideoAggressivePC','0','larch5'),('mythvideo.ParentalLevelFromRating','0','larch5'),('mythvideo.AutoR2PL1','G','larch5'),('mythvideo.AutoR2PL2','PG','larch5'),('mythvideo.AutoR2PL3','PG-13','larch5'),('mythvideo.AutoR2PL4','R:NC-17','larch5'),('VideoDefaultPlayer','mplayer -fs -zoom -quiet -vo xv %s','larch5'),('mythdvd.DVDPlayerCommand','Internal','larch5'),('VCDPlayerCommand','mplayer vcd:// -cdrom-device %d -fs -zoom -vo xv','larch5'),('DVDRipLocation','/myth/tmp','larch5'),('TitlePlayCommand','mplayer dvd://%t -dvd-device %d -fs -zoom -vo xv -aid %a -channels %c','larch5'),('SubTitleCommand','-sid %s','larch5'),('TranscodeCommand','transcode','larch5'),('MTDPort','2442','larch5'),('MTDNiceLevel','20','larch5'),('MTDConcurrentTranscodes','1','larch5'),('MTDLogFlag','0','larch5'),('MTDac3Flag','0','larch5'),('MTDxvidFlag','1','larch5'),('mythvideo.TrustTranscodeFRDetect','1','larch5'),('WeatherDBSchemaVer','1004',NULL),('TVVidModeRefreshRate','0','larch5'),('TVVidModeRefreshRate0','0','larch5'),('TVVidModeRefreshRate1','0','larch5'),('TVVidModeRefreshRate2','0','larch5'),('GalleryRecursiveSlideshow','1','larch5'),('WebBrowserZoomLevel','20','larch5'),('WebBrowserCommand','Internal','larch5'),('WebBrowserScrollMode','1','larch5'),('WebBrowserScrollSpeed','4','larch5'),('WebBrowserHideScrollbars','0','larch5'),('RepeatMode','all','larch5'),('MusicAutoShowPlayer','1','larch5'),('HOSTOSsize','5','larch5'),('NetworkControlEnabled','1','larch5'),('Hostpluginmytharchive','1','larch5'),('Hostpluginmythbrowser','1','larch5'),('Hostpluginmythcontrols','1','larch5'),('Hostpluginmythflix','1','larch5'),('Hostpluginmythgallery','1','larch5'),('Hostpluginmythgame','1','larch5'),('HostpluginmythgameFceu','1','larch5'),('HostpluginmythgameMame','1','larch5'),('HostpluginmythgameZsnes','1','larch5'),('Hostpluginmythmovietime','1','larch5'),('Hostpluginmythmusic','1','larch5'),('Hostpluginmythnews','1','larch5'),('Hostpluginmythphone','1','larch5'),('Hostpluginmythsmolt','1','larch5'),('Hostpluginmythvideo','1','larch5'),('Hostpluginmythvideo_dvdcss','0','larch5'),('Hostpluginmythweather','1','larch5'),('HostAudiotype','ALSA','larch5'),('HostpluginmythgameZsnes','1','larch5'),('HostpluginmythgameMame','1','larch5'),('Hostpluginmythvideo_dvdcss','0','larch5'),('Hostpluginmythappletrailers','1','larch5'),('Hostpluginmythstream','1','larch5'),('Hostpluginmythvodka','1','larch5'),('HostMiro','1','larch5'),('HostpluginmythgameXE','1','larch5'),('HostpluginmythgameROMDB','1','larch5'),('HostXine','1','larch5'),('HOSTOSsize','5','larch5'),('HostMyhostname','larch5','larch5'),('NetworkControlEnabled','1','larch5'),('Hostaccessuser','1','larch5'),('WOLbackendReconnectWaitTime','5',NULL),('Hostbootsplash','0','larch5'),('HostIPeth0','192.168.1.177','larch5'),('HostNETMASKeth0','/24 255.255.255.0','larch5'),('HostGWeth0','192.168.1.1','larch5'),('HostDNSeth0','192.168.1.1','larch5'),('HostReceiverType','Hauppauge','larch5'),('HostRemoteType','no_remote','larch5'),('HOSTtemplatetype','Do Nothing','larch5'),('BackupDBLastRunStart','2010-11-29 17:02:26',NULL),('BackupDBLastRunEnd','2010-11-29 17:02:27',NULL),('StorageScheduler','Combination',NULL),('DisableAutomaticBackup','0',NULL),('BackendStopCommand','sudo sv stop mythbackend',NULL),('BackendStartCommand','sudo sv start mythbackend',NULL),('UPnP/WMPSource','0',NULL),('UPnP/RebuildDelay','30','larch5'),('GeneratePreviewRemotely','0','larch5'),('HWAccelPlaybackPreview','0','larch5'),('BrowseAllTuners','0','larch5'),('SubtitleCodec','UTF-8','larch5'),('ChannelGroupRememberLast','0','larch5'),('ChannelGroupDefault','-1','larch5'),('BrowseChannelGroup','0','larch5'),('UseFixedWindowSize','1','larch5'),('ScreenShotPath','/myth/video_stuff/screenshots','larch5'),('LircSocket','/var/run/lirc/lircd','larch5'),('BrowserDBSchemaVer','1002',NULL),('CDWriterDevice','default','larch5'),('MusicExitAction','prompt','larch5'),('mythvideo.db_group_view','1','larch5'),('mythvideo.db_group_type','0','larch5'),('MovieListCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -M','larch5'),('MoviePosterCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -P','larch5'),('MovieFanartCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -B','larch5'),('MovieDataCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -D','larch5'),('mythvideo.TrailersDir','/myth/video_stuff/trailers','larch5'),('mythvideo.TrailersRandomEnabled','1','larch5'),('mythvideo.TrailersRandomCount','3','larch5'),('mythvideo.TVListCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -M','larch5'),('mythvideo.TVPosterCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -P','larch5'),('mythvideo.TVFanartCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -F','larch5'),('mythvideo.TVBannerCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -B','larch5'),('mythvideo.TVDataCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -D','larch5'),('mythvideo.TVTitleSubCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -N','larch5'),('mythvideo.TVScreenshotCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -S','larch5'),('mythvideo.EnableAlternatePlayer','1','larch5'),('mythvideo.VideoAlternatePlayer','Internal','larch5'),('AudioDefaultUpmix','1','larch5'),('AdvancedAudioSettings','0','larch5'),('SRCQualityOverride','0','larch5'),('SRCQuality','1','larch5'),('MusicDefaultUpmix','0','larch5'),('Country','US','larch5'),('OSDSubFont','FreeSans','larch5'),('CommFlagFast','0',NULL),('MultiChannelPCM','0','larch5'),('Audio48kOverride','0','larch5'),('PassThruDeviceOverride','0','larch5'),('MythArchiveM2VRequantiserCmd','M2VRequantiser','larch5'); +INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES ('mythfilldatabaseLastRunStart','',NULL),('mythfilldatabaseLastRunEnd','',NULL),('mythfilldatabaseLastRunStatus','',NULL),('DataDirectMessage','',NULL),('HaveRepeats','0',NULL),('DBSchemaVer','1264',NULL),('DefaultTranscoder','0',NULL),('MythFillSuggestedRunTime','1970-01-01T00:00:00',NULL),('MythFillGrabberSuggestsTime','1',NULL),('MythFillFixProgramIDsHasRunOnce','1','larch5'),('Language','EN_US','larch5'),('BackendServerIP','127.0.0.1','larch5'),('BackendServerPort','6543','larch5'),('BackendStatusPort','6544','larch5'),('SecurityPin','','larch5'),('MasterServerIP','127.0.0.1',NULL),('MasterServerPort','6543',NULL),('TVFormat','NTSC',NULL),('VbiFormat','None',NULL),('FreqTable','us-bcast',NULL),('TimeOffset','None',NULL),('MasterBackendOverride','1',NULL),('DeletesFollowLinks','1',NULL),('TruncateDeletesSlowly','0','larch5'),('HDRingbufferSize','9400',NULL),('MiscStatusScript','','larch5'),('DisableFirewireReset','0','larch5'),('EITTransportTimeout','5',NULL),('EITIgnoresSource','0',NULL),('EITCrawIdleStart','60',NULL),('startupCommand','',NULL),('blockSDWUwithoutClient','1',NULL),('idleWaitForRecordingTime','15',NULL),('StartupSecsBeforeRecording','120',NULL),('WakeupTimeFormat','hh:mm yyyy-MM-dd',NULL),('SetWakeuptimeCommand','',NULL),('ServerHaltCommand','sudo /sbin/halt -p',NULL),('preSDWUCheckCommand','',NULL),('WOLbackendConnectRetry','5',NULL),('WOLbackendCommand','',NULL),('WOLslaveBackendsCommand','',NULL),('JobQueueMaxSimultaneousJobs','1','larch5'),('JobQueueCheckFrequency','60','larch5'),('JobQueueWindowStart','00:00','larch5'),('JobQueueWindowEnd','23:59','larch5'),('JobQueueCPU','0','larch5'),('JobAllowCommFlag','1','larch5'),('JobAllowTranscode','1','larch5'),('JobAllowUserJob1','0','larch5'),('JobAllowUserJob2','0','larch5'),('JobAllowUserJob3','0','larch5'),('JobAllowUserJob4','0','larch5'),('JobsRunOnRecordHost','0',NULL),('AutoCommflagWhileRecording','0',NULL),('JobQueueCommFlagCommand','mythcommflag',NULL),('JobQueueTranscodeCommand','mythtranscode',NULL),('AutoTranscodeBeforeAutoCommflag','0',NULL),('SaveTranscoding','0',NULL),('UserJobDesc1','User Job #1',NULL),('UserJob1','',NULL),('UserJobDesc2','User Job #2',NULL),('UserJob2','',NULL),('UserJobDesc3','User Job #3',NULL),('UserJob3','',NULL),('UserJobDesc4','User Job #4',NULL),('UserJob4','',NULL),('DefaultVideoPlaybackProfile','CPU+','larch5'),('RealtimePriority','1','larch5'),('DecodeExtraAudio','1','larch5'),('AudioNag','1','larch5'),('UseVideoTimebase','0','larch5'),('ClearSavedPosition','1','larch5'),('AltClearSavedPosition','1','larch5'),('JumpToProgramOSD','1','larch5'),('ContinueEmbeddedTVPlay','0','larch5'),('AutomaticSetWatched','0','larch5'),('AlwaysStreamFiles','1','larch5'),('UseOpenGLVSync','0','larch5'),('UseOutputPictureControls','1','larch5'),('AspectOverride','0','larch5'),('AdjustFill','0','larch5'),('LetterboxColour','0','larch5'),('PIPLocation','0','larch5'),('PlaybackExitPrompt','2','larch5'),('EndOfRecordingExitPrompt','1','larch5'),('PlayBoxOrdering','1','larch5'),('PlayBoxEpisodeSort','Date','larch5'),('GeneratePreviewPixmaps','0','larch5'),('PreviewPixmapOffset','64',NULL),('PreviewFromBookmark','1','larch5'),('PlaybackPreview','1','larch5'),('PlaybackBoxStartInTitle','1','larch5'),('ShowGroupInfo','0','larch5'),('DisplayRecGroup','All Programs','larch5'),('QueryInitialFilter','0','larch5'),('RememberRecGroup','1','larch5'),('DispRecGroupAsAllProg','0','larch5'),('LiveTVInAllPrograms','0','larch5'),('DisplayGroupDefaultView','0','larch5'),('DisplayGroupTitleSort','0','larch5'),('PlaybackWatchList','1','larch5'),('PlaybackWLStart','0','larch5'),('PlaybackWLAutoExpire','0','larch5'),('PlaybackWLMaxAge','60','larch5'),('PlaybackWLBlackOut','2','larch5'),('SmartForward','0','larch5'),('StickyKeys','0','larch5'),('FFRewReposTime','100','larch5'),('FFRewReverse','1','larch5'),('ExactSeeking','0','larch5'),('AutoCommercialSkip','0','larch5'),('MaximumCommercialSkip','3600',NULL),('CommSkipAllBlanks','1',NULL),('PVR350OutputEnable','0','larch5'),('PVR350EPGAlphaValue','164','larch5'),('PVR350InternalAudioOnly','0','larch5'),('OSDTheme','blueosd','larch5'),('OSDGeneralTimeout','2','larch5'),('OSDProgramInfoTimeout','3','larch5'),('OSDFont','FreeMono.ttf','larch5'),('OSDThemeFontSizeType','default','larch5'),('EnableMHEG','0','larch5'),('PersistentBrowseMode','1','larch5'),('OSDNotifyTimeout','5','larch5'),('UDPNotifyPort','6948','larch5'),('OSDCCFont','FreeMono.ttf','larch5'),('CCBackground','0','larch5'),('DefaultCCMode','0','larch5'),('Prefer708Captions','1','larch5'),('OSDCC708TextZoom','100','larch5'),('OSDCC708DefaultFontType','MonoSerif','larch5'),('OSDCC708MonoSerifFont','FreeMono.ttf','larch5'),('OSDCC708PropSerifFont','FreeMono.ttf','larch5'),('OSDCC708MonoSansSerifFont','FreeMono.ttf','larch5'),('OSDCC708PropSansSerifFont','FreeMono.ttf','larch5'),('OSDCC708CasualFont','FreeMono.ttf','larch5'),('OSDCC708CursiveFont','FreeMono.ttf','larch5'),('OSDCC708CapitalsFont','FreeMono.ttf','larch5'),('OSDCC708MonoSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708PropSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708MonoSansSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708PropSansSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708CasualItalicFont','FreeMono.ttf','larch5'),('OSDCC708CursiveItalicFont','FreeMono.ttf','larch5'),('OSDCC708CapitalsItalicFont','FreeMono.ttf','larch5'),('ChannelOrdering','channum','larch5'),('ChannelFormat',' ','larch5'),('LongChannelFormat',' ','larch5'),('SmartChannelChange','0','larch5'),('LastFreeCard','0',NULL),('LiveTVPriority','0',NULL),('AutoExpireMethod','2',NULL),('AutoExpireDefault','1',NULL),('RerecordWatched','1',NULL),('AutoExpireWatchedPriority','0',NULL),('AutoExpireLiveTVMaxAge','1',NULL),('AutoExpireDayPriority','3',NULL),('AutoExpireExtraSpace','1',NULL),('AutoExpireInsteadOfDelete','0',NULL),('DeletedFifoOrder','0',NULL),('CommercialSkipMethod','7',NULL),('AggressiveCommDetect','1',NULL),('AutoCommercialFlag','1',NULL),('AutoTranscode','0',NULL),('AutoRunUserJob1','0',NULL),('AutoRunUserJob2','0',NULL),('AutoRunUserJob3','0',NULL),('AutoRunUserJob4','0',NULL),('OverTimeCategory','category name',NULL),('CategoryOverTime','30',NULL),('EPGFillType','12','larch5'),('EPGShowCategoryColors','1','larch5'),('EPGShowCategoryText','1','larch5'),('EPGScrollType','1','larch5'),('EPGShowChannelIcon','1','larch5'),('EPGShowFavorites','0','larch5'),('WatchTVGuide','0','larch5'),('chanPerPage','5','larch5'),('timePerPage','4','larch5'),('UnknownTitle','Unknown','larch5'),('UnknownCategory','Unknown','larch5'),('DefaultTVChannel','3','larch5'),('SelectChangesChannel','0','larch5'),('SelChangeRecThreshold','16','larch5'),('EPGEnableJumpToChannel','0',NULL),('Theme','LinHES','larch5'),('RandomTheme','0','larch5'),('ThemeCacheSize','1','larch5'),('ThemePainter','qt','larch5'),('Style','Desktop Style','larch5'),('ThemeFontSizeType','default','larch5'),('MenuTheme','default','larch5'),('XineramaScreen','0','larch5'),('XineramaMonitorAspectRatio','1.3333','larch5'),('GuiSizeForTV','1','larch5'),('HideMouseCursor','1','larch5'),('RunFrontendInWindow','0','larch5'),('UseVideoModes','0','larch5'),('GuiVidModeResolution','640x480','larch5'),('TVVidModeResolution','320x200','larch5'),('TVVidModeForceAspect','0.0','larch5'),('TVVidModeResolution0','320x200','larch5'),('TVVidModeForceAspect0','0.0','larch5'),('TVVidModeResolution1','320x200','larch5'),('TVVidModeForceAspect1','0.0','larch5'),('TVVidModeResolution2','320x200','larch5'),('TVVidModeForceAspect2','0.0','larch5'),('ISO639Language0','eng',NULL),('ISO639Language1','eng',NULL),('DateFormat','ddd MMM d','larch5'),('ShortDateFormat','M/d','larch5'),('TimeFormat','h:mm AP','larch5'),('QtFontSmall','12','larch5'),('QtFontMedium','16','larch5'),('QtFontBig','25','larch5'),('PlayBoxTransparency','1','larch5'),('PlayBoxShading','0','larch5'),('UseVirtualKeyboard','1','larch5'),('LCDEnable','0','larch5'),('LCDShowTime','1','larch5'),('LCDShowMenu','1','larch5'),('LCDShowMusic','1','larch5'),('LCDShowMusicItems','ArtistTitle','larch5'),('LCDShowChannel','1','larch5'),('LCDShowRecStatus','0','larch5'),('LCDShowVolume','1','larch5'),('LCDShowGeneric','1','larch5'),('LCDBacklightOn','1','larch5'),('LCDHeartBeatOn','0','larch5'),('LCDBigClock','0','larch5'),('LCDKeyString','ABCDEF','larch5'),('LCDPopupTime','5','larch5'),('AudioOutputDevice','ALSA:default','larch5'),('PassThruOutputDevice','Default','larch5'),('MaxChannels','2','larch5'),('AudioUpmixType','0','larch5'),('AC3PassThru','0','larch5'),('DTSPassThru','0','larch5'),('AggressiveSoundcardBuffer','0','larch5'),('MythControlsVolume','1','larch5'),('MixerDevice','ALSA:default','larch5'),('MixerControl','PCM','larch5'),('MasterMixerVolume','100','larch5'),('PCMMixerVolume','50','larch5'),('IndividualMuteControl','0','larch5'),('LircKeyPressedApp','','larch5'),('AllowQuitShutdown','4','larch5'),('NoPromptOnExit','1','larch5'),('UseArrowAccels','1','larch5'),('NetworkControlEnabled','0','larch5'),('NetworkControlPort','6546','larch5'),('MonitorDrives','0','larch5'),('MediaChangeEvents','0','larch5'),('IgnoreDevices','','larch5'),('SetupPinCodeRequired','0','larch5'),('OverrideExitMenu','3','larch5'),('HaltCommand','sudo /sbin/halt','larch5'),('RebootCommand','sudo /sbin/reboot','larch5'),('EnableXbox','0','larch5'),('LogEnabled','0',NULL),('LogMaxCount','100','larch5'),('LogPrintLevel','8','larch5'),('LogCleanEnabled','0','larch5'),('LogCleanPeriod','14','larch5'),('LogCleanDays','14','larch5'),('LogCleanMax','30','larch5'),('MythFillEnabled','1',NULL),('MythFillDatabasePath','mythfilldatabase',NULL),('MythFillDatabaseArgs','',NULL),('MythFillDatabaseLog','',NULL),('MythFillPeriod','1',NULL),('MythFillMinHour','2',NULL),('MythFillMaxHour','5',NULL),('SchedMoveHigher','1',NULL),('SchedOpenEnd','0',NULL),('ComplexPriority','0',NULL),('PrefInputPriority','2',NULL),('SingleRecordRecPriority','1',NULL),('FindOneRecordRecPriority','-1',NULL),('ArchiveDBSchemaVer','1005',NULL),('MythArchiveTempDir','/myth/tmp','larch5'),('MythArchiveShareDir','/usr/share/mythtv/mytharchive/','larch5'),('MythArchiveVideoFormat','NTSC','larch5'),('MythArchiveFileFilter','*.mpg *.mov *.avi *.mpeg *.nuv','larch5'),('MythArchiveDVDLocation','/dev/dvd','larch5'),('MythArchiveDVDPlayerCmd','Internal','larch5'),('MythArchiveEncodeToAc3','0','larch5'),('MythArchiveCopyRemoteFiles','0','larch5'),('MythArchiveAlwaysUseMythTranscode','1','larch5'),('MythArchiveUseProjectX','0','larch5'),('MythArchiveAddSubtitles','0','larch5'),('MythArchiveUseFIFO','1','larch5'),('MythArchiveDefaultEncProfile','SP','larch5'),('MythArchiveMainMenuAR','16:9','larch5'),('MythArchiveChapterMenuAR','Video','larch5'),('MythArchiveDateFormat','%a %b %d','larch5'),('MythArchiveTimeFormat','%I:%M %p','larch5'),('MythArchiveFfmpegCmd','ffmpeg','larch5'),('MythArchiveMplexCmd','mplex','larch5'),('MythArchiveDvdauthorCmd','dvdauthor','larch5'),('MythArchiveSpumuxCmd','spumux','larch5'),('MythArchiveMpeg2encCmd','mpeg2enc','larch5'),('MythArchiveMkisofsCmd','mkisofs','larch5'),('MythArchiveGrowisofsCmd','growisofs','larch5'),('MythArchiveTcrequantCmd','tcrequant','larch5'),('MythArchiveJpeg2yuvCmd','jpeg2yuv','larch5'),('MythArchiveProjectXCmd','projectx','larch5'),('FlixDBSchemaVer','1004',NULL),('GalleryDBSchemaVer','1003',NULL),('GalleryDir','/myth/gallery','larch5'),('GalleryThumbnailLocation','1','larch5'),('GallerySortOrder','20','larch5'),('GalleryImportDirs','/mnt/cdrom:/mnt/camera','larch5'),('GalleryMoviePlayerCmd','Internal','larch5'),('SlideshowUseOpenGL','0','larch5'),('SlideshowDelay','5','larch5'),('SlideshowOpenGLTransition','none','larch5'),('SlideshowOpenGLTransitionLength','2000','larch5'),('SlideshowTransition','random','larch5'),('SlideshowBackground','black','larch5'),('GameDBSchemaVer','1017',NULL),('MusicDBSchemaVer','1017',NULL),('VisualMode','','larch5'),('MusicLocation','/myth/music/','larch5'),('MusicAudioDevice','default','larch5'),('CDDevice','/dev/cdrom','larch5'),('AutoLookupCD','1','larch5'),('AutoPlayCD','0','larch5'),('KeyboardAccelerators','1','larch5'),('TreeLevels','splitartist artist album title','larch5'),('ArtistTreeGroups','0','larch5'),('NonID3FileNameFormat','GENRE/ARTIST/ALBUM/TRACK_TITLE','larch5'),('Ignore_ID3','0','larch5'),('MusicTagEncoding','utf16','larch5'),('CDWriterEnabled','1','larch5'),('CDDiskSize','1','larch5'),('CDCreateDir','1','larch5'),('CDWriteSpeed','0','larch5'),('CDBlankType','fast','larch5'),('PlayMode','none','larch5'),('ResumeMode','off','larch5'),('MaxSearchResults','300','larch5'),('MusicShowRatings','0','larch5'),('ShowWholeTree','0','larch5'),('ListAsShuffled','0','larch5'),('IntelliRatingWeight','35','larch5'),('IntelliPlayCountWeight','25','larch5'),('IntelliLastPlayWeight','25','larch5'),('IntelliRandomWeight','15','larch5'),('VisualCycleOnSongChange','0','larch5'),('VisualAlbumArtOnSongChange','0','larch5'),('VisualRandomize','0','larch5'),('VisualModeDelay','0','larch5'),('VisualScaleWidth','1','larch5'),('VisualScaleHeight','1','larch5'),('ParanoiaLevel','Full','larch5'),('FilenameTemplate','ARTIST/ALBUM/TRACK-TITLE','larch5'),('NoWhitespace','0','larch5'),('PostCDRipScript','','larch5'),('EjectCDAfterRipping','1','larch5'),('EncoderType','ogg','larch5'),('DefaultRipQuality','1','larch5'),('Mp3UseVBR','0','larch5'),('PhoneDBSchemaVer','1001',NULL),('SipRegisterWithProxy','1','larch5'),('SipProxyName','fwd.pulver.com','larch5'),('SipProxyAuthName','','larch5'),('SipProxyAuthPassword','','larch5'),('MySipName','Me','larch5'),('SipAutoanswer','0','larch5'),('SipBindInterface','eth0','larch5'),('SipLocalPort','5060','larch5'),('NatTraversalMethod','None','larch5'),('NatIpAddress','http://checkip.dyndns.org','larch5'),('AudioLocalPort','21232','larch5'),('VideoLocalPort','21234','larch5'),('MicrophoneDevice','None','larch5'),('CodecPriorityList','GSM;G.711u;G.711a','larch5'),('PlayoutAudioCall','40','larch5'),('PlayoutVideoCall','110','larch5'),('TxResolution','176x144','larch5'),('TransmitFPS','5','larch5'),('TransmitBandwidth','256','larch5'),('CaptureResolution','352x288','larch5'),('TimeToAnswer','10','larch5'),('DefaultVxmlUrl','http://127.0.0.1/vxml/index.vxml','larch5'),('DefaultVoicemailPrompt','I am not at home, please leave a message after the tone','larch5'),('mythvideo.DBSchemaVer','1038',NULL),('VideoStartupDir','/myth/video','larch5'),('VideoArtworkDir','/myth/video_stuff/coverart','larch5'),('Default MythVideo View','2','larch5'),('VideoListUnknownFiletypes','1','larch5'),('VideoBrowserNoDB','1','larch5'),('VideoGalleryNoDB','1','larch5'),('VideoTreeNoDB','1','larch5'),('VideoTreeLoadMetaData','1','larch5'),('VideoNewBrowsable','1','larch5'),('mythvideo.sort_ignores_case','1','larch5'),('mythvideo.db_folder_view','1','larch5'),('mythvideo.VideoTreeRemember','1','larch5'),('mythvideo.ImageCacheSize','50','larch5'),('DVDDeviceLocation','/dev/dvd','larch5'),('VCDDeviceLocation','/dev/cdrom','larch5'),('DVDOnInsertDVD','1','larch5'),('DVDDriveSpeed','2','larch5'),('EnableDVDBookmark','1','larch5'),('DVDBookmarkPrompt','1','larch5'),('DVDBookmarkDays','10','larch5'),('mythvideo.fanartDir','/myth/video_stuff/fanart','larch5'),('mythvideo.screenshotDir','/myth/video_stuff/screenshots','larch5'),('mythvideo.bannerDir','/myth/video_stuff/banners','larch5'),('VideoGalleryColsPerPage','4','larch5'),('VideoGalleryRowsPerPage','3','larch5'),('VideoGallerySubtitle','1','larch5'),('VideoDefaultParentalLevel','4','larch5'),('VideoAggressivePC','0','larch5'),('mythvideo.ParentalLevelFromRating','0','larch5'),('mythvideo.AutoR2PL1','G','larch5'),('mythvideo.AutoR2PL2','PG','larch5'),('mythvideo.AutoR2PL3','PG-13','larch5'),('mythvideo.AutoR2PL4','R:NC-17','larch5'),('VideoDefaultPlayer','Internal','larch5'),('mythdvd.DVDPlayerCommand','Internal','larch5'),('VCDPlayerCommand','mplayer vcd:// -cdrom-device %d -fs -zoom -vo xv','larch5'),('DVDRipLocation','/myth/tmp','larch5'),('TitlePlayCommand','Internal','larch5'),('SubTitleCommand','-sid %s','larch5'),('TranscodeCommand','transcode','larch5'),('MTDPort','2442','larch5'),('MTDNiceLevel','20','larch5'),('MTDConcurrentTranscodes','1','larch5'),('MTDLogFlag','0','larch5'),('MTDac3Flag','0','larch5'),('MTDxvidFlag','1','larch5'),('mythvideo.TrustTranscodeFRDetect','1','larch5'),('WeatherDBSchemaVer','1004',NULL),('TVVidModeRefreshRate','0','larch5'),('TVVidModeRefreshRate0','0','larch5'),('TVVidModeRefreshRate1','0','larch5'),('TVVidModeRefreshRate2','0','larch5'),('GalleryRecursiveSlideshow','1','larch5'),('WebBrowserZoomLevel','20','larch5'),('WebBrowserCommand','Internal','larch5'),('WebBrowserScrollMode','1','larch5'),('WebBrowserScrollSpeed','4','larch5'),('WebBrowserHideScrollbars','0','larch5'),('RepeatMode','all','larch5'),('MusicAutoShowPlayer','1','larch5'),('HOSTOSsize','5','larch5'),('NetworkControlEnabled','1','larch5'),('Hostpluginmytharchive','1','larch5'),('Hostpluginmythbrowser','1','larch5'),('Hostpluginmythcontrols','1','larch5'),('Hostpluginmythflix','1','larch5'),('Hostpluginmythgallery','1','larch5'),('Hostpluginmythgame','1','larch5'),('HostpluginmythgameFceu','1','larch5'),('HostpluginmythgameMame','1','larch5'),('HostpluginmythgameZsnes','1','larch5'),('Hostpluginmythmovietime','1','larch5'),('Hostpluginmythmusic','1','larch5'),('Hostpluginmythnews','1','larch5'),('Hostpluginmythphone','1','larch5'),('Hostpluginmythsmolt','1','larch5'),('Hostpluginmythvideo','1','larch5'),('Hostpluginmythvideo_dvdcss','0','larch5'),('Hostpluginmythweather','1','larch5'),('HostAudiotype','ALSA','larch5'),('HostpluginmythgameZsnes','1','larch5'),('HostpluginmythgameMame','1','larch5'),('Hostpluginmythvideo_dvdcss','0','larch5'),('Hostpluginmythappletrailers','1','larch5'),('Hostpluginmythstream','1','larch5'),('Hostpluginmythvodka','1','larch5'),('HostMiro','1','larch5'),('HostpluginmythgameXE','1','larch5'),('HostpluginmythgameROMDB','1','larch5'),('HostXine','1','larch5'),('HOSTOSsize','5','larch5'),('HostMyhostname','larch5','larch5'),('NetworkControlEnabled','1','larch5'),('Hostaccessuser','1','larch5'),('WOLbackendReconnectWaitTime','5',NULL),('Hostbootsplash','0','larch5'),('HostIPeth0','192.168.1.177','larch5'),('HostNETMASKeth0','/24 255.255.255.0','larch5'),('HostGWeth0','192.168.1.1','larch5'),('HostDNSeth0','192.168.1.1','larch5'),('HostReceiverType','Hauppauge','larch5'),('HostRemoteType','no_remote','larch5'),('HOSTtemplatetype','Do Nothing','larch5'),('BackupDBLastRunStart','2010-11-29 17:02:26',NULL),('BackupDBLastRunEnd','2010-11-29 17:02:27',NULL),('StorageScheduler','Combination',NULL),('DisableAutomaticBackup','0',NULL),('BackendStopCommand','sudo sv stop mythbackend',NULL),('BackendStartCommand','sudo sv start mythbackend',NULL),('UPnP/WMPSource','0',NULL),('UPnP/RebuildDelay','30','larch5'),('GeneratePreviewRemotely','0','larch5'),('HWAccelPlaybackPreview','0','larch5'),('BrowseAllTuners','0','larch5'),('SubtitleCodec','UTF-8','larch5'),('ChannelGroupRememberLast','0','larch5'),('ChannelGroupDefault','-1','larch5'),('BrowseChannelGroup','0','larch5'),('UseFixedWindowSize','1','larch5'),('ScreenShotPath','/myth/video_stuff/screenshots','larch5'),('LircSocket','/var/run/lirc/lircd','larch5'),('BrowserDBSchemaVer','1002',NULL),('CDWriterDevice','default','larch5'),('MusicExitAction','prompt','larch5'),('mythvideo.db_group_view','1','larch5'),('mythvideo.db_group_type','0','larch5'),('MovieListCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -M','larch5'),('MoviePosterCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -P','larch5'),('MovieFanartCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -B','larch5'),('MovieDataCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -D','larch5'),('mythvideo.TrailersDir','/myth/video_stuff/trailers','larch5'),('mythvideo.TrailersRandomEnabled','1','larch5'),('mythvideo.TrailersRandomCount','3','larch5'),('mythvideo.TVListCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -M','larch5'),('mythvideo.TVPosterCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -P','larch5'),('mythvideo.TVFanartCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -F','larch5'),('mythvideo.TVBannerCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -B','larch5'),('mythvideo.TVDataCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -D','larch5'),('mythvideo.TVTitleSubCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -N','larch5'),('mythvideo.TVScreenshotCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -S','larch5'),('mythvideo.EnableAlternatePlayer','1','larch5'),('mythvideo.VideoAlternatePlayer','mplayer -fs -zoom -quiet -vo xv %s','larch5'),('AudioDefaultUpmix','1','larch5'),('AdvancedAudioSettings','0','larch5'),('SRCQualityOverride','0','larch5'),('SRCQuality','1','larch5'),('MusicDefaultUpmix','0','larch5'),('Country','US','larch5'),('OSDSubFont','FreeSans','larch5'),('CommFlagFast','0',NULL),('MultiChannelPCM','0','larch5'),('Audio48kOverride','0','larch5'),('PassThruDeviceOverride','0','larch5'),('MythArchiveM2VRequantiserCmd','M2VRequantiser','larch5'); /*!40000 ALTER TABLE `settings` ENABLE KEYS */; UNLOCK TABLES; -- cgit v0.12 From 42a0236d0dfbeb85f5e5cea46bcbaf6ac44956a8 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Wed, 3 Aug 2011 02:09:15 +0000 Subject: gptfdisk: initial inclusion. Ref #775 & Ref #736 --- abs/extra/gptfdisk/PKGBUILD | 35 ++++++++++++++++++++++++++ abs/extra/gptfdisk/gptfdisk-0.7.2-1.src.tar.gz | 1 + 2 files changed, 36 insertions(+) create mode 100644 abs/extra/gptfdisk/PKGBUILD create mode 120000 abs/extra/gptfdisk/gptfdisk-0.7.2-1.src.tar.gz diff --git a/abs/extra/gptfdisk/PKGBUILD b/abs/extra/gptfdisk/PKGBUILD new file mode 100644 index 0000000..3afe8e3 --- /dev/null +++ b/abs/extra/gptfdisk/PKGBUILD @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Evangelos Foutras +# Contributor: Tobias Powalowski +# Contributor: Hokum + +pkgname=gptfdisk +pkgver=0.7.2 +pkgrel=1 +pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" +arch=('i686' 'x86_64') +url="http://www.rodsbooks.com/gdisk/" +license=('GPL2') +depends=('gcc-libs' 'util-linux' 'popt' 'icu') +provides=("gdisk=$pkgver") +conflicts=('gdisk') +replaces=('gdisk') +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) +md5sums=('31deeb7acb5104d56ba2ddeafd907513') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + make +} + +package () { + cd "$srcdir/$pkgname-$pkgver" + + install -d "$pkgdir"/{sbin,usr/share/{man/man8,gdisk}} + install -t "$pkgdir/sbin" gdisk sgdisk fixparts + install -m644 -t "$pkgdir/usr/share/man/man8" {gdisk,sgdisk}.8 + install -m644 -t "$pkgdir/usr/share/gdisk" README NEWS +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/extra/gptfdisk/gptfdisk-0.7.2-1.src.tar.gz b/abs/extra/gptfdisk/gptfdisk-0.7.2-1.src.tar.gz new file mode 120000 index 0000000..2c17669 --- /dev/null +++ b/abs/extra/gptfdisk/gptfdisk-0.7.2-1.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/gptfdisk-0.7.2-1.src.tar.gz \ No newline at end of file -- cgit v0.12 From 6d33ca9cbcabb9e24dd928aae0f44616d976a1b3 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Wed, 3 Aug 2011 02:10:38 +0000 Subject: parted: Update to latest. Ref #775 & Ref #736 --- abs/core/parted/PKGBUILD | 24 +++++++++++++++--------- abs/core/parted/linux.c.patch | 25 +++++++++++++++++++++++++ abs/core/parted/parted-3.0-3.src.tar.gz | 1 + 3 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 abs/core/parted/linux.c.patch create mode 120000 abs/core/parted/parted-3.0-3.src.tar.gz diff --git a/abs/core/parted/PKGBUILD b/abs/core/parted/PKGBUILD index d166fd8..6bb7ce0 100644 --- a/abs/core/parted/PKGBUILD +++ b/abs/core/parted/PKGBUILD @@ -1,31 +1,37 @@ -# $Id: PKGBUILD 82289 2010-06-10 01:52:54Z andrea $ +# $Id$ # Maintainer: Giovanni Scafora # Contributor: Aaron Griffin pkgname=parted -pkgver=2.3 -pkgrel=1 +pkgver=3.0 +pkgrel=3 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" arch=('i686' 'x86_64') license=('GPL3') url="http://www.gnu.org/software/parted/parted.html" depends=('device-mapper' 'e2fsprogs') +makedepends=('pkgconfig') options=('!libtool') install=${pkgname}.install -source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('30ceb6df7e8681891e865e2fe5a7903d') +source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz" + linux.c.patch) +md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7' + '08c942e212424e238271217f52c59706') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # FS#25307 + patch -Np1 -i ${srcdir}/linux.c.patch + ./configure --prefix=/usr \ --disable-debug \ - --disable-rpath \ - --disable-Werror || return 1 - make || return 1 + --disable-rpath + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + + make DESTDIR="${pkgdir}" install } diff --git a/abs/core/parted/linux.c.patch b/abs/core/parted/linux.c.patch new file mode 100644 index 0000000..c9feea1 --- /dev/null +++ b/abs/core/parted/linux.c.patch @@ -0,0 +1,25 @@ +--- a/libparted/arch/linux.c 2011-05-27 14:52:37.000000000 +0200 ++++ b/libparted/arch/linux.c 2011-07-29 20:25:38.000000000 +0200 +@@ -601,17 +601,17 @@ + static int kver = -1; + + struct utsname uts; +- int major; +- int minor; +- int teeny; ++ int major = 0; ++ int minor = 0; ++ int teeny = 0; + + if (kver != -1) + return kver; + + if (uname (&uts)) + return kver = 0; +- if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3) +- return kver = 0; ++ int n = sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny); ++ assert (n == 2 || n == 3); + + return kver = KERNEL_VERSION (major, minor, teeny); + } diff --git a/abs/core/parted/parted-3.0-3.src.tar.gz b/abs/core/parted/parted-3.0-3.src.tar.gz new file mode 120000 index 0000000..0aea576 --- /dev/null +++ b/abs/core/parted/parted-3.0-3.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/parted-3.0-3.src.tar.gz \ No newline at end of file -- cgit v0.12 From 335c95d040f49b0bca473fd03e4f91340f1966ff Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Wed, 3 Aug 2011 02:34:03 +0000 Subject: pacman: Revert auto run of pacman-db-upgrade as it cannot run while pacman is running. Ref #777 --- abs/core/pacman/PKGBUILD | 2 +- abs/core/pacman/pacman-3.5.3-4.src.tar.gz | 1 + abs/core/pacman/pacman.install | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 120000 abs/core/pacman/pacman-3.5.3-4.src.tar.gz diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD index 79976dc..e25f7a7 100644 --- a/abs/core/pacman/PKGBUILD +++ b/abs/core/pacman/PKGBUILD @@ -3,7 +3,7 @@ pkgname=pacman pkgver=3.5.3 -pkgrel=3 +pkgrel=4 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" diff --git a/abs/core/pacman/pacman-3.5.3-4.src.tar.gz b/abs/core/pacman/pacman-3.5.3-4.src.tar.gz new file mode 120000 index 0000000..1404e78 --- /dev/null +++ b/abs/core/pacman/pacman-3.5.3-4.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/pacman-3.5.3-4.src.tar.gz \ No newline at end of file diff --git a/abs/core/pacman/pacman.install b/abs/core/pacman/pacman.install index 4921fd8..a3066bc 100644 --- a/abs/core/pacman/pacman.install +++ b/abs/core/pacman/pacman.install @@ -21,9 +21,8 @@ post_upgrade() { _warnupgrade() { echo ">>>" echo ">>> The pacman database format has changed as of pacman 3.5.0." - echo ">>> I will now run \`pacman-db-upgrade\`. Please wait..." + echo ">>> You will need to run \`pacman-db-upgrade\` as root." echo ">>>" - /usr/bin/pacman-db-upgrade } _resetbackups() { -- cgit v0.12 From 1b9e65f20bdc2e7445a016865c2542ebe7e74eff Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Wed, 3 Aug 2011 20:50:44 +0000 Subject: js: initial include as dep of gpac. Replaces spidermonkey. --- abs/extra/community/js/PKGBUILD | 39 ++++++++++++++++++++++ abs/extra/community/js/js-1.8.5-3.src.tar.gz | 1 + abs/extra/community/js/js185-destdir.patch | 15 +++++++++ abs/extra/spidermonkey/PKGBUILD | 31 ----------------- .../spidermonkey/spidermonkey-1.7-threadsafe.patch | 16 --------- abs/extra/spidermonkey/spidermonkey-Makefile.patch | 22 ------------ 6 files changed, 55 insertions(+), 69 deletions(-) create mode 100644 abs/extra/community/js/PKGBUILD create mode 120000 abs/extra/community/js/js-1.8.5-3.src.tar.gz create mode 100644 abs/extra/community/js/js185-destdir.patch delete mode 100644 abs/extra/spidermonkey/PKGBUILD delete mode 100644 abs/extra/spidermonkey/spidermonkey-1.7-threadsafe.patch delete mode 100644 abs/extra/spidermonkey/spidermonkey-Makefile.patch diff --git a/abs/extra/community/js/PKGBUILD b/abs/extra/community/js/PKGBUILD new file mode 100644 index 0000000..35db2db --- /dev/null +++ b/abs/extra/community/js/PKGBUILD @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Ionut Biru +pkgname=js +pkgver=1.8.5 +pkgrel=3 +pkgdesc="JavaScript interpreter and libraries" +arch=(i686 x86_64) +url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5" +license=('GPL2') +depends=('nspr' 'gcc-libs') +makedepends=('python2' 'zip') +replaces=('spidermonkey') +conflicts=('spidermonkey') +source=(http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz + js185-destdir.patch) +md5sums=('a4574365938222adca0a6bd33329cb32' + '364834a8391888642c53d78c3a949d94') +build() { + cd "$srcdir/$pkgname-$pkgver/js/src" + + patch -Np0 -i $srcdir/js185-destdir.patch + + ./configure --prefix=/usr --with-system-nspr \ + --enable-threadsafe + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/js/src" + make DESTDIR="$pkgdir" install + + install -m 0755 shell/js ${pkgdir}/usr/bin + + #cleanup + rm -f "${pkgdir}/usr/lib/libmozjs185-1.0.a" +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/extra/community/js/js-1.8.5-3.src.tar.gz b/abs/extra/community/js/js-1.8.5-3.src.tar.gz new file mode 120000 index 0000000..c86d2e3 --- /dev/null +++ b/abs/extra/community/js/js-1.8.5-3.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/js-1.8.5-3.src.tar.gz \ No newline at end of file diff --git a/abs/extra/community/js/js185-destdir.patch b/abs/extra/community/js/js185-destdir.patch new file mode 100644 index 0000000..87b7b53 --- /dev/null +++ b/abs/extra/community/js/js185-destdir.patch @@ -0,0 +1,15 @@ +#https://bugzilla.mozilla.org/show_bug.cgi?id=628723 + +--- Makefile.in.old 2011-04-10 04:21:19.918608008 -0700 ++++ Makefile.in 2011-04-10 04:21:58.088607992 -0700 +@@ -888,8 +888,8 @@ + ifeq (,$(HOST_BIN_SUFFIX)) + mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER) + @[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER) +- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER) +- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER) ++ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER) ++ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER) + endif + endif + ifneq (,$(IMPORT_LIBRARY)) diff --git a/abs/extra/spidermonkey/PKGBUILD b/abs/extra/spidermonkey/PKGBUILD deleted file mode 100644 index e923cbe..0000000 --- a/abs/extra/spidermonkey/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 55903 2009-10-15 23:18:35Z andrea $ -# Contributor: Aaron Griffin - -pkgname=spidermonkey -pkgver=1.7.0 -pkgrel=3 -pkgdesc="Mozilla's C implementation of JavaScript." -arch=("i686" "x86_64") -url="http://www.mozilla.org/js/spidermonkey/" -license=('MPL' 'GPL' 'LGPL') -depends=('nspr') -options=('!makeflags') -source=("http://ftp.mozilla.org/pub/mozilla.org/js/js-$pkgver.tar.gz" \ - "spidermonkey-1.7-threadsafe.patch" "spidermonkey-Makefile.patch") -md5sums=('5571134c3863686b623ebe4e6b1f6fe6' - 'b2ef9be017b6aa1857354b5223975a4f' - '161d4c0f2c604d15cba29dab60b1f7a7') - -build() { - cd "$srcdir/js/src" - patch -p0 < "$srcdir/spidermonkey-Makefile.patch" || return 1 - sed -i 's|include|include/js|' rules.mk || return 1 - # fix for the lib location - [ "$CARCH" = "x86_64" ] && (sed -i -e "s:lib64:lib:g" config.mk || return 1) - # patch Makefile for threadsafe support with native nspr - patch -p2 -i "$srcdir/spidermonkey-1.7-threadsafe.patch" || return 1 - # FS#16673 - export CFLAGS="${CFLAGS} -DJS_C_STRINGS_ARE_UTF8" - # build - threadsafe - make -f Makefile.ref BUILD_OPT=1 JS_THREADSAFE=1 DIST="$pkgdir/usr" all export || return 1 -} diff --git a/abs/extra/spidermonkey/spidermonkey-1.7-threadsafe.patch b/abs/extra/spidermonkey/spidermonkey-1.7-threadsafe.patch deleted file mode 100644 index da6c78d..0000000 --- a/abs/extra/spidermonkey/spidermonkey-1.7-threadsafe.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- js/src/Makefile.ref.orig 2008-05-28 19:51:32.000000000 -0400 -+++ js/src/Makefile.ref 2008-05-28 19:52:17.000000000 -0400 -@@ -63,11 +63,11 @@ - - ifdef JS_THREADSAFE - DEFINES += -DJS_THREADSAFE --INCLUDES += -I$(DIST)/include/nspr -+INCLUDES += -I/usr/include/nspr - ifdef USE_MSVC - OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib - else --OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX) -+OTHER_LIBS += -L/usr/$(LIBDIR)/nspr -lnspr${NSPR_LIBSUFFIX} - endif - endif - diff --git a/abs/extra/spidermonkey/spidermonkey-Makefile.patch b/abs/extra/spidermonkey/spidermonkey-Makefile.patch deleted file mode 100644 index abf1f31..0000000 --- a/abs/extra/spidermonkey/spidermonkey-Makefile.patch +++ /dev/null @@ -1,22 +0,0 @@ -*** Makefile.ref.orig 2009-02-16 09:56:29.000000000 -0600 ---- Makefile.ref 2009-02-16 09:58:59.000000000 -0600 -*************** -*** 169,184 **** ---- 169,185 ---- - jstypes.h \ - jsprvtd.h \ - jspubtd.h \ - jsregexp.h \ - jsscan.h \ - jsscope.h \ - jsscript.h \ - jsstr.h \ -+ jsutil.h \ - jsxdrapi.h \ - jsxml.h \ - $(NULL) - - API_HFILES = \ - jsapi.h \ - jsdbgapi.h \ - $(NULL) -- cgit v0.12 From edb5eaa42980f66e1c660d570d645d661c9072a4 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Wed, 3 Aug 2011 20:51:18 +0000 Subject: gpac: Re-introduction after a hiatus. Used by some ipod transcode scipts. --- abs/extra/community/gpac/PKGBUILD | 44 ++++++++++++++++++++++ abs/extra/community/gpac/gpac-0.4.5-7.src.tar.gz | 1 + .../community/gpac/libpng14-infopp-null.patch | 12 ++++++ 3 files changed, 57 insertions(+) create mode 100644 abs/extra/community/gpac/PKGBUILD create mode 120000 abs/extra/community/gpac/gpac-0.4.5-7.src.tar.gz create mode 100644 abs/extra/community/gpac/libpng14-infopp-null.patch diff --git a/abs/extra/community/gpac/PKGBUILD b/abs/extra/community/gpac/PKGBUILD new file mode 100644 index 0000000..69717e2 --- /dev/null +++ b/abs/extra/community/gpac/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Brad Fanella +# Contributor: niQo +# Contributor: Daniel J Griffiths + +pkgname=gpac +pkgver=0.4.5 +pkgrel=7 +pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" +arch=('i686' 'x86_64') +url="http://gpac.sourceforge.net" +depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'js' 'libmad' \ + 'faad2' 'xvidcore' 'ffmpeg' 'freeglut') +license=('LGPL') +options=('!makeflags') # Multiple build jobs aren't handled correctly +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz + libpng14-infopp-null.patch) +md5sums=('755e8c438a48ebdb13525dd491f5b0d1' + '14d6483c9eb84434aea68596f243e0ca') + +build() { + cd ${srcdir}/${pkgname} + chmod +x configure + sed -i 's|--warn-common||' configure + sed -i 's#osmozilla##g' applications/Makefile + sed -i 's#"$(prefix)#"$(DESTDIR)$(prefix)#' applications/osmo4_wx/Makefile + sed -i 's#ldconfig || true##g' Makefile + + #FS#14506 + sed -i 's#lib64#lib#g' configure + patch -Np1 -i ${srcdir}/libpng14-infopp-null.patch + + # Was getting "symbol lookup error: /usr/lib/gpac/gm_x11_out.so: undefined + # symbol: XvQueryExtension" with our LDFLAGS :\ + unset LDFLAGS + + ./configure --prefix=/usr --mandir=/usr/share/man --use-js=no + make +} + +package() { + cd ${srcdir}/${pkgname} + make DESTDIR=${pkgdir} install install-lib +} diff --git a/abs/extra/community/gpac/gpac-0.4.5-7.src.tar.gz b/abs/extra/community/gpac/gpac-0.4.5-7.src.tar.gz new file mode 120000 index 0000000..9a73c20 --- /dev/null +++ b/abs/extra/community/gpac/gpac-0.4.5-7.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/packages/gpac-0.4.5-7.src.tar.gz \ No newline at end of file diff --git a/abs/extra/community/gpac/libpng14-infopp-null.patch b/abs/extra/community/gpac/libpng14-infopp-null.patch new file mode 100644 index 0000000..b024565 --- /dev/null +++ b/abs/extra/community/gpac/libpng14-infopp-null.patch @@ -0,0 +1,12 @@ +diff -upr gpac.orig/src/media_tools/img.c gpac/src/media_tools/img.c +--- gpac.orig/src/media_tools/img.c 2010-01-24 19:03:28.000000000 +0200 ++++ gpac/src/media_tools/img.c 2010-01-24 19:04:07.000000000 +0200 +@@ -551,7 +551,7 @@ GF_Err gf_img_png_enc(char *data, u32 wi + /* Allocate/initialize the image information data. REQUIRED */ + info_ptr = png_create_info_struct(png_ptr); + if (info_ptr == NULL) { +- png_destroy_write_struct(&png_ptr, png_infopp_NULL); ++ png_destroy_write_struct(&png_ptr, NULL); + return GF_IO_ERR; + } + -- cgit v0.12 From a9c47f145393b31d7f656b14a2952ab6fc6fec58 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 3 Aug 2011 16:50:49 -0500 Subject: local-website: Update for R7. refs #17 --- abs/core/local-website/PKGBUILD | 3 +- abs/core/local-website/htdocs/404.html | 58 +++++++++------ abs/core/local-website/htdocs/index.html | 28 +++----- abs/core/local-website/htdocs/remote/index.html | 93 ++++++++++++++++++++++--- 4 files changed, 133 insertions(+), 49 deletions(-) diff --git a/abs/core/local-website/PKGBUILD b/abs/core/local-website/PKGBUILD index 43a0964..2fd4e1a 100644 --- a/abs/core/local-website/PKGBUILD +++ b/abs/core/local-website/PKGBUILD @@ -1,6 +1,6 @@ pkgname=local-website pkgver=2 -pkgrel=25 +pkgrel=26 pkgdesc="Contents of http://localhost" arch=(i686 x86_64) license=('GPL') @@ -19,3 +19,4 @@ build() } +md5sums=() diff --git a/abs/core/local-website/htdocs/404.html b/abs/core/local-website/htdocs/404.html index 41219b0..d97de98 100755 --- a/abs/core/local-website/htdocs/404.html +++ b/abs/core/local-website/htdocs/404.html @@ -1,25 +1,43 @@ - + - - - LinHES 404 - - -

- Tux with a Remote -

- - - - +
-

The Linux Home Entertainment System Release 6

-

-OOPS
- The page you requested is missing!
+ + LinHES - Page Not Found + + + + + + + + + + + + +

+
+ +
+
+ + + + - - -
+ + +
+ The Linux Home Entertainment System Release 7 +
+
+ +

+ OOPS (404 Error)
+ The page you requested is missing!
+ diff --git a/abs/core/local-website/htdocs/index.html b/abs/core/local-website/htdocs/index.html index 5e6ec81..2a69a64 100755 --- a/abs/core/local-website/htdocs/index.html +++ b/abs/core/local-website/htdocs/index.html @@ -26,7 +26,7 @@

@@ -37,7 +37,7 @@
- The Linux Home Entertainment System Release 6 + The Linux Home Entertainment System Release 7
@@ -46,7 +46,7 @@ + + + + + + - - MythWeb Remote + + + + + -Please click through for the vertical remote control.

-Or click through for the horizontal remote control.
-
-There is now an initial PDA version of the layout
- +
+
+ +
+
+ + + + + +
+ + +
+ The Linux Home Entertainment System Release 7 +
+
+ + + +
+ +
+
    +
  • Remote
    • +
+
+ +
+
+ +
    + Before using one of the remotes you must enable "Network Remote Control interface" in Service Menu -> MythTV Configuration -> Setup -> General -> Remote Control.

    +
  • Vertical Layout
    • +
  • Horizontal Layout
    • +
  • PDA Layout
    • +
+
+
+ +
+ -- cgit v0.12