archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-03-19 00:21:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:archlinuxarm/PKGBUILDs

Browse source
This commit is contained in:
Stephen Oliver 2012-04-19 02:24:32 -04:00
commit a3a6da0e6f
67 changed files with 1658 additions and 815 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
alarm/raspberrypi-firmware/PKGBUILD
View file

@ -2,25 +2,24 @@ plugrel=1
noautobuild=1
pkgname=raspberrypi-firmware
pkgver=20120317
pkgver=20120418
pkgrel=1
pkgdesc="Firmware files for Raspberry Pi"
arch=('any')
url="https://github.com/raspberrypi/firmware"
makedepends=('git')
license=('custom')
provides=('raspberrypi-firmware')
conflicts=()
backup=(boot/{cmdline,config}.txt)
replaces=()
options=(!strip)
source=(config.txt)
md5sums=('0745afd44de4fe969b4ecb8d47d6a1c0')
source=("config.txt" "cmdline.txt")
md5sums=('be71647bac7ae236bd87aed642834cf2'
'ad75576a53e4bbd6bf53003f58f9ef74')
package() {
git clone git://github.com/raspberrypi/firmware.git
rm "${srcdir}"/firmware/boot/kernel.img
cat "${srcdir}"/config.txt > "${srcdir}"/firmware/boot/config.txt
cp -R "${srcdir}"/firmware/{boot,opt} "${pkgdir}"
cat "${srcdir}/config.txt" > "${pkgdir}/boot/config.txt"
cat "${srcdir}/cmdline.txt" > "${pkgdir}/boot/cmdline.txt"
}

1
alarm/raspberrypi-firmware/cmdline.txt Normal file
View file

@ -0,0 +1 @@
dwc_otg.dma_enable=1 dwc_otg.dma_burst_size=256 dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 loglevel=2 smsc95xx.macaddr=08:00:28:00:60:01 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait

3
alarm/raspberrypi-firmware/config.txt
View file

@ -1,3 +1,2 @@
#hdmi_mode=19
arm_freq=800
enable_l2cache=1
#arm_freq=800

15
aur/flexget/PKGBUILD
View file

@ -4,19 +4,20 @@ plugrel=1
pkgname=flexget
_pkgname=FlexGet
pkgver=1.0r2782
pkgrel=2
pkgver=1.0r2791
pkgrel=1
pkgdesc="Automate downloading or processing content (torrents, podcasts, etc.)"
arch=(any)
url="http://flexget.com/"
depends=('python2' 'python2-cherrypy' 'python2-flask' 'python2-progressbar' \
'python2-pynzb' 'pyrss2gen' 'python2-sqlalchemy' 'python-html5lib' \
'python-beautifulsoup' 'python2-yaml' 'python2-feedparser' \
'python2-requests-0.10.0' 'python2-certifi>=0.0.7' 'python2-chardet>=1.0.0')
depends=('python2' 'python2-cherrypy' 'python2-progressbar' \
'python2-pynzb' 'pyrss2gen' 'python2-sqlalchemy' 'python2-html5lib' \
'python-beautifulsoup' 'python2-yaml' 'python2-feedparser'
'python2-flask' 'python2-requests-0.10.0' 'python2-certifi>=0.0.7'
'python2-chardet>=1.0.0' 'python2-dateutil')
makedepends=('python2-distribute')
license=('MIT')
source=("http://download.flexget.com/unstable/${_pkgname}-${pkgver}.tar.gz")
md5sums=('e2091b19f3cc3bc205c32ea5d44a9e9d')
md5sums=('6a786808d0dba17bb6b9e6ad47fbb7a4')
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"

29
aur/libcss-svn/PKGBUILD
View file

@ -1,15 +1,18 @@
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
pkgname=libcss-svn
pkgver=12446
pkgrel=1
plugrel=1
pkgdesc="A CSS parser and selection engine"
arch=('arm' 'i686' 'x86_64')
pkgname=libcss-svn
pkgver=13772
pkgrel=1
pkgdesc="CSS parser and selection engine"
arch=('any')
url="http://www.netsurf-browser.org/projects/libcss/"
license=('MIT')
depends=('libparserutils-svn' 'libwapcaplet-svn')
depends=('libparserutils>=0.1.0' 'libwapcaplet-svn>=13777')
makedepends=('subversion')
provides=('libcss')
provides=('libcss=0.0.3')
conflicts=('libcss')
_svntrunk=svn://svn.netsurf-browser.org/trunk/libcss
_svnmod=libcss
@ -21,16 +24,18 @@ build() {
else
svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
fi
msg "SVN checkout done or server timeout"
cd "$_svnmod"
msg2 "Building..."
sed -i "s/-Werror//g" Makefile
msg2 "Compiling..."
export CFLAGS="-Wno-unused-but-set-variable"
make
make PREFIX="/usr" DESTDIR="$pkgdir/" install
}
package() {
cd "$srcdir/$_svnmod"
make PREFIX="/usr" DESTDIR="$pkgdir/" install
msg2 "Packaging license..."
install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
}

10
aur/libwapcaplet-svn/PKGBUILD
View file

@ -1,10 +1,12 @@
# Contributor: Alexander Rødseth <rodseth@gmail.com>
pkgname=libwapcaplet-svn
pkgver=12163
pkgrel=1
plugrel=1
pkgname=libwapcaplet-svn
pkgver=13777
pkgrel=1
pkgdesc="A string internment library with rapid string comparison"
arch=('arm' 'i686' 'x86_64')
arch=('i686' 'x86_64')
url="http://www.netsurf-browser.org/projects/libwapcaplet/"
license=('MIT')
makedepends=('subversion')

59
aur/lio-utils/PKGBUILD
View file

@ -1,46 +1,63 @@
# Contributor: Johannes Dewender arch at JonnyJD dot net
# Contributor: Kevin Mihelich <kevin@plugapps.com>
plugrel=1
pkgname=lio-utils
pkgver=4.1
pkgrel=3
pkgdesc="A simple low-level configuration tool set for LIO 3 (Target 3 and iSCSI 3)"
arch=('any')
pkgrel=7
epoch=
pkgdesc="a simple low-level configuration tool set for LIO (Target and iSCSI)"
arch=('i686' 'x86_64')
url="http://linux-iscsi.org/wiki/Lio-utils"
license=('AGPL3')
license=('GPL2')
depends=('python2')
makedepends=('net-snmp')
optdepends=('net-snmp')
source=("http://archlinuxarm.org/builder/src/$pkgname-$pkgver.tgz")
md5sums=('25bca4a70abe7041b3eef80f8fbdcad4')
# for binary packages including lio-snmp in this package might be fine
#makedepends=('net-snmp')
#optdepends=("net-snmp: monitor lio with snmp")
provides=()
conflicts=('targetcli-fb')
replaces=()
backup=('etc/target/tcm_start.sh' 'etc/target/lio_start.sh')
options=()
install=
source=(rc-arch.patch)
md5sums=('1afad3e324d0bdde01d0383b482fac5f')
build() {
cd "$srcdir/$pkgname"
find -type f -a -name '*.py' -exec sed -i -e 's|#![ ]*/usr/bin/python$|#!/usr/bin/python2|' {} \;
sed -i 's|python setup.py|python2 setup.py|' Makefile
make SNMP_FEATURE=1
if [ ! -e "$pkgname-$pkgver.tgz" ]; then
wget "http://www.risingtidesystems.com/git/?p=$pkgname.git;a=snapshot;h=595cd43e38ebd19813b91a3db35f3a707d2ba475;sf=tgz" -O "$pkgname-$pkgver.tgz"
fi
bsdtar -xf "$srcdir/$pkgname-$pkgver.tgz"
cd "$srcdir/$pkgname/"
patch -p1 < "$srcdir/rc-arch.patch"
cd "$srcdir/$pkgname/"
cd tcm-py ; python2 setup.py build
cd "$srcdir/$pkgname/"
cd lio-py ; python2 setup.py build
cd "$srcdir/$pkgname/tools"; make
}
package() {
cd "$srcdir/$pkgname"
cd "$srcdir/$pkgname/"
#make DESTDIR="$pkgdir/" initd_install)
install -d $pkgdir/etc/rc.d
install -m 0755 scripts/rc.target $pkgdir/etc/rc.d/target
make DESTDIR="$pkgdir/" conf_install
SITE_PACKAGES=`python2 ./get-py-modules-path.py`
install -d "$pkgdir/usr/sbin"
cd "$srcdir/$pkgname/tcm-py"
python2 setup.py install --skip-build --root="$pkgdir/" --optimize=1
for file in "$pkgdir$SITE_PACKAGES"/tcm_*.py; do
sed -i '1s/python/python2/' "$file"
done
for part in {node,dump,loop,fabric}; do
chmod a+x "$pkgdir$SITE_PACKAGES/tcm_$part.py"
sed -i '1s/python/python2/' "$pkgdir$SITE_PACKAGES/tcm_$part.py"
if [ ! -f "$pkgdir/usr/sbin/tcm_$part" ]; then
ln -s "$SITE_PACKAGES/tcm_$part.py" "$pkgdir/usr/sbin/tcm_$part"
fi
@ -48,9 +65,11 @@ package() {
cd "$srcdir/$pkgname/lio-py"
python2 setup.py install --skip-build --root="$pkgdir/" --optimize=1
for file in "$pkgdir$SITE_PACKAGES"/lio_*.py; do
sed -i '1s/python/python2/' "$file"
done
for part in {dump,node}; do
chmod a+x "$pkgdir$SITE_PACKAGES/lio_$part.py"
sed -i '1s/python/python2/' "$pkgdir$SITE_PACKAGES/lio_$part.py"
if [ ! -f "$pkgdir/usr/sbin/lio_$part" ]; then
ln -s "$SITE_PACKAGES/lio_$part.py" "$pkgdir/usr/sbin/lio_$part"
fi
@ -61,10 +80,6 @@ package() {
cd "$srcdir/$pkgname/tools"
make DESTDIR="$pkgdir/" install
fi
if [ -d "$srcdir/$pkgname/mib-modules" ]; then
cd "$srcdir/$pkgname/mib-modules"
make DESTDIR="$pkgdir/" install
fi
}
# vim:set ts=2 sw=2 et:

149
aur/lio-utils/rc-arch.patch Normal file
View file

@ -0,0 +1,149 @@
diff -aur lio-utils/scripts/rc.target lio-utils.new/scripts/rc.target
--- lio-utils/scripts/rc.target 2011-05-06 23:16:58.000000000 +0200
+++ lio-utils.new/scripts/rc.target 2012-02-29 02:48:36.032877118 +0100
@@ -27,10 +27,13 @@
# Source function library.
#. /etc/init.d/functions
+. /etc/rc.conf
+. /etc/rc.d/functions
#########################################################################
# Our product file definitions
+daemon_name=target
MODNAME="target_core_mod"
TCM_CFS_DIR="/sys/kernel/config/target/core"
@@ -112,11 +115,22 @@
continue
fi
- if [[ $i =~ ".rpmsave" ]]; then
+ # files from arch package manager
+ if [[ $i =~ ".pacsave" ]]; then
+ continue
+ fi
+ if [[ $i =~ ".pacnew" ]]; then
+ continue
+ fi
+ if [[ $i =~ ".pacorig" ]]; then
continue
fi
- if [[ $i =~ ".dpkg-dist" ]]; then
+ # files from the free branch
+ if [[ $i =~ ".json" ]]; then
+ continue
+ fi
+ if [[ $i =~ ".backup" ]]; then
continue
fi
@@ -259,7 +273,7 @@
function shutdown_fabrics() {
- echo -n $"Unloading fabric/configfs: "
+ echo "Unloading fabric/configfs: "
${TCM_FABRIC} --unloadall
RETVAL=$?
if [ $RETVAL == 0 ]; then
@@ -274,7 +288,7 @@
return 0
fi
- echo -n $"Unloading LIO-Target/ConfigFS fabric: "
+ echo "Unloading LIO-Target/ConfigFS fabric: "
${LIO_NODE} --unload
RETVAL=$?
if [ $RETVAL == 0 ]; then
@@ -285,7 +299,10 @@
}
function unload_tcm_mod() {
-
+ if [ ! -d /sys/kernel/config/target/ ]; then
+ return 0
+ fi
+
shutdown_fabrics
shutdown_lio_mod
@@ -446,28 +463,57 @@
case "$1" in
start)
+ stat_busy "Starting LIO targets"
start 0
+ if [ $? != 0 ]; then
+ stat_fail
+ exit 1
+ else
+ add_daemon $daemon_name
+ stat_done
+ fi
;;
startbak)
if [ "$ARGS_COUNT" -ne "$ARGS_CHECK" ]; then
echo "Usage: /etc/init.d/target startbak <DATE_TIME>"
exit 1
fi
+ stat_busy "Starting LIO target backup $2"
start $2
+ if [ $? != 0 ]; then
+ stat_fail
+ exit 1
+ else
+ add_daemon $daemon_name
+ stat_done
+ fi
;;
stop)
+ stat_busy "Stopping LIO targets"
stop 1
+ if [ $? != 0 ]; then
+ stat_fail
+ exit 1
+ else
+ rm_daemon $daemon_name
+ stat_done
+ fi
;;
status)
- tcm_status
- RETVAL=$?
+ stat_busy "Checking status of LIO targets"
+ ck_status $daemon_name
+ # targetcli might have mounted configfs/target
+ if [ -d /sys/kernel/config/target/ ]; then
+ tcm_status
+ fi
;;
restart|reload)
- restart 1
+ $0 stop
+ sleep 3
+ $0 start
;;
*)
- echo $"Usage: $0 {start|startbak|stop|status|restart}"
- exit 1
+ echo "Usage: $0 {start|startbak|stop|status|restart}"
esac
exit $?
diff -aur lio-utils/tcm-py/tcm_node.py lio-utils.new/tcm-py/tcm_node.py
--- lio-utils/tcm-py/tcm_node.py 2011-05-06 23:16:58.000000000 +0200
+++ lio-utils.new/tcm-py/tcm_node.py 2012-02-29 02:48:24.306210014 +0100
@@ -591,7 +591,9 @@
# Unload TCM subsystem plugin modules
for module in ("iblock", "file", "pscsi", "stgt"):
- os.system("rmmod target_core_%s" % module)
+ module_name = "target_core_%s" % module
+ if not os.system("lsmod | grep %s > /dev/null" % module_name):
+ os.system("rmmod %s" % module_name)
# Unload TCM Core
rmmod_op = "rmmod target_core_mod"

47
aur/logmein-hamachi/PKGBUILD
View file

@ -1,47 +0,0 @@
# Contributor: Xavion <Xavion (dot) 0 (at) Gmail (dot) com>
# Contributor: Lauri Niskanen <ape@ape3000.com>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: metzen <metzen@gmail.com>
# Contributor: WarheadsSE <max@warheads.net>
company=logmein
product=hamachi
pkgname=${company}-${product}
pkgver=2.1.0.18
pkgrel=2
plugrel=1
pkgdesc="A zero-configuration VPN service"
arch=("i686" "x86_64" "arm" "armv7")
url="https://secure.${company}.com/UK/products/${product}/"
license=("custom")
conflicts=("${product}")
replaces=("${product}")
install="${pkgname}.install"
options=("!strip")
[ "${CARCH}" == "i686" ] && filearch=x86 && sha1sums=('306e537c2dff541ace8bfbdd69514c12343f53d1')
[ "${CARCH}" == "x86_64" ] && filearch=x64 && sha1sums=('fe5e311b702205a317bd598d8029d03b36d2ffec')
[ "${CARCH}" == "arm" ] && filearch=armel && sha1sums=('98f87e9eb713bfe5605c14e0b8a5fd79371839ce')
[ "${CARCH}" == "armv7" ] && filearch=armel && sha1sums=('98f87e9eb713bfe5605c14e0b8a5fd79371839ce')
source=("https://secure.${company}.com/labs/${pkgname}-${pkgver}-${filearch}.tgz")
package() {
cd "${srcdir}"/${pkgname}-${pkgver}-${filearch}
# Directories
install -d "${pkgdir}"/opt/${pkgname}/bin
install -d "${pkgdir}"/usr/bin "${pkgdir}"/etc/rc.d
install -d "${pkgdir}"/usr/share/licenses/${pkgname}
install -m 755 ${product}d ""${pkgdir}"/opt/${pkgname}/bin"
install -m 755 dnsup ""${pkgdir}"/opt/${pkgname}/bin"
install -m 755 dnsdown ""${pkgdir}"/opt/${pkgname}/bin"
install -m 755 uninstall.sh ""${pkgdir}"/opt/${pkgname}"
install -m 444 README ""${pkgdir}"/opt/${pkgname}"
install -m 444 LICENSE ""${pkgdir}"/opt/${pkgname}"
install -m 444 CHANGES ""${pkgdir}"/opt/${pkgname}"
ln -sf "/opt/${pkgname}/bin/${product}d" ""${pkgdir}"/usr/bin/${product}"
install -m 755 "${startdir}"/${product}-init ""${pkgdir}"/etc/rc.d/${pkgname}"
# License
ln -sf "/opt/${pkgname}/LICENSE" "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
}

122
aur/logmein-hamachi/hamachi-init
View file

@ -1,122 +0,0 @@
#! /bin/bash
### BEGIN INIT INFO
# Provides: logmein-hamachi
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Start/stop logmein-hamachi engine
### END INIT INFO
#
# Author: LogMeIn, Inc. <hamachilinux-feedback@logmein.com>
#
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="LogMeIn Hamachi VPN tunneling engine"
NAME=logmein-hamachi
DAEMON=/opt/logmein-hamachi/bin/hamachid
PID=`pidof -o %PPID $DAEMON`
PIDFILE=/var/run/logmein-hamachi/hamachid.pid
#SCRIPTNAME=/etc/init.d/$NAME
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 5
# Read configuration variable file if it is present
[ -r /etc/default/$NAME ] && . /etc/default/$NAME
# Define LSB log_* functions. Depend on lsb-base (>= 3.0-6)
#. /lib/lsb/init-functions
. /etc/rc.conf
. /etc/rc.d/functions
# start the daemon/service
do_start()
{
# Return
# 0 if daemon has been started
# 1 if daemon was already running
# 2 if daemon could not be started
#start_daemon -p $PIDFILE $DAEMON
/opt/logmein-hamachi/bin/hamachid
return "$?"
}
# stop the daemon/service
do_stop()
{
# Return
# 0 if daemon has been stopped
# 1 if daemon was already stopped
# 2 if daemon could not be stopped
# other if a failure occurred
#stop_daemon $DAEMON
#killproc -p $PIDFILE $DAEMON
[ ! -z "$PID" ] && kill $PID &> /dev/null
RETVAL="$?"
[ "$RETVAL" = 2 ] && return 2
# remove pidfile if daemon could not delete on exit.
rm -f $PIDFILE
return "$RETVAL"
}
case "$1" in
start)
echo -n "Starting $DESC $NAME"
do_start
case "$?" in
0|1) stat_done ; add_daemon logmein-hamachi ;;
*) stat_fail ;;
esac
;;
stop)
echo -n "Stopping $DESC $NAME"
do_stop
case "$?" in
0|1) stat_done ; rm_daemon logmein-hamachi ;;
2) stat_fail ;;
esac
;;
restart|force-reload)
echo -n "Restarting $DESC $NAME"
do_stop
case "$?" in
0|1)
sleep 1
do_start
case "$?" in
0) stat_done ;;
1) stat_fail ;; # Old process is still running
*) stat_fail ;; # Failed to start
esac
;;
*)
# Failed to stop
stat_fail
;;
esac
;;
*)
#log_warning_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
echo "usage: $0 {start|stop|restart}"
exit 3
;;
esac
:

42
aur/logmein-hamachi/logmein-hamachi.install
View file

@ -1,42 +0,0 @@
# LogMeIn-Hamachi: Installer: Arch
# Contributor: Xavion <Xavion (dot) 0 (at) Gmail (dot) com>
# arg 1: the new package version
post_install() {
/etc/rc.d/logmein-hamachi start
echo "To automatically start the LogMeIn Hamachi service when your system boots, add 'logmein-hamachi' to the DAEMONS array of your '/etc/rc.conf'."
echo "To allow a standard user to control LogMeIn Hamachi, add 'Ipc.User <login name>' to '/var/lib/logmein-hamachi/h2-engine-override.cfg' and restart the service."
}
# arg 1: the new package version
# arg 2: the old package version
post_upgrade() {
post_install
}
pre_remove() {
/etc/rc.d/logmein-hamachi stop
#/bin/true
}
user_remove() {
#if [ -n ${SUDO_USER} ]
#then
#ifndef HOME
#HOME = ~$(USER)
# export HOME=/home/${USER}
#endif
#fi
/bin/true
}
post_remove() {
/bin/true
}
op=$1
shift
$op $*

24
aur/mediatomb/PKGBUILD
View file

@ -1,3 +1,4 @@
# Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
# Contributor: Nikhil Bysani <nikron@gmail.com>
# Contributor: Mika Hynnä <igheax@gmail.com>
@ -7,9 +8,9 @@ plugrel=1
pkgname=mediatomb
pkgver=0.12.1
pkgrel=6
pkgrel=7
pkgdesc="Free UPnP/DLNA media server"
arch=('i686' 'x86_64' 'arm')
arch=('i686' 'x86_64')
url="http://mediatomb.cc/"
license=('GPL')
depends=('curl' 'ffmpegthumbnailer' 'js' 'libexif' 'libmp4v2' 'sqlite3' 'taglib')
@ -19,19 +20,22 @@ source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
'mediatomb.rc'
'mediatomb.conf'
'gcc46.patch'
'tonewjs.patch'
'libav_0.7_support.patch')
md5sums=('e927dd5dc52d3cfcebd8ca1af6f0d3c2'
'aa1191ec508d8bd4b3b9a5fe48efc079'
'bec297e4178332a26b42bbde873b94cd'
'0ae34c0d73b76e3d215887834c3c08cf'
'd9e02a9956eecf5ff645bddf6dac0331'
'88144653ff2dc602bcb737f59b2421ce')
'tonewjs.patch'
'jsparse.patch'
'libav_0.7_support.patch')
sha256sums=('31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd'
'1a67a1deb8a41467fe9bbf66358a255f0df97b0170a5fc3d48c1f768c8d328b9'
'ba9753a4a380d4c717c987efec03a3c6d401d3ff93a6fced28098adbd3a44cc9'
'0c02a20032f0c296800b1bb9644638970c2dedbc5ab7141d66a637235e9da6ce'
'2cd8f5628c3a38b290526f008bae351b90211825f86e5959bf95f140748de574'
'd9a3062858900d32b977f0d50d168fd7d36785b6ecc038c019e661e27f7b1c17'
'c6523e8bf5e2da89b7475d6777ef9bffe7d089752ef2f7b27b5e39a4130fb0ff')
build() {
cd "$srcdir/$pkgname-$pkgver"
patch -Np1 -i "$srcdir/gcc46.patch"
patch -Np1 -i "$srcdir/tonewjs.patch"
patch -Np1 -i "$srcdir/jsparse.patch"
patch -Np1 -i "$srcdir/libav_0.7_support.patch"
./configure --prefix=/usr \

144
aur/mediatomb/jsparse.patch Normal file
View file

@ -0,0 +1,144 @@
diff -rup mediatomb-0.12.1/src/scripting/js_functions.cc ../mediatomb-0.12.1/src/scripting/js_functions.cc
--- mediatomb-0.12.1/src/scripting/js_functions.cc 2011-06-29 21:51:13.641025479 -0400
+++ ../mediatomb-0.12.1/src/scripting/js_functions.cc 2011-06-29 21:49:21.071800273 -0400
@@ -51,15 +51,28 @@ extern "C" {
JSBool
js_print(JSContext *cx, uintN argc, jsval *argv)
{
- uintN i;
+ uintN i, j;
JSString *str;
for (i = 0; i < argc; i++)
{
- str = JS_ValueToString(cx, argv[i]);
+ String fmtStr;
+ for (j = 0; j < argc; j++)
+ {
+ if (j == i)
+ fmtStr = fmtStr + "S";
+ else
+ fmtStr = fmtStr + "*";
+ }
+ if(!JS_ConvertArguments(cx, 1, JS_ARGV(cx, argv), fmtStr.c_str(), &str))
+ {
+ log_debug("Could not parse input arguments\n");
+ return JS_TRUE;
+ }
+
if (!str)
return JS_TRUE;
- argv[i] = STRING_TO_JSVAL(str);
+
char * log_str = JS_EncodeString(cx, str);
log_js("%s\n", log_str);
JS_free(cx, log_str);
@@ -116,24 +129,54 @@ js_addCdsObject(JSContext *cx, uintN arg
{
try
{
- jsval arg;
- JSString *str;
- String path;
- String containerclass;
+ // Inputs from native code
+ JSObject *js_cds_obj = NULL;
+ JSString *str = NULL;
+ JSString *cont = NULL;
- JSObject *js_cds_obj;
+ String path = nil;
+ String containerclass = nil;
+
+ JSObject *obj = JS_THIS_OBJECT(cx, argv);
JSObject *js_orig_obj = NULL;
Ref<CdsObject> orig_object;
Ref<StringConverter> p2i;
Ref<StringConverter> i2i;
+ switch (argc)
+ {
+ case 0:
+ log_debug("No input arguments given\n");
+ return JS_FALSE;
+ case 1:
+ if(!JS_ConvertArguments(cx, 1, JS_ARGV(cx, argv), "o", &js_cds_obj))
+ {
+ log_debug("Could not parse input arguments\n");
+ return JS_TRUE;
+ }
+ break;
+ case 2:
+ if(!JS_ConvertArguments(cx, 2, JS_ARGV(cx, argv), "oS", &js_cds_obj, &str))
+ {
+ log_debug("Could not parse input arguments\n");
+ return JS_TRUE;
+ }
+ break;
+ default:
+ if(!JS_ConvertArguments(cx, 3, JS_ARGV(cx, argv), "oSS", &js_cds_obj, &str, &cont))
+ {
+ log_debug("Could not parse input arguments\n");
+ return JS_TRUE;
+ }
+ break;
+ }
- Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
+ Script *self = (Script *)JS_GetPrivate(cx, obj);
if (self == NULL)
{
log_debug("Could not retrieve class instance from global object\n");
- return JS_FALSE;
+ return JS_TRUE;
}
if (self->whoami() == S_PLAYLIST)
@@ -144,23 +187,14 @@ js_addCdsObject(JSContext *cx, uintN arg
{
i2i = StringConverter::i2i();
}
-
- arg = argv[0];
- if (!JSVAL_IS_OBJECT(arg))
- return JS_TRUE;
- if (!JS_ValueToObject(cx, arg, &js_cds_obj))
- return JS_TRUE;
- // root it
- argv[0] = OBJECT_TO_JSVAL(js_cds_obj);
- str = JS_ValueToString(cx, argv[1]);
if (!str)
path = _("/");
else
path = JS_EncodeString(cx, str);
- JSString *cont = JS_ValueToString(cx, argv[2]);
+
if (cont)
{
containerclass = JS_EncodeString(cx, cont);
@@ -169,9 +203,9 @@ js_addCdsObject(JSContext *cx, uintN arg
}
if (self->whoami() == S_PLAYLIST)
- js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("playlist"));
+ js_orig_obj = self->getObjectProperty(obj, _("playlist"));
else if (self->whoami() == S_IMPORT)
- js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("orig"));
+ js_orig_obj = self->getObjectProperty(obj, _("orig"));
if (js_orig_obj == NULL)
{
@@ -179,9 +213,6 @@ js_addCdsObject(JSContext *cx, uintN arg
return JS_TRUE;
}
- // root it
- argv[1] = OBJECT_TO_JSVAL(js_orig_obj);
-
orig_object = self->jsObject2cdsObject(js_orig_obj, self->getProcessedObject());
if (orig_object == nil)
return JS_TRUE;

20
aur/mt-daapd/PKGBUILD
View file

@ -2,35 +2,37 @@
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com>
# Plugbox changes: Added LDFLAGS="" to make it build
plugrel=1
pkgname=mt-daapd
pkgver=0.2.4.2
pkgrel=6
pkgrel=7
pkgdesc="A multi-threaded DAAP server compatible with iTunes music sharing"
url="http://www.mt-daapd.org/"
license=("LGPL")
arch=('i686' 'x86_64')
backup=(etc/mt-daapd/mt-daapd.conf)
depends=('libid3tag' 'gdbm' 'avahi')
makedepends=('automake' 'autoconf' 'patch')
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz \
mt-daapd)
md5sums=('67bef9fb14d487693b0dfb792c3f1b05'
'26cf6ff799ef06d262a8648d6890a250')
LDFLAGS=""
mt-daapd fix-libs.patch)
build() {
cd "$srcdir/$pkgname-$pkgver"
sed -i 's|DEFAULT_CONFIGFILE "/etc/mt-daapd.conf"|DEFAULT_CONFIGFILE "/etc/mt-daapd/mt-daapd.conf"|' src/main.c
patch configure.in < "$srcdir/fix-libs.patch"
aclocal
automake --add-missing
autoreconf
./configure --prefix=/usr --sysconfdir=/etc/mt-daapd --enable-avahi --enable-mdns
make
make
make DESTDIR="$pkgdir" install
install -D -m644 $srcdir/$pkgname-$pkgver/contrib/mt-daapd.playlist $pkgdir/etc/mt-daapd/sample.playlist && \
install -D -m644 $srcdir/$pkgname-$pkgver/contrib/mt-daapd.conf $pkgdir/etc/mt-daapd/mt-daapd.conf && \
install -D -m755 $srcdir/mt-daapd $pkgdir/etc/rc.d/mt-daapd
}
md5sums=('67bef9fb14d487693b0dfb792c3f1b05'
'26cf6ff799ef06d262a8648d6890a250'
'59896e760486a51170d8b0e7ed5a2506')

195
aur/mt-daapd/fix-libs.patch Normal file
View file

@ -0,0 +1,195 @@
*** mt-daapd-0.2.4.2/configure.in 2008-04-19 15:31:30.000000000 -0400
--- mt-daapd-0.2.4.2.new/configure.in 2011-05-01 20:56:15.204853627 -0400
***************
*** 20,27 ****
CPPFLAGS="${CPPFLAGS} -g"
dnl fix freebsd's broken (?) libpthread
! AC_CHECK_LIB(c_r,pthread_creat,LDFLAGS="${LDFLAGS} -lc_r", [
! AC_CHECK_LIB(pthread,pthread_create,LDFLAGS="${LDFLAGS} -lpthread") ])
AC_ARG_ENABLE(debug,[ --enable-debug Enable debugging features],
CPPFLAGS="${CPPFLAGS} -Wall")
--- 20,27 ----
CPPFLAGS="${CPPFLAGS} -g"
dnl fix freebsd's broken (?) libpthread
! AC_CHECK_LIB(c_r,pthread_creat,LIBS="${LIBS} -lc_r", [
! AC_CHECK_LIB(pthread,pthread_create,LIBS="${LIBS} -lpthread") ])
AC_ARG_ENABLE(debug,[ --enable-debug Enable debugging features],
CPPFLAGS="${CPPFLAGS} -Wall")
***************
*** 35,47 ****
esac ])
AC_ARG_ENABLE(efence,[ --enable-efence Enable electric fence],
! LDFLAGS="${LDFLAGS} -lefence")
AC_ARG_ENABLE(nslu2,[ --enable-nslu2 Build for NSLU2/uNSLUng],
CFLAGS="${CFLAGS} -DNSLU2")
AC_ARG_ENABLE(howl,[ --enable-howl Use howl 0.9.2 or later],
[ case "${enableval}" in
! yes) rend_howl=true; rend_posix=false; rend_avahi=false; LDFLAGS="${LDFLAGS} -lhowl";
CPPFLAGS="${CPPFLAGS} -DWITH_HOWL";;
no) rend_howl=false;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-howl);;
--- 35,47 ----
esac ])
AC_ARG_ENABLE(efence,[ --enable-efence Enable electric fence],
! LIBS="${LIBS} -lefence")
AC_ARG_ENABLE(nslu2,[ --enable-nslu2 Build for NSLU2/uNSLUng],
CFLAGS="${CFLAGS} -DNSLU2")
AC_ARG_ENABLE(howl,[ --enable-howl Use howl 0.9.2 or later],
[ case "${enableval}" in
! yes) rend_howl=true; rend_posix=false; rend_avahi=false; LIBS="${LIBS} -lhowl";
CPPFLAGS="${CPPFLAGS} -DWITH_HOWL";;
no) rend_howl=false;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-howl);;
***************
*** 50,56 ****
AC_ARG_ENABLE(avahi,[ --enable-avahi Use avahi 0.6 or later],
[ case "${enableval}" in
yes) PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ]);
! rend_avahi=true; rend_howl=false; rend_posix=false; LDFLAGS="${LDFLAGS} $AVAHI_LIBS";
CPPFLAGS="${CPPFLAGS} $AVAHI_CFLAGS -DWITH_AVAHI";;
no) rend_avahi=false;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-avahi);;
--- 50,56 ----
AC_ARG_ENABLE(avahi,[ --enable-avahi Use avahi 0.6 or later],
[ case "${enableval}" in
yes) PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ]);
! rend_avahi=true; rend_howl=false; rend_posix=false; LIBS="${LIBS} $AVAHI_LIBS";
CPPFLAGS="${CPPFLAGS} $AVAHI_CFLAGS -DWITH_AVAHI";;
no) rend_avahi=false;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-avahi);;
***************
*** 58,65 ****
AC_ARG_ENABLE(oggvorbis,[ --enable-oggvorbis Enable Ogg/Vorbis support],
use_oggvorbis=true;
! # LDFLAGS="${LDFLAGS} -logg -lvorbis";
! CPPFLAGS="${CPPFLAGS} -DOGGVORBIS")
AM_CONDITIONAL(COND_REND_HOWL, test x$rend_howl = xtrue)
AM_CONDITIONAL(COND_REND_AVAHI, test x$rend_avahi = xtrue)
--- 58,65 ----
AC_ARG_ENABLE(oggvorbis,[ --enable-oggvorbis Enable Ogg/Vorbis support],
use_oggvorbis=true;
! # LIBS="${LIBS} -logg -lvorbis";
! CPPFLAGS="${LIBS} -DOGGVORBIS")
AM_CONDITIONAL(COND_REND_HOWL, test x$rend_howl = xtrue)
AM_CONDITIONAL(COND_REND_AVAHI, test x$rend_avahi = xtrue)
***************
*** 82,88 ****
CPPFLAGS="$CPPFLAGS -DNOT_HAVE_SA_LEN -D_XPG4_2"
CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME"
CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
! LDFLAGS="$LDFLAGS -lnsl -lsocket";;
*freebsd*)
CPPFLAGS="$CPPFLAGS -DFREEBSD";;
*linux*)
--- 82,88 ----
CPPFLAGS="$CPPFLAGS -DNOT_HAVE_SA_LEN -D_XPG4_2"
CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME"
CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
! LIBS="$LIBS -lnsl -lsocket";;
*freebsd*)
CPPFLAGS="$CPPFLAGS -DFREEBSD";;
*linux*)
***************
*** 154,163 ****
AC_CHECK_LIB(gdbm,gdbm_open,echo "Have gdbm", echo "Must have gdbm";exit)
if test "$STATIC_LIBS" != "no"; then
! LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libgdbm.a"
echo "Adding static libgdbm"
else
! LDFLAGS="${LDFLAGS} -lgdbm"
echo "Adding dynamic libgdbm"
fi
--- 154,163 ----
AC_CHECK_LIB(gdbm,gdbm_open,echo "Have gdbm", echo "Must have gdbm";exit)
if test "$STATIC_LIBS" != "no"; then
! LIBS="${LIBS} ${STATIC_LIBS}/libgdbm.a"
echo "Adding static libgdbm"
else
! LIBS="${LIBS} -lgdbm"
echo "Adding dynamic libgdbm"
fi
***************
*** 170,179 ****
AC_CHECK_LIB(id3tag,id3_file_open,echo "Have id3tag",echo "Must have libid3tag";exit)
if test "$STATIC_LIBS" != "no"; then
! LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libid3tag.a -lz"
echo "Adding static libid3tag"
else
! LDFLAGS="${LDFLAGS} -lid3tag -lz"
echo "Adding dynamic libid3tag"
fi
CFLAGS=$oldcflags
--- 170,179 ----
AC_CHECK_LIB(id3tag,id3_file_open,echo "Have id3tag",echo "Must have libid3tag";exit)
if test "$STATIC_LIBS" != "no"; then
! LIBS="${LIBS} ${STATIC_LIBS}/libid3tag.a -lz"
echo "Adding static libid3tag"
else
! LIBS="${LIBS} -lid3tag -lz"
echo "Adding dynamic libid3tag"
fi
CFLAGS=$oldcflags
***************
*** 184,193 ****
AC_CHECK_LIB(ogg,ogg_sync_init,echo "Have ogg",echo "Must have libogg for Ogg/Vorbis support";exit)
if test x"$STATIC_LIBS" != x"no"; then
! LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libogg.a"
echo "Adding static libogg"
else
! LDFLAGS="${LDFLAGS} -logg"
echo "Adding dynamic libogg"
fi
--- 184,193 ----
AC_CHECK_LIB(ogg,ogg_sync_init,echo "Have ogg",echo "Must have libogg for Ogg/Vorbis support";exit)
if test x"$STATIC_LIBS" != x"no"; then
! LIBS="${LIBS} ${STATIC_LIBS}/libogg.a"
echo "Adding static libogg"
else
! LIBS="${LIBS} -logg"
echo "Adding dynamic libogg"
fi
***************
*** 196,205 ****
AC_CHECK_LIB(vorbis,vorbis_info_init,echo "Have vorbis",echo "Must have libvorbis for Ogg/Vorbis support";exit)
if test x"$STATIC_LIBS" != x"no"; then
! LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libvorbis.a"
echo "Adding static libvorbis"
else
! LDFLAGS="${LDFLAGS} -lvorbis"
echo "Adding dynamic libvorbis"
fi
fi
--- 196,205 ----
AC_CHECK_LIB(vorbis,vorbis_info_init,echo "Have vorbis",echo "Must have libvorbis for Ogg/Vorbis support";exit)
if test x"$STATIC_LIBS" != x"no"; then
! LIBS="${LIBS} ${STATIC_LIBS}/libvorbis.a"
echo "Adding static libvorbis"
else
! LIBS="${LIBS} -lvorbis"
echo "Adding dynamic libvorbis"
fi
fi

100
aur/netatalk/PKGBUILD
View file

@ -1,51 +1,71 @@
# Maintainer: Andrea Crotti <mail andrea dot crotti dot 0 at gmail dot com>
# Maintainer: SJ_UnderWater
# Based on netatalk package :
# Maintainer: Dominik Dingel <mail at wodar dot de>
# Contributor: William Udovich <nerdzrule7 at earthlink dot net>
# Contributor: Farhan Yousaf <farhany at xaviya dot com>
plugrel=1
pkgname=netatalk
pkgbase=netatalk
pkgname=('netatalk' 'netatalk-ddp')
pkgver=2.2.2
pkgrel=0
pkgdesc="A kernel level implementation of the AppleTalk Protocol Suite"
pkgrel=3
pkgdesc='A kernel-level implementation of AppleTalk, AFP, and PAP services'
arch=('i686' 'x86_64')
url="http://netatalk.sourceforge.net"
options=('!libtool')
license=("GPL")
url='http://netatalk.sourceforge.net'
license=('GPL')
depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3')
conflicts=('netatalk-ddp')
replaces=('netatalk-git' 'netatalk2')
backup=('etc/netatalk/afpd.conf'
'etc/netatalk/netatalk.conf'
'etc/netatalk/atalkd.conf'
'etc/netatalk/papd.conf'
'etc/netatalk/AppleVolumes.default'
'etc/netatalk/AppleVolumes.system')
depends=('libcups' 'pam' 'coreutils>=7.1-2' 'db')
optdepends=('avahi' 'tcp_wrappers' 'openssl' 'libgcrypt')
makedepends=('make' 'patch' 'gcc')
source=(http://voxel.dl.sourceforge.net/project/netatalk/netatalk/$pkgver/netatalk-$pkgver.tar.bz2 \
afpd atalkd papd cnid afpd.service)
install=netatalk.install
md5sums=('bd42b686ec7209d9ab47bd8e2e2431c4'
'16ab9fa50ec4abde6de478fc7de57805'
'2d05de4a16faf7d4af21b5f14e33fa82'
'b16a687c96dd1ca7ffefd7c995356c0d'
'e21ef8051269583764e68d00683691bb'
'9b6b2fee54fe052bba0c69f00d335bdb')
'etc/netatalk/netatalk.conf'
'etc/netatalk/AppleVolumes.default'
'etc/netatalk/AppleVolumes.system')
options=('!libtool')
install=$pkgname.install
changelog=$pkgname.changelog
source=(a2boot afpd atalkd cnid_metad netatalk papd timelord \
http://hivelocity.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
md5sums=('747f0f3870fc0472fff5d502acd83fda'
'3b936b466b00a479aadb32df60960538'
'14dd9d43125eec9be438e4474b271ff0'
'1eb353a1e0581f9d764826a2f2d9b6f2'
'c89d35e5ea67edfd08ebfccb306f6c47'
'd8fa2b290cac33b4de77a7b69ef03db9'
'80299f81b0413329479073fe02e85de5'
'bd42b686ec7209d9ab47bd8e2e2431c4')
_options='--disable-ddp --disable-srvloc --disable-timelord --disable-cups --disable-a2boot'
build() {
cd $startdir/src/netatalk-$pkgver
./configure --prefix=/usr --with-ssl-dir=/usr --localstatedir=/var --enable-fhs --enable-zeroconf=/usr --disable-srvloc --with-cnid-cdb-backend --enable-ddp
make || return 1
make DESTDIR=$startdir/pkg install
mv $startdir/pkg/usr/include/netatalk{,2}
install -d $startdir/pkg/etc/rc.d
install -m755 ../{afpd,atalkd,papd,cnid} $startdir/pkg/etc/rc.d
install -d $startdir/pkg/etc/avahi/services
install -m744 ../afpd.service $startdir/pkg/etc/avahi/services
rm -f $startdir/pkg/usr/share/man/man1/timeout.1{,.gz}
if [ "$pkgname" = "netatalk-ddp" ];then build_netatalk-ddp;fi
cd "$srcdir"/$pkgbase-$pkgver
msg2 'Configuring...'
CFLAGS="-Wno-unused-result" ./configure --prefix=/usr --localstatedir=/var --libexecdir='${libdir}' \
--with-cracklib --with-cnid-cdb-backend --enable-fhs $_options
msg2 'Making...'
make >/dev/null
echo $pkgname >made
}
build_netatalk-ddp() {
depends=('openslp' 'libcups' 'libgcrypt>=1.2.3')
resolve_deps ${depends[@]}
optdepends+=('cups: required for PAP support')
conflicts=('netatalk')
_options=`echo $_options | sed s/disable/enable/g`
}
package_netatalk() {
package_netatalk-ddp
rm "$pkgdir"/usr/share/man/man8/timelord.8 "$pkgdir"/etc/rc.d/{a2boot,atalkd,papd,timelord}
rmdir "$pkgdir"/usr/share/man/man3 "$pkgdir"/usr/share/man/man4
}
package_netatalk-ddp() {
cd "$srcdir"/$pkgbase-$pkgver
if [ -f made ];then rm made;else continue;fi
msg2 'Building...'
make DESTDIR="$pkgdir" install >/dev/null
msg2 'Copying initscripts...'
install -d "$pkgdir"/etc/rc.d
install -m755 "$srcdir"/{a2boot,atalkd,afpd,cnid_metad,netatalk,papd,timelord} "$pkgdir"/etc/rc.d
msg2 'Removing extraneous files...'
rm -r "$pkgdir"/usr/include "$pkgdir"/usr/share/aclocal
}

53
aur/netatalk/a2boot Normal file
View file

@ -0,0 +1,53 @@
#!/bin/bash
. /etc/rc.conf
. /etc/rc.d/functions
NAME="Apple II Boot Daemon"
ARGS=
DEPENDS=atalkd
REQUIRED=
DAEMON=`basename "$0"`
[ -r /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON
PID=`get_pid $DAEMON`
get_pid_r() {
local pid=()
for i in $@
do j=`get_pid $i` || return 1;pid+=($j);done
echo ${pid[@]};
}
case "$1" in
start)
stat_busy "Starting $NAME"
[ `get_pid_r $DEPENDS` ] && [ -z "$PID" ] && $DAEMON $ARGS &>/dev/null
if [ $? = 0 ]; then
stat_done
else
stat_fail
if [ ! `get_pid_r $DEPENDS` ];then echo "Error: \"$DAEMON\" refusing to start, dependency \"$DEPENDS\" not met" >&2;fi
exit 1
fi
;;
stop)
stat_busy "Stopping $NAME"
[ ! `get_pid_r $REQUIRED` ] && [ -n "$PID" ] && kill $PID &>/dev/null
if [ $? = 0 ]; then
stat_done
else
stat_fail
if [ `get_pid_r $REQUIRED` ];then echo "Error: Dependency \"$REQUIRED\" requires \"$DAEMON\", stop it first" >&2;fi
exit 1
fi
;;
restart)
$0 stop
sleep 1
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
esac

81
aur/netatalk/afpd
View file

@ -3,36 +3,51 @@
. /etc/rc.conf
. /etc/rc.d/functions
PID=$(pidof -o %PPID /usr/sbin/afpd)
case $1 in
start)
stat_busy "Starting afpd Daemon"
[ -z "$PID" ] && /usr/sbin/afpd
if [ $? -gt 0 ]; then
stat_fail
else
PID=$(pidof -o %PPID /usr/sbin/afpd)
echo "$PID" > /var/run/afpd.pid
add_daemon afpd
stat_done
fi
;;
stop)
stat_busy "Stopping afpd Daemon"
[ ! -z "$PID" ] && kill "$PID" &> /dev/null
if [ $? -gt 0 ]; then
stat_fail
else
rm_daemon afpd
stat_done
fi
;;
restart)
$0 stop
sleep 1
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
esac
exit 0
NAME="Apple Filing Protocol Daemon"
ARGS=
DEPENDS=cnid_metad
REQUIRED=
DAEMON=`basename "$0"`
[ -r /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON
PID=`get_pid $DAEMON`
get_pid_r() {
local pid=()
for i in $@
do j=`get_pid $i` || return 1;pid+=($j);done
echo ${pid[@]};
}
case "$1" in
start)
stat_busy "Starting $NAME"
[ `get_pid_r $DEPENDS` ] && [ -z "$PID" ] && $DAEMON $ARGS &>/dev/null
if [ $? = 0 ]; then
stat_done
else
stat_fail
if [ ! `get_pid_r $DEPENDS` ];then echo "Error: \"$DAEMON\" refusing to start, dependency \"$DEPENDS\" not met" >&2;fi
exit 1
fi
;;
stop)
stat_busy "Stopping $NAME"
[ ! `get_pid_r $REQUIRED` ] && [ -n "$PID" ] && kill $PID &>/dev/null
if [ $? = 0 ]; then
stat_done
else
stat_fail
if [ `get_pid_r $REQUIRED` ];then echo "Error: Dependency \"$REQUIRED\" requires \"$DAEMON\", stop it first" >&2;fi
exit 1
fi
;;
restart)
$0 stop
sleep 1
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
esac

14
aur/netatalk/afpd.service
View file

@ -1,14 +0,0 @@
<?xml version="1.0" standalone='no'?>
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
<service-group>
<name replace-wildcards="yes">%h</name>
<service>
<type>_afpovertcp._tcp</type>
<port>548</port>
</service>
<service>
<type>_device-info._tcp</type>
<port>0</port>
<txt-record>model=Xserve</txt-record>
</service>
</service-group>

81
aur/netatalk/atalkd
View file

@ -3,40 +3,51 @@
. /etc/rc.conf
. /etc/rc.d/functions
myhostname=`hostname|sed 's/\..*$//'`
NAME="AppleTalk Protocol Daemon"
ARGS=
DEPENDS=init
REQUIRED="a2boot papd timelord"
DAEMON=`basename "$0"`
[ -r /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON
PID=`get_pid $DAEMON`
get_pid_r() {
local pid=()
for i in $@
do j=`get_pid $i` || return 1;pid+=($j);done
echo ${pid[@]};
}
PID=`pidof -o %PPID /usr/sbin/atalkd`
case "$1" in
start)
stat_busy "Starting atalkd Daemon"
[ -z "$PID" ] && /usr/sbin/atalkd
if [ $? -gt 0 ]; then
stat_fail
else
echo $PID > /var/run/atalkd.pid
# Setting AppleTalk info with nbprgstr
add_daemon atalkd
stat_done
fi
;;
stop)
stat_busy "Stopping atalkd Daemon"
[ ! -z "$PID" ] && kill $PID &> /dev/null
if [ $? -gt 0 ]; then
stat_fail
else
rm /var/run/atalkd.pid
rm_daemon atalkd
stat_done
fi
;;
restart)
$0 stop
sleep 1
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
esac
exit 0
start)
stat_busy "Starting $NAME"
[ `get_pid_r $DEPENDS` ] && [ -z "$PID" ] && $DAEMON $ARGS &>/dev/null
if [ $? = 0 ]; then
stat_done
else
stat_fail
if [ ! `get_pid_r $DEPENDS` ];then echo "Error: \"$DAEMON\" refusing to start, dependency \"$DEPENDS\" not met" >&2;fi
exit 1
fi
;;
stop)
stat_busy "Stopping $NAME"
[ ! `get_pid_r $REQUIRED` ] && [ -n "$PID" ] && kill $PID &>/dev/null
if [ $? = 0 ]; then
stat_done
else
stat_fail
if [ `get_pid_r $REQUIRED` ];then echo "Error: Dependency \"$REQUIRED\" requires \"$DAEMON\", stop it first" >&2;fi
exit 1
fi
;;
restart)
$0 stop
sleep 1
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
esac

39
aur/netatalk/cnid
View file

@ -1,39 +0,0 @@
#!/bin/bash
. /etc/rc.conf
. /etc/rc.d/functions
PID=$(pidof -o %PPID /usr/sbin/cnid_metad)
case "$1" in
start)
stat_busy "Starting cnid Daemon"
[ -z "$PID" ] && /usr/sbin/cnid_metad
if [ $? -gt 0 ]; then
stat_fail
else
PID=$(pidof -o %PPID /usr/sbin/cnid_metad)
echo "$PID" > /var/run/cnid.pid
add_daemon cnid
stat_done
fi
;;
stop)
stat_busy "Stopping cnid Daemon"
[ ! -z "$PID" ] && kill "$PID" &> /dev/null
if [ $? -gt 0 ]; then
stat_fail
else
rm_daemon cnid
rm /var/run/cnid.pid
stat_done
fi
;;
restart)
$0 stop
sleep 1
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
esac
exit 0

53
aur/netatalk/cnid_metad Normal file
View file

@ -0,0 +1,53 @@
#!/bin/bash
. /etc/rc.conf
. /etc/rc.d/functions
NAME="CNID Meta-Daemon"
ARGS=
DEPENDS=init
REQUIRED=afpd
DAEMON=`basename "$0"`
[ -r /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON
PID=`get_pid $DAEMON`
get_pid_r() {
local pid=()
for i in $@
do j=`get_pid $i` || return 1;pid+=($j);done
echo ${pid[@]};
}
case "$1" in
start)
stat_busy "Starting $NAME"
[ `get_pid_r $DEPENDS` ] && [ -z "$PID" ] && $DAEMON $ARGS &>/dev/null
if [ $? = 0 ]; then
stat_done
else
stat_fail
if [ ! `get_pid_r $DEPENDS` ];then echo "Error: \"$DAEMON\" refusing to start, dependency \"$DEPENDS\" not met" >&2;fi
exit 1
fi
;;
stop)
stat_busy "Stopping $NAME"
[ ! `get_pid_r $REQUIRED` ] && [ -n "$PID" ] && kill $PID &>/dev/null
if [ $? = 0 ]; then
stat_done
else
stat_fail
if [ `get_pid_r $REQUIRED` ];then echo "Error: Dependency \"$REQUIRED\" requires \"$DAEMON\", stop it first" >&2;fi
exit 1
fi
;;
restart)
$0 stop
sleep 1
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
esac

42
aur/netatalk/netatalk Normal file
View file

@ -0,0 +1,42 @@
#!/bin/bash
. /etc/rc.conf
. /etc/rc.d/functions
NAME="NetATalk Meta-Daemon"
DAEMON=`basename "$0"`
RUNNING=()
STOPPED=()
[ -r /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON
for i in atalkd papd timelord a2boot cnid_metad afpd
do
if [ `type -p $i` ]; then if [ `get_pid $i` ]; then RUNNING+=($i); else STOPPED+=($i); fi; fi
done
case "$1" in
start)
STARTING=''; rc.d start ${STOPPED[@]}
if [ $? = 0 ]; then
add_daemon $DAEMON
else
exit 1
fi
;;
stop)
for ((i=${#RUNNING[@]}-1; i>=0; i--));do rc.d stop ${RUNNING[$i]}; done
if [ $? = 0 ]; then
rm_daemon $DAEMON
else
exit 1
fi
;;
restart)
$0 stop
sleep 1
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
esac

21
aur/netatalk/netatalk.changelog Normal file
View file

@ -0,0 +1,21 @@
2012-04-08 SJ_UnderWater
* 2.2.2-3 :
fixed extra dependencies
FHS compliance
NAMCAP checking
moved cups to optdepends
2012-04-07 SJ_UnderWater
* 2.2.2-2 :
added Install
changed "conflicts" with "replace"
cleaned up PKGBUILD
* 2.2.2-1 :
added ChangeLog.
moved to split package format
bidirectional dependency-checking
moved to release package format
PKGBUILD compliance

18
aur/netatalk/netatalk.install
View file

@ -1,2 +1,16 @@
To configure shares, please edit /etc/netatalk/AppleVolumes.default.
To run as a daemon, add afpd to MODULES line in /etc/rc.conf
post_install() {
post_upgrade
}
post_upgrade() {
if [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
echo '>>> Detected old netatalk daemon entries in';
echo '>>> /etc/rc.conf, please replace these with';
echo '>>> "netatalk" before restarting!';
else echo '>>> Add "netatalk" to your DAEMONS list in /etc/rc.conf';fi
echo '>>>';
if [ -f /etc/avahi/services/adisk.service ] ||
[ -f /etc/avahi/services/afpd.service ];then
echo '>>> Detected old netatalk service files in';
echo '>>> /etc/avahi/services, please delete these';
echo '>>> before restarting!';fi
}

79
aur/netatalk/papd
View file

@ -3,36 +3,51 @@
. /etc/rc.conf
. /etc/rc.d/functions
PID=`pidof -o %PPID /usr/sbin/papd`
NAME="AppleTalk Printer Daemon"
ARGS=
DEPENDS=atalkd
REQUIRED=
DAEMON=`basename "$0"`
[ -r /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON
PID=`get_pid $DAEMON`
get_pid_r() {
local pid=()
for i in $@
do j=`get_pid $i` || return 1;pid+=($j);done
echo ${pid[@]};
}
case "$1" in
start)
stat_busy "Starting papd Daemon"
[ -z "$PID" ] && /usr/sbin/papd
if [ $? -gt 0 ]; then
stat_fail
else
echo $PID > /var/run/papd.pid
add_daemon papd
stat_done
fi
;;
stop)
stat_busy "Stopping papd Daemon"
[ ! -z "$PID" ] && kill $PID &> /dev/null
if [ $? -gt 0 ]; then
stat_fail
else
rm /var/run/papd.pid
rm_daemon papd
stat_done
fi
;;
restart)
$0 stop
sleep 1
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
esac
exit 0
start)
stat_busy "Starting $NAME"
[ `get_pid_r $DEPENDS` ] && [ -z "$PID" ] && $DAEMON $ARGS &>/dev/null
if [ $? = 0 ]; then
stat_done
else
stat_fail
if [ ! `get_pid_r $DEPENDS` ];then echo "Error: \"$DAEMON\" refusing to start, dependency \"$DEPENDS\" not met" >&2;fi
exit 1
fi
;;
stop)
stat_busy "Stopping $NAME"
[ ! `get_pid_r $REQUIRED` ] && [ -n "$PID" ] && kill $PID &>/dev/null
if [ $? = 0 ]; then
stat_done
else
stat_fail
if [ `get_pid_r $REQUIRED` ];then echo "Error: Dependency \"$REQUIRED\" requires \"$DAEMON\", stop it first" >&2;fi
exit 1
fi
;;
restart)
$0 stop
sleep 1
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
esac

53
aur/netatalk/timelord Normal file
View file

@ -0,0 +1,53 @@
#!/bin/bash
. /etc/rc.conf
. /etc/rc.d/functions
NAME="AppleTalk Time Daemon"
ARGS=
DEPENDS=atalkd
REQUIRED=
DAEMON=`basename "$0"`
[ -r /etc/conf.d/$DAEMON ] && . /etc/conf.d/$DAEMON
PID=`get_pid $DAEMON`
get_pid_r() {
local pid=()
for i in $@
do j=`get_pid $i` || return 1;pid+=($j);done
echo ${pid[@]};
}
case "$1" in
start)
stat_busy "Starting $NAME"
[ `get_pid_r $DEPENDS` ] && [ -z "$PID" ] && $DAEMON $ARGS &>/dev/null
if [ $? = 0 ]; then
stat_done
else
stat_fail
if [ ! `get_pid_r $DEPENDS` ];then echo "Error: \"$DAEMON\" refusing to start, dependency \"$DEPENDS\" not met" >&2;fi
exit 1
fi
;;
stop)
stat_busy "Stopping $NAME"
[ ! `get_pid_r $REQUIRED` ] && [ -n "$PID" ] && kill $PID &>/dev/null
if [ $? = 0 ]; then
stat_done
else
stat_fail
if [ `get_pid_r $REQUIRED` ];then echo "Error: Dependency \"$REQUIRED\" requires \"$DAEMON\", stop it first" >&2;fi
exit 1
fi
;;
restart)
$0 stop
sleep 1
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
esac

27
aur/owncloud/PKGBUILD
View file

@ -1,37 +1,38 @@
# Maintainer: A Rojas <nqn1976 @ gmail.com>
# Maintainer: Antonio Rojas <nqn1976 @ gmail.com>
# Based on owncloud-git PKGBUILD by Alexander Ovsyannikov
plugrel=1
pkgname=owncloud
pkgver=3.0.0
pkgver=3.0.2
pkgrel=1
pkgdesc="A cloud server to store your files centrally on a hardware controlled by you"
arch=('i686' 'x86_64')
arch=('any')
url="http://owncloud.org/"
license=('GPL')
depends=('php-apache' 'php-sqlite')
depends=('php-apache' 'php-gd')
optdepends=("php-sqlite: to use the SQLite database backend" "mysql: to use the MySQL database backend")
makedepends=()
source=("http://owncloud.org/releases/${pkgname}-${pkgver}.tar.bz2" 'owncloud.conf')
source=("http://owncloud.org/releases/$pkgname-$pkgver.tar.bz2" 'owncloud.conf')
install=owncloud.install
md5sums=('0a48bf2b1ac10c11c4b7f6fd1de9a5d9'
md5sums=('25945bb7167767a71c7e9302d42355a5'
'b22b1f45421a13b772dd0b7617e62c83')
# build()
package() {
# install README file
install -o root -g root -d ${pkgdir}/usr/share/doc/${pkgname}
mv ${srcdir}/${pkgname}/README ${pkgdir}/usr/share/doc/${pkgname}/
install -o root -g root -d $pkgdir/usr/share/doc/$pkgname
mv $srcdir/$pkgname/README $pkgdir/usr/share/doc/$pkgname/
# install project
install -d -o http -g http ${pkgdir}/srv/http
cp -a ${srcdir}/${pkgname} ${pkgdir}/srv/http/
chown -R http:http ${pkgdir}/srv/http/*
install -d -o http -g http $pkgdir/srv/http
cp -a $srcdir/$pkgname $pkgdir/srv/http/
chown -R http:http $pkgdir/srv/http/*
# install apache .conf file
install -d -o root -g root ${pkgdir}/etc/httpd/conf/extra
install -o root -g root -m 644 ${srcdir}/owncloud.conf ${pkgdir}/etc/httpd/conf/extra/
install -d -o root -g root $pkgdir/etc/httpd/conf/extra
install -o root -g root -m 644 $srcdir/owncloud.conf $pkgdir/etc/httpd/conf/extra/
}

3
aur/owncloud/owncloud.install
View file

@ -6,6 +6,7 @@ post_install() {
echo "LoadModule php5_module modules/libphp5.so"
echo "Include conf/extra/php5_module.conf"
echo
echo "Uncomment extensions_sqlite.so sqlite.so sqlite3.so xmlrpc.so zip.so"
echo "Uncomment extensions xmlrpc.so zip.so gd.so"
echo "and either sqlite.so sqlite3.so (for the SQLite backend) or mysql.so mysqli.so (for the MySQL backend)"
echo "in /etc/php/php.ini"
}

4
aur/pianobar/PKGBUILD
View file

@ -1,12 +1,10 @@
# Maintainer: Mitch Bigelow <ipha00@gmail.com>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - add gnutls depend
plugrel=1
pkgname=pianobar
pkgver=2012.01.10
pkgrel=1
pkgrel=2
pkgdesc="console-based frontend for Pandora (official version)"
url="http://6xq.net/0017"
arch=('i686' 'x86_64')

4
aur/python2-cheetah/PKGBUILD
View file

@ -7,12 +7,12 @@ plugrel=1
pkgname=python2-cheetah
pkgver=2.4.4
pkgrel=4
pkgrel=5
pkgdesc="A Python-powered template engine and code generator"
arch=(i686 x86_64)
url="http://www.cheetahtemplate.org"
license=(custom)
depends=(python2 python-markdown)
depends=(python2 python2-markdown)
makedepends=(python2-distribute)
optdepends=('python2-pygments: for the CodeHighlighter filter')
provides=(cheetah python-cheetah)

6
aur/python2-ipaddr/PKGBUILD
View file

@ -4,8 +4,8 @@ plugrel=1
pkgname=python2-ipaddr
_realpkgname=ipaddr
pkgver=2.1.9
pkgrel=2
pkgver=2.1.10
pkgrel=1
pkgdesc="An IPv4/IPv6 manipulation library in Python"
arch=('any')
url="http://code.google.com/p/ipaddr-py/"
@ -13,7 +13,7 @@ license=('APACHE')
depends=('python2')
makedepends=('python2-distribute')
source=("http://ipaddr-py.googlecode.com/files/${_realpkgname}-${pkgver}.tar.gz")
md5sums=('c8943c95fdf0d7d99bc26b484e1bbd99')
md5sums=('f315ac829218e9735c5d772d59a3e0e7')
build() {
cd "${srcdir}/${_realpkgname}-${pkgver}"

28
aur/python2-pynzb/LICENSE.txt
View file

@ -1,28 +0,0 @@
Copyright (c) 2009, Eric Florenzano
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
* Neither the name of the author nor the names of other
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

4
aur/python2-pynzb/PKGBUILD
View file

@ -5,13 +5,13 @@ plugrel=1
pkgshort=pynzb
pkgname=python2-$pkgshort
pkgver=0.1.0
pkgrel=1
pkgrel=2
pkgdesc="A unified API for parsing NZB files"
arch=('any')
url="http://pypi.python.org/pypi/pynzb/"
license=('BSD')
depends=('python2' 'expat')
makedepends=('setuptools')
makedepends=('python2-distribute')
conflicts=('pynzb')
optdepends=('python-lxml: Use lxml instead of expat')
source=(http://pypi.python.org/packages/source/p/$pkgshort/$pkgshort-$pkgver.tar.gz

27
aur/python2-rtslib/PKGBUILD
View file

@ -1,27 +1,34 @@
# Contributor: Johannes Dewender arch at JonnyJD dot net
# Contributor: Kevin Mihelich <kevin@plugapps.com>
plugrel=1
pkgname=python2-rtslib
_pkgname=rtslib
pkgver=2.1
pkgrel=2
pkgrel=3
epoch=
pkgdesc="RisingTide Systems generic SCSI target API in python"
arch=('any')
url="http://www.risingtidesystems.com/git/?p=rtslib.git;a=summary"
license=('AGPL3')
depends=('python2-ipaddr' 'python2-netifaces' 'python-configobj')
source=("http://archlinuxarm.org/builder/src/$_pkgname-$pkgver.tgz"
'gz-modules.patch')
md5sums=('144863bf1e74e60fa66794950d28edde'
'c0cf6b8ca9c2f12f701e99c011d2ba03')
depends=('python2-ipaddr' 'python-netifaces' 'python-configobj')
provides=()
conflicts=()
backup=()
options=()
install=
source=('gz-modules-upstream.patch')
md5sums=('4add05b9cbd12258dc993f19728fbafe')
_pkgname=rtslib
build() {
cd "$srcdir"
patch -p0 < gz-modules.patch
if [ ! -e "$_pkgname-$pkgver.tgz" ]; then
wget "http://www.risingtidesystems.com/git/?p=$_pkgname.git;a=snapshot;h=c4ba14ff21f68e56d6a3a227a0220d1a6b6df958;sf=tgz" -O "$_pkgname-$pkgver.tgz"
fi
bsdtar -xf "$srcdir/$_pkgname-$pkgver.tgz"
cd "$srcdir/$_pkgname"
patch -p1 < ../gz-modules-upstream.patch
python2 setup.py build
}

31
aur/python2-rtslib/gz-modules-upstream.patch Normal file
View file

@ -0,0 +1,31 @@
commit ee65af95e71018c1727825752b31ec55f608e323
Author: Jerome Martin <jxm@risingtidesystems.com>
Date: Tue Nov 1 11:39:16 2011 +0100
Added gzipped kernel fabric modules support.
* Now looks for any module name no matter what the file extension is, i.e.
*.ko.gz not just *.ko on the filesystem.
* Reported by Arch Linux user "Johannes Dewender" <arch@jonnyjd.net>
diff --git a/rtslib/utils.py b/rtslib/utils.py
index 17156fb..5c778f5 100644
--- a/rtslib/utils.py
+++ b/rtslib/utils.py
@@ -604,8 +604,14 @@ def list_available_kernel_modules():
'''
kver = os.uname()[2]
depfile = "/lib/modules/%s/modules.dep" % kver
- return [module.split(".")[0] for module in
- re.findall(r"[a-zA-Z0-9_-]+\.ko:", fread(depfile))]
+ handle = open(depfile)
+ try:
+ lines = handle.readlines()
+ finally:
+ handle.close()
+
+ return [os.path.basename(line.partition(":")[0]).partition(".")[0]
+ for line in lines]
def list_loaded_kernel_modules():
'''

14
aur/python2-rtslib/gz-modules.patch
View file

@ -1,14 +0,0 @@
also find gzipped modules
--- rtslib/rtslib/utils.py 2011-10-06 00:46:09.000000000 +0200
+++ rtslib/rtslib/utils.py 2011-10-06 01:36:26.000000000 +0200
@@ -604,8 +604,8 @@
'''
kver = os.uname()[2]
depfile = "/lib/modules/%s/modules.dep" % kver
- return [module.split(".")[0] for module in
- re.findall(r"[a-zA-Z0-9_-]+\.ko:", fread(depfile))]
+ return [module[0] for module in
+ re.findall(r"([a-zA-Z0-9_-]+)\.ko(.gz)?:", fread(depfile))]
def list_loaded_kernel_modules():
'''

11
aur/python2-yenc/PKGBUILD
View file

@ -5,9 +5,8 @@
plugrel=1
pkgname=python2-yenc
_pkgname="dual75-yenc"
pkgver=0.4.0
pkgrel=1
pkgrel=3
pkgdesc="yEnc encoding/decoding module for python2"
url="http://www.golug.it/yenc.html"
arch=('i686' 'x86_64')
@ -17,15 +16,15 @@ conflicts=("python-yenc")
replaces=("python-yenc")
#source=("http://www.golug.it/pub/yenc/${_pkgname}-${pkgver}.tar.gz")
source=("https://bitbucket.org/dual75/yenc/get/${pkgver}.tar.bz2")
md5sums=('b6605653c353073d814dafa66451d00d')
source=("http://bitbucket.org/dual75/yenc/get/${pkgver}.tar.bz2")
md5sums=('60e1a535b0e0c865c2cc4e7ddf18d9a4')
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
cd "${srcdir}/dual75-yenc-ee6b73a5b14f"
python2 setup.py build
}
package() {
cd "${srcdir}/${_pkgname}-${pkgver}"
cd "${srcdir}/dual75-yenc-ee6b73a5b14f"
python2 setup.py install --root="${pkgdir}" --optimize=1
}

6
aur/uwsgi/PKGBUILD
View file

@ -4,7 +4,7 @@
plugrel=1
pkgname=uwsgi
pkgver=1.0.4
pkgver=1.1.2
pkgrel=1
pkgdesc="a fast (pure C), self-healing, developer-friendly WSGI server"
arch=(i686 x86_64)
@ -18,14 +18,14 @@ source=(http://projects.unbit.it/downloads/$pkgname-$pkgver.tar.gz
uwsgid.sh
uwsgi.ini
uwsgid.conf)
md5sums=('559c8d1fa8274fb45437c277c0c7f121'
md5sums=('69d2a89e283a047c750dde858a384e25'
'3dd03dce734b50910b3a5e12da0fc062'
'495afaafac6da631a859ab72c5983c36'
'5db37c7dbfd432623883d125d7127fbf')
build() {
cd $srcdir/$pkgname-$pkgver
CFLAGS='' make -f Makefile.Py27
python2 uwsgiconfig.py --build
}
package() {

4
aur/yaourt/PKGBUILD
View file

@ -5,7 +5,7 @@ plugrel=1
pkgname=yaourt
pkgver=1.0.1
pkgrel=1
pkgrel=2
pkgdesc="A pacman wrapper with extended features and AUR support"
arch=('any')
url="http://www.archlinux.fr/yaourt-en/"
@ -25,7 +25,7 @@ build() {
package() {
cd $srcdir/$pkgname-$pkgver/
make PREFIX=/usr sysconfdir=/etc localstatedir=/var DESTDIR=$pkgdir install
make INSTALL=/usr/bin/install PREFIX=/usr sysconfdir=/etc localstatedir=/var DESTDIR=$pkgdir install
}
# vim:set ts=2 sw=2 et:

71
community/mythtv/PKGBUILD
View file

@ -1,4 +1,4 @@
# $Id$
# $Id: PKGBUILD 69261 2012-04-11 06:53:15Z jconder $
# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
@ -12,60 +12,58 @@
plugrel=1
pkgname=mythtv
pkgver=0.24.2
pkgrel=3
pkgver=0.25
pkgrel=2
epoch=1
pkgdesc="A Homebrew PVR project"
arch=('i686' 'x86_64')
url="http://www.mythtv.org/"
license=('GPL')
depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libxinerama'
'libxvmc' 'libxxf86vm' 'lirc-utils' 'mesa' 'mysql-clients'
'mysql-python' 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp'
'python2-lxml' 'wget' 'qtwebkit')
makedepends=('yasm')
optdepends=('xmltv: to download tv listings')
depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883'
'libpulse' 'libva' 'libxinerama' 'lirc-utils' 'mesa'
'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6'
'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber'
'x264')
makedepends=('glew' 'libcec' 'libxml2' 'openssl' 'yasm')
optdepends=('glew: for GPU commercial flagging'
'libcec: for consumer electronics control capabilities'
'libxml2: to read blu-ray metadata'
'openssl: for AirTunes (RAOP) support'
'xmltv: to download tv listings')
conflicts=('myththemes')
replaces=('myththemes')
backup=('etc/conf.d/mythbackend')
install='mythtv.install'
source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
'mythtv_0.25_gcc_4.7.patch'
'mythbackend.rc'
'mythbackend.conf')
md5sums=('7259fd24560da77da90b1494492f9550'
'feadcc9ad064d93d6dceab1efc0bd9ed'
'bb8e4033d82428d827570fae9ba15e6a')
md5sums=('e49c81de40e279c83dcb1b2aa9a45748'
'6090f5f22a8584db80b76cf19869ee41'
'62fd98347c56b1d9b795792f83269d25'
'1f72db0586f97a7c3fd3155dfa9a6c6f')
build() {
cd "$srcdir/$pkgname-$pkgver"
find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
#patch -Np1 -i "$srcdir/mythtv_0.25_gcc_4.7.patch"
[[ $CARCH == "arm" ]] && ARCH="armv5te"
[[ $CARCH == "armv7" ]] && ARCH="armv7-a"
./configure --prefix=/usr --cpu="$ARCH" \
./configure --prefix=/usr \
--cpu="$ARCH" \
--disable-mmx \
--enable-audio-oss \
--enable-audio-alsa \
--disable-audio-jack \
--enable-audio-pulse \
--disable-altivec \
--disable-distcc \
--disable-ccache \
--disable-vdpau \
--enable-dvb \
--dvb-path=/usr/include \
--enable-lirc \
--enable-joystick-menu \
--enable-v4l \
--enable-ivtv \
--enable-xvmc \
--enable-xvmcw \
--enable-xvmc-vld \
--enable-firewire \
--enable-opengl-vsync \
--enable-xrandr \
--enable-xv \
--enable-x11 \
--with-bindings=perl,python \
--python=python2
--disable-altivec \
--disable-audio-jack \
--disable-ccache \
--disable-distcc \
--enable-libfftw3 \
--enable-libmp3lame \
--enable-libx264 \
--enable-vaapi \
--python=python2
make
}
@ -79,4 +77,5 @@ package() {
mkdir -p "$pkgdir/usr/share/mythtv"
cp -R 'contrib' "$pkgdir/usr/share/mythtv"
mkdir -p "$pkgdir/var/log/mythtv"
}

47
community/mythtv/mythbackend.conf
View file

@ -1,10 +1,3 @@
#!/bin/bash
#
# Rename this file to:
#
# /etc/config.d/mythbackend
#
###############################################################################
#
# Copyright (c) by the MythTV Development Team.
#
@ -32,21 +25,7 @@
#
###############################################################################
#
# Config variables for the mythbackend startup script, which is usually
# located in /etc/rc.d/mythbackend
#
# When the startup script is executed, it sources this file if it exists,
# otherwise it will fall back on default values.
#
# Leave variables commented out to use default values in init script
# (/etc/rc.d/mythbackend).
#
# To override defaults, uncomment the relevant variable definition and
# edit as required.
#
#
# User who should start the mythbackend processes
# User who should start the mythbackend process
#
# Running mythbackend as non-root requires you to ensure that audio/video
# devices used for recording have suitable user permissions. One way
@ -59,32 +38,14 @@
# MBE_USER='root'
#
# Directory holding the mythbackend binary (empty means autodetect).
# Startup options for mythbackend (see 'mythbackend --help' for a list).
#
# MBE_DIR=''
#
# Name of mythbackend binary.
#
# MBE_PROG='mythbackend'
#
# Other startup options for mythbackend (see 'mythbackend --help' for a list).
#
# MBE_OPTIONS=''
# MBE_OPTS=''
#
# Directory holding the mythbackend log file
#
# LOG_DIR='/var/log/mythtv'
#
# Name of mythbackend log file.
#
# NOTE: If you are running as non-root take care to ensure the mythbackend user
# has permission to write to this log file.
#
# LOG_FILE='mythbackend.log'
# LOG_PATH='/var/log/mythtv'
#
# Logging options for mythbackend (see 'mythbackend -v help' for a list)

105
community/mythtv/mythbackend.rc
View file

@ -2,81 +2,72 @@
. /etc/rc.conf
. /etc/rc.d/functions
. /etc/profile
###############################################################################
# Default values to use if none are supplied in the config file.
# Running mythbackend as non-root requires you to ensure that audio/video
# devices used for recording have suitable user permissions. One way
# to achieve this is to modify existing or create new udev rules which
# assign these devices to a non-root group with rw permissions and add
# your mythbackend user to that group. Be aware that console.perms can
# also affect device permissions and may need additional configuration.
# Running as non-root may also introduce increased process latency.
#
# User who should start the mythbackend processes
# User who should start the mythbackend process
MBE_USER='root'
# Startup options for mythbackend
MBE_OPTIONS=''
MBE_OPTS=''
# Name of mythbackend log file
LOG_FILE='/var/log/mythbackend.log'
# Directory holding the mythbackend log file
LOG_PATH='/var/log/mythtv'
# Logging options for mythbackend (empty means '-v important,general')
# Logging options for mythbackend
LOG_OPTS=''
###############################################################################
CONFIG_FILE=/etc/conf.d/mythbackend
PIDFILE=/var/run/mythbackend.pid
if [[ -f ${CONFIG_FILE} ]]; then
. ${CONFIG_FILE}
if [[ -r "$CONFIG_FILE" ]]; then
. "$CONFIG_FILE"
fi
pid="$(cat ${PIDFILE} 2>/dev/null || pidof mythbackend)";
# fix FS#11890
mbe_user_home="$(getent passwd ${MBE_USER}|cut -d : -f 6)"
PID="$(cat "$PIDFILE" 2> /dev/null || pidof mythbackend)"
export HOME="$(getent passwd "$MBE_USER" | cut -d : -f 6)"
case "$1" in
start)
stat_busy "Starting MythTV Backend"
start)
stat_busy "Starting MythTV Backend"
# already running ?
if [[ "${pid}" -gt 0 ]] && kill -0 "${pid}"; then
stat_fail
exit 1;
fi
touch ${PIDFILE} ${LOG_FILE}
chown "$MBE_USER" ${PIDFILE} ${LOG_FILE}
if su "$MBE_USER" -c "HOME=${mbe_user_home} mythbackend \
--daemon \
--logfile $LOG_FILE $LOG_OPTS \
--pidfile ${PIDFILE} $MBE_OPTIONS";
then
add_daemon mythbackend
stat_done
else
stat_fail
fi
;;
stop)
stat_busy "Stopping MythTV Backend"
if [[ "${pid}" -gt 0 ]] && kill $pid &>/dev/null; then
rm_daemon mythbackend
stat_done
rm ${PIDFILE} 2>/dev/null
else
stat_fail
fi
;;
restart)
$0 stop
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
if [[ "$PID" -gt 0 ]] && kill -0 "$PID"; then
stat_fail
exit 0
fi
touch "$PIDFILE"
chown "$MBE_USER" "$PIDFILE" "$LOG_PATH"
MBE_CMD="/usr/bin/mythbackend --daemon \
--logpath "$LOG_PATH" $LOG_OPTS \
--pidfile "$PIDFILE" $MBE_OPTS"
if su "$MBE_USER" -c "$MBE_CMD"; then
add_daemon mythbackend
stat_done
else
stat_fail
fi
;;
stop)
stat_busy "Stopping MythTV Backend"
if [[ "$PID" -gt 0 ]] && kill "$PID" &> /dev/null; then
rm_daemon mythbackend
stat_done
rm -f "$PIDFILE"
else
stat_fail
fi
;;
restart)
"$0" stop
"$0" start
;;
*)
echo "usage: $0 (start|stop|restart)"
;;
esac
exit 0

107
community/mythtv/mythtv_0.25_gcc_4.7.patch Normal file
View file

@ -0,0 +1,107 @@
*** a/libs/libmythbase/compat.h 2012-03-31 20:52:30.430461503 -0400
--- b/libs/libmythbase/compat.h 2012-03-31 20:59:05.935585911 -0400
***************
*** 44,49 ****
--- 44,51 ----
# include <sys/resource.h> // for setpriority
# include <sys/socket.h>
# include <sys/wait.h> // For WIFEXITED on Mac OS X
+ # include <stdio.h> // for snprintf(), used by inline dlerror()
+ # include <unistd.h> // for usleep()
#endif
#ifdef USING_MINGW
*** a/libs/libmyth/rssparse.h 2012-03-31 20:52:30.427453729 -0400
--- b/libs/libmyth/rssparse.h 2012-03-31 21:51:11.687438044 -0400
***************
*** 13,18 ****
--- 13,19 ----
#include <QPair>
#include <QMap>
#include <QVariant>
+ #include <sys/types.h>
#include "mythexp.h"
*** a/libs/libmythtv/audioinput.h 2012-03-31 22:41:55.626923063 -0400
--- b/libs/libmythtv/audioinput.h 2012-03-31 22:41:22.478248297 -0400
***************
*** 22,27 ****
--- 22,28 ----
#define _AUDIOINPUT_H_
#include <QString>
+ #include <unistd.h>
class AudioInput
{
*** a/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c 2012-03-31 20:52:29.923150437 -0400
--- b/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c 2012-03-31 21:58:48.422270780 -0400
***************
*** 398,404 ****
"2: \n\t"\
\
: "+a"(src), "+c"(dst)\
! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
: "memory"\
);\
src += 4-(h+5)*srcStride;\
--- 398,404 ----
"2: \n\t"\
\
: "+a"(src), "+c"(dst)\
! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
: "memory"\
);\
src += 4-(h+5)*srcStride;\
***************
*** 446,452 ****
QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
"2: \n\t"\
: "+a"(src)\
! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\
: "memory"\
);\
tmp += 4;\
--- 446,452 ----
QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
"2: \n\t"\
: "+a"(src)\
! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\
: "memory"\
);\
tmp += 4;\
***************
*** 823,829 ****
"2: \n\t"\
\
: "+a"(src), "+c"(dst)\
! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
: XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
"%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
"memory"\
--- 823,829 ----
"2: \n\t"\
\
: "+a"(src), "+c"(dst)\
! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
: XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
"%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
"memory"\
***************
*** 878,884 ****
QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
"2: \n\t"
: "+a"(src)
! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)
: XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
"%xmm4", "%xmm5", "%xmm6", "%xmm7",)
"memory"
--- 878,884 ----
QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
"2: \n\t"
: "+a"(src)
! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)
: XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
"%xmm4", "%xmm5", "%xmm6", "%xmm7",)
"memory"

7
community/nodejs/PKGBUILD
View file

@ -6,10 +6,11 @@
# Contributor: TIanyi Cui <tianyicui@gmail.com>
# Contributor: Jason Plum <max@warheads.net>
plugrel=1
pkgname=nodejs
pkgver=0.6.14
pkgrel=1
plugrel=3
pkgver=0.6.15
pkgrel=1.1
pkgdesc='Evented I/O for V8 javascript'
arch=('i686' 'x86_64' 'arm')
url='http://nodejs.org/'

6
community/v8/PKGBUILD
View file

@ -3,7 +3,7 @@
# Contributor: tocer <tocer.deng@gmail.com>
pkgname=v8
pkgver=3.6.6.24
pkgver=3.9.9
pkgrel=1
plugrel=1
pkgdesc='A fast and modern javascript engine'
@ -41,8 +41,6 @@ fi
install -Dm755 d8 "${pkgdir}/usr/bin/d8"
install -Dm755 libv8.so "${pkgdir}/usr/lib/libv8.so"
# install license
install -d ${pkgdir}/usr/share/licenses/v8
install -m644 LICENSE* \
${pkgdir}/usr/share/licenses/v8
install -m644 LICENSE* ${pkgdir}/usr/share/licenses/v8
}

46
core/gawk/PKGBUILD
View file

@ -1,46 +0,0 @@
# $Id: PKGBUILD 142109 2011-11-05 10:13:54Z tpowa $
# Maintainer:
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - rebuild for libsigsegv, remove when bumped upstream
plugrel=1
pkgname=gawk
pkgver=4.0.0
pkgrel=2.1
pkgdesc="GNU version of awk"
arch=('i686' 'x86_64')
url="http://www.gnu.org/directory/GNU/gawk.html"
license=('GPL')
groups=('base')
depends=('sh' 'glibc')
provides=('awk')
install=gawk.install
source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
md5sums=('51e417b71287629940051e6f652c6492')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr --libexecdir=/usr/lib
make
}
check() {
cd ${srcdir}/${pkgname}-${pkgver}
make -j1 check
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
install -dm755 ${pkgdir}/bin
mv ${pkgdir}/usr/bin/gawk* ${pkgdir}/bin/
ln -sf gawk ${pkgdir}/bin/awk
ln -sf /bin/gawk ${pkgdir}/usr/bin/
}

22
core/gawk/gawk.install
View file

@ -1,22 +0,0 @@
infodir=usr/share/info
filelist=(gawk.info.gz gawkinet.info.gz)
post_install() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
install-info $infodir/$file $infodir/dir 2> /dev/null
done
}
post_upgrade() {
post_install $1
}
pre_remove() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
install-info --delete $infodir/$file $infodir/dir 2> /dev/null
done
}
# vim:set ts=2 sw=2 et:

2
core/linux-raspberrypi/PKGBUILD
View file

@ -9,7 +9,7 @@ pkgname=('linux-raspberrypi' 'linux-headers-raspberrypi')
_kernelname=${pkgname#linux}
_basekernel=3.1
pkgver=${_basekernel}.9
pkgrel=10
pkgrel=11
arch=('arm')
url="http://www.kernel.org/"
license=('GPL2')

6
core/linux/PKGBUILD
View file

@ -10,7 +10,7 @@ pkgname=('linux' 'linux-headers')
_kernelname=${pkgname#linux}
_basekernel=3.1
pkgver=${_basekernel}.10
pkgrel=7
pkgrel=8
cryptover=1.4
arch=('arm')
url="http://www.kernel.org/"
@ -32,14 +32,14 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
"http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz")
md5sums=('8d43453f8159b2332ad410b19d86a931'
'a8e1c25a93a685ec2a1c3a808715fe9d'
'e114a524448aee5be540331654a4a18b'
'6cbe87056f5b821470afb5b1dd4e4403'
'f5d3635da03cb45904bedd69b47133de'
'3f64ed9d71499fe9293dc671f4e4087e'
'29628745258df910abfb8cb24ca3ccd9'
'c9e6e8bb0774a89f7f9bd30a13be7532'
'55b04499a4578e586cf5a4d0b69fc5aa'
'e3cd152f2bed3fc34036115c5541a707'
'5edbe368407db0e5d305a08cfaaafabd'
'60d351d9833470d35765c75c5ba97359'
'9d3c56a4b999c8bfbd4018089a62f662'
'd00814b57448895e65fbbc800e8a58ba'
'7b0ac1c0a88d8fbe7316db02f21666e6')

6
core/linux/archlinuxarm.patch
View file

@ -157,7 +157,7 @@ diff -urN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
+ kirkwood_mpp_conf(goflexhome_mpp_config);
+
+ kirkwood_uart0_init();
+ kirkwood_nand_init(ARRAY_AND_SIZE(goflexhome_nand_parts), 25);
+ kirkwood_nand_init(ARRAY_AND_SIZE(goflexhome_nand_parts), 40);
+
+ if (gpio_request(29, "USB Power Enable") != 0 ||
+ gpio_direction_output(29, 1) != 0)
@ -337,7 +337,7 @@ diff -urN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go
+ kirkwood_mpp_conf(goflexnet_mpp_config);
+
+ kirkwood_uart0_init();
+ kirkwood_nand_init(ARRAY_AND_SIZE(goflexnet_nand_parts), 25);
+ kirkwood_nand_init(ARRAY_AND_SIZE(goflexnet_nand_parts), 40);
+
+ if (gpio_request(29, "USB Power Enable") != 0 ||
+ gpio_direction_output(29, 1) != 0)
@ -564,7 +564,7 @@ diff -urN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/ico
+ kirkwood_init();
+ kirkwood_mpp_conf(iconnect_mpp_config);
+
+ kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25);
+ kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 40);
+ kirkwood_ehci_init();
+
+ kirkwood_ge00_init(&iconnect_ge00_data);

10
core/openssl-cryptodev/PKGBUILD
View file

@ -13,7 +13,7 @@ _pkgname=openssl
_ver=1.0.1
# use a pacman compatible version scheme
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
pkgrel=2
pkgrel=3
pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
arch=('i686' 'x86_64')
url='https://www.openssl.org'
@ -30,13 +30,15 @@ source=("https://www.openssl.org/source/${_pkgname}-${_ver}.tar.gz"
'fix-manpages.patch'
'no-rpath.patch'
'ca-dir.patch'
'disable-tls12-client.patch')
'disable-tls12-client.patch'
'vpaes.patch')
md5sums=('134f168bc2a8333f19f81d684841710b'
'efbe93c11747fed52e60567819409d8a'
'5bbc0655bda2af95bc8eb568963ce8ba'
'dc78d3d06baffc16217519242ce92478'
'3bf51be3a1bbd262be46dc619f92aa90'
'365328e1fff7239777adcb50dc4edd42')
'365328e1fff7239777adcb50dc4edd42'
'55ad53e8ec3db1db6978af55e3ce1b5d')
build() {
cd $srcdir/$_pkgname-$_ver
@ -58,6 +60,8 @@ build() {
patch -p0 -i $srcdir/ca-dir.patch
# workaround for PR#2771
patch -p1 -i $srcdir/disable-tls12-client.patch
# fix for PR#2775
patch -p1 -i $srcdir/vpaes.patch
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS -DHASH_MAX_LEN=64 \

69
core/openssl-cryptodev/vpaes.patch Normal file
View file

@ -0,0 +1,69 @@
Index: openssl/crypto/aes/asm/vpaes-x86.pl
RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v
rcsdiff -q -kk '-r1.5.4.4' '-r1.5.4.5' -u '/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v' 2>/dev/null
--- vpaes-x86.pl 2011/12/15 22:20:26 1.5.4.4
+++ vpaes-x86.pl 2012/03/31 16:55:18 1.5.4.5
@@ -843,6 +843,8 @@
&mov ($out,&wparam(1)); # out
&mov ($round,&wparam(2)); # len
&mov ($key,&wparam(3)); # key
+ &sub ($round,16);
+ &jc (&label("cbc_abort"));
&lea ($base,&DWP(-56,"esp"));
&mov ($const,&wparam(4)); # ivp
&and ($base,-16);
@@ -853,7 +855,6 @@
&mov (&DWP(48,"esp"),$base);
&mov (&DWP(0,"esp"),$out); # save out
- &sub ($round,16);
&mov (&DWP(4,"esp"),$key) # save key
&mov (&DWP(8,"esp"),$const); # save ivp
&mov ($out,$round); # $out works as $len
@@ -896,6 +897,7 @@
&mov ($base,&DWP(8,"esp")); # restore ivp
&mov ("esp",&DWP(48,"esp"));
&movdqu (&QWP(0,$base),"xmm1"); # write IV
+&set_label("cbc_abort");
&function_end("${PREFIX}_cbc_encrypt");
&asm_finish();
Index: openssl/crypto/aes/asm/vpaes-x86_64.pl
RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v
rcsdiff -q -kk '-r1.4.4.2' '-r1.4.4.3' -u '/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v' 2>/dev/null
--- vpaes-x86_64.pl 2011/11/14 21:01:17 1.4.4.2
+++ vpaes-x86_64.pl 2012/03/31 16:55:18 1.4.4.3
@@ -263,7 +263,7 @@
pshufb %xmm2, %xmm4 # 4 = sbou
pxor %xmm0, %xmm4 # 4 = sb1u + k
movdqa 0x70(%r10), %xmm0 # 0 : sbot
- movdqa .Lk_sr-.Lk_dsbd(%r11), %xmm2
+ movdqa -0x160(%r11), %xmm2 # .Lk_sr-.Lk_dsbd=-0x160
pshufb %xmm3, %xmm0 # 0 = sb1t
pxor %xmm4, %xmm0 # 0 = A
pshufb %xmm2, %xmm0
@@ -869,6 +869,8 @@
___
($len,$key)=($key,$len);
$code.=<<___;
+ sub \$16,$len
+ jc .Lcbc_abort
___
$code.=<<___ if ($win64);
lea -0xb8(%rsp),%rsp
@@ -887,7 +889,6 @@
$code.=<<___;
movdqu ($ivp),%xmm6 # load IV
sub $inp,$out
- sub \$16,$len
call _vpaes_preheat
cmp \$0,${enc}d
je .Lcbc_dec_loop
@@ -932,6 +933,7 @@
.Lcbc_epilogue:
___
$code.=<<___;
+.Lcbc_abort:
ret
.size ${PREFIX}_cbc_encrypt,.-${PREFIX}_cbc_encrypt
___

10
core/openssl/PKGBUILD
View file

@ -11,7 +11,7 @@ _ver=1.0.1
# use a pacman compatible version scheme
#pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
pkgver=$_ver
pkgrel=2
pkgrel=3
pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
arch=('i686' 'x86_64')
url='https://www.openssl.org'
@ -25,13 +25,15 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
'fix-manpages.patch'
'no-rpath.patch'
'ca-dir.patch'
'disable-tls12-client.patch')
'disable-tls12-client.patch'
'vpaes.patch')
md5sums=('134f168bc2a8333f19f81d684841710b'
'efbe93c11747fed52e60567819409d8a'
'5bbc0655bda2af95bc8eb568963ce8ba'
'dc78d3d06baffc16217519242ce92478'
'3bf51be3a1bbd262be46dc619f92aa90'
'26432b9d7af63c63828b6405c9185400')
'26432b9d7af63c63828b6405c9185400'
'55ad53e8ec3db1db6978af55e3ce1b5d')
build() {
cd $srcdir/$pkgname-$_ver
@ -53,6 +55,8 @@ build() {
patch -p0 -i $srcdir/ca-dir.patch
# workaround for PR#2771
patch -p1 -i $srcdir/disable-tls12-client.patch
# fix for PR#2775
patch -p1 -i $srcdir/vpaes.patch
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
shared zlib enable-md2 \

69
core/openssl/vpaes.patch Normal file
View file

@ -0,0 +1,69 @@
Index: openssl/crypto/aes/asm/vpaes-x86.pl
RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v
rcsdiff -q -kk '-r1.5.4.4' '-r1.5.4.5' -u '/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v' 2>/dev/null
--- vpaes-x86.pl 2011/12/15 22:20:26 1.5.4.4
+++ vpaes-x86.pl 2012/03/31 16:55:18 1.5.4.5
@@ -843,6 +843,8 @@
&mov ($out,&wparam(1)); # out
&mov ($round,&wparam(2)); # len
&mov ($key,&wparam(3)); # key
+ &sub ($round,16);
+ &jc (&label("cbc_abort"));
&lea ($base,&DWP(-56,"esp"));
&mov ($const,&wparam(4)); # ivp
&and ($base,-16);
@@ -853,7 +855,6 @@
&mov (&DWP(48,"esp"),$base);
&mov (&DWP(0,"esp"),$out); # save out
- &sub ($round,16);
&mov (&DWP(4,"esp"),$key) # save key
&mov (&DWP(8,"esp"),$const); # save ivp
&mov ($out,$round); # $out works as $len
@@ -896,6 +897,7 @@
&mov ($base,&DWP(8,"esp")); # restore ivp
&mov ("esp",&DWP(48,"esp"));
&movdqu (&QWP(0,$base),"xmm1"); # write IV
+&set_label("cbc_abort");
&function_end("${PREFIX}_cbc_encrypt");
&asm_finish();
Index: openssl/crypto/aes/asm/vpaes-x86_64.pl
RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v
rcsdiff -q -kk '-r1.4.4.2' '-r1.4.4.3' -u '/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v' 2>/dev/null
--- vpaes-x86_64.pl 2011/11/14 21:01:17 1.4.4.2
+++ vpaes-x86_64.pl 2012/03/31 16:55:18 1.4.4.3
@@ -263,7 +263,7 @@
pshufb %xmm2, %xmm4 # 4 = sbou
pxor %xmm0, %xmm4 # 4 = sb1u + k
movdqa 0x70(%r10), %xmm0 # 0 : sbot
- movdqa .Lk_sr-.Lk_dsbd(%r11), %xmm2
+ movdqa -0x160(%r11), %xmm2 # .Lk_sr-.Lk_dsbd=-0x160
pshufb %xmm3, %xmm0 # 0 = sb1t
pxor %xmm4, %xmm0 # 0 = A
pshufb %xmm2, %xmm0
@@ -869,6 +869,8 @@
___
($len,$key)=($key,$len);
$code.=<<___;
+ sub \$16,$len
+ jc .Lcbc_abort
___
$code.=<<___ if ($win64);
lea -0xb8(%rsp),%rsp
@@ -887,7 +889,6 @@
$code.=<<___;
movdqu ($ivp),%xmm6 # load IV
sub $inp,$out
- sub \$16,$len
call _vpaes_preheat
cmp \$0,${enc}d
je .Lcbc_dec_loop
@@ -932,6 +933,7 @@
.Lcbc_epilogue:
___
$code.=<<___;
+.Lcbc_abort:
ret
.size ${PREFIX}_cbc_encrypt,.-${PREFIX}_cbc_encrypt
___

11
core/udev-oxnas/PKGBUILD
View file

@ -12,9 +12,9 @@ plugrel=1
_pkgbase='udev'
pkgname='udev-oxnas'
pkgver=181
pkgver=182
_pkgver=175
pkgrel=5.1
pkgrel=2
arch=(i686 x86_64)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
license=('GPL')
@ -43,13 +43,12 @@ build() {
}
package_udev-oxnas() {
pkgdesc="The userspace dev tools (udev-oxnas)"
depends=('util-linux' 'libusb-compat' 'glib2' 'module-init-tools' 'pciutils')
pkgdesc="The userspace dev tools for old kernels (udev ${_pkgver})"
depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils')
install=udev.install
backup=(etc/udev/udev.conf)
conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07')
provides=("udev=${pkgver}")
replaces=('devfsd')
conflicts=('udev')
cd $srcdir/$_pkgbase-$_pkgver
make DESTDIR=${pkgdir} install

4
core/xfsprogs/PKGBUILD
View file

@ -7,7 +7,7 @@
plugrel=1
pkgname=xfsprogs
pkgver=3.1.7
pkgver=3.1.8
pkgrel=1
pkgdesc="XFS filesystem utilities"
arch=('i686' 'x86_64')
@ -18,7 +18,7 @@ depends=('util-linux-ng>=2.16')
options=('!makeflags' '!libtool')
# We mirror the sources as upstream tends to move them once a new release is out
source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz")
md5sums=('049cf9873794ea49d0bb3f12d45748a4')
md5sums=('f70b2e7200d4c29f0af1cf70e7be1db6')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"

12
extra/gnutls/PKGBUILD
View file

@ -7,7 +7,7 @@
plugrel=1
pkgname=gnutls
pkgver=3.0.17
pkgver=3.0.18
pkgrel=1
pkgdesc="A library which provides a secure layer over a reliable transport layer"
arch=('i686' 'x86_64')
@ -15,11 +15,11 @@ license=('GPL3' 'LGPL')
url="http://www.gnu.org/software/gnutls/"
install=gnutls.install
options=('!libtool' '!zipman')
depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.11')
depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12')
makedepends=('strace')
source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
md5sums=('5e87bd73a237749e2acbbb7161f11d5e'
'28138f27cdc9e735b73955080c46c876')
md5sums=('f46539a39857012ccc338a59beb4ac46'
'fbca6ee827d8db0cea0f9b670b2f5c6c')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@ -33,12 +33,14 @@ build() {
check() {
cd "${srcdir}/${pkgname}-${pkgver}"
make check # passes all || /bin/true
# passes all || /bin/true
make check
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
# lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
# gzip -9 all files in infodir and manpages manually
find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;

4
extra/help2man/PKGBUILD
View file

@ -8,7 +8,7 @@
plugrel=1
pkgname=help2man
pkgver=1.40.7
pkgver=1.40.8
pkgrel=1
pkgdesc="Conversion tool to create man files"
arch=('i686' 'x86_64')
@ -17,7 +17,7 @@ license=('GPL')
depends=('perl-locale-gettext')
install=help2man.install
source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
md5sums=('8abef49b3cbbb1a7c599341d9ab1bd0f')
md5sums=('5a58c9900affd16013e091a89dcddf58')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"

4
extra/imagemagick/PKGBUILD
View file

@ -9,7 +9,7 @@ plugrel=1
pkgbase=imagemagick
pkgname=('imagemagick' 'imagemagick-doc')
pkgver=6.7.6.2
pkgver=6.7.6.5
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.imagemagick.org/"
@ -18,7 +18,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper')
source=(http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
perlmagick.rpath.patch)
sha1sums=('5411be21304520ae6a24d3f3e6d5c60eabdd57af'
sha1sums=('ecb6d2614ca8f44c1857ff28a88feb083403f7be'
'23405f80904b1de94ebd7bd6fe2a332471b8c283')
build() {

2
extra/lirc/PKGBUILD
View file

@ -10,7 +10,7 @@ plugrel=1
pkgbase=lirc
pkgname=('lirc' 'lirc-utils')
pkgver=0.9.0
pkgrel=12
pkgrel=15
epoch=1
arch=('i686' 'x86_64')
url="http://www.lirc.org/"

4
extra/mysql/PKGBUILD
View file

@ -10,7 +10,7 @@ plugrel=1
pkgbase=mysql
pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
pkgver=5.5.22
pkgver=5.5.23
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
@ -21,7 +21,7 @@ source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgv
'mysqld'
'my.cnf'
'alarm.patch')
md5sums=('c5b151a70e9ceed5308f108f1ece7b3b'
md5sums=('b614481967dc146c148027b598397b54'
'2234207625baa29b2ff7d7b4f088abce'
'1c949c0dbea5206af0db14942d9927b6'
'9eb0ad531d162e031a2bcc08a5ab3bc5')

4
extra/pixman/PKGBUILD
View file

@ -6,10 +6,12 @@
# - disable arm extensions that aren't supported, autodetection fails
plugrel=1
noautobuild=1
# - remove noautobuild on next bump
pkgname=pixman
pkgver=0.24.4
pkgrel=2
pkgrel=1
pkgdesc="The pixel-manipulation library for X and cairo"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org"

20
extra/qt/PKGBUILD
View file

@ -15,11 +15,11 @@ plugrel=1
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.1
pkgrel=1
pkgrel=2
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus'
'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs'
'mysql' 'unixodbc' 'cups' 'gtk2')
@ -28,7 +28,10 @@ _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
'gcc47.patch')
'gcc47.patch'
'improve-cups-support.patch'
'fix-buffer-overflow.patch'
'fix-cursortox-crash.patch')
md5sums=('7960ba8e18ca31f0c6e4895a312f92ff'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
@ -41,6 +44,15 @@ build() {
#patch -p1 -i "${srcdir}"/gcc47.patch
# (FS#29158)
patch -p1 -i "${srcdir}"/fix-buffer-overflow.patch
# (FS#29402) (QTBUG#24718)
patch -p1 -i "${srcdir}"/fix-cursortox-crash.patch
# (FS#28381) (KDEBUG#180051)
patch -p1 -i "${srcdir}"/improve-cups-support.patch
export QT4DIR="${srcdir}"/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
@ -97,7 +109,7 @@ build() {
package_qt() {
pkgdesc='A cross-platform application and UI framework'
depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus'
'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
optdepends=('postgresql-libs: PostgreSQL driver'

33
extra/qt/fix-buffer-overflow.patch Normal file
View file

@ -0,0 +1,33 @@
From 827e5c4c689d4ecb4f8c1ab48c9a7ab712fe2ca7 Mon Sep 17 00:00:00 2001
From: John Tapsell <john.tapsell.ext@basyskom.com>
Date: Mon, 12 Mar 2012 22:07:47 +0000
Subject: [PATCH] Harfbuzz-thai - fix buffer overflow when setting item
attributes
Change-Id: I19eeb4ec25a7c6cb3f584e6290169f9f327b8713
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
---
src/3rdparty/harfbuzz/src/harfbuzz-thai.c | 9 +++++-
.../qtextscriptengine/tst_qtextscriptengine.cpp | 29 ++++++++++++++++++++
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
index bf6c35b..3c0ffe8 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c
@@ -263,8 +263,13 @@ static HB_Bool HB_ThaiConvertStringToGlyphIndices (HB_ShaperItem *item)
// The only glyphs that should be passed to this function that cannot be mapped to
// tis620 are the ones of type Inherited class. Pass these glyphs untouched.
glyphString[slen++] = string[i];
- if (string[i] == 0x200D || string[i] == 0x200C)
- item->attributes[slen-1].dontPrint = true; // Hide ZWJ and ZWNJ characters
+ if (string[i] == 0x200D || string[i] == 0x200C) {
+ // Check that we do not run out of bounds when setting item->attributes. If we do
+ // run out of bounds then this function will return false, the necessary amount of
+ // memory is reallocated, and this function will then be called again.
+ if (slen <= item->num_glyphs)
+ item->attributes[slen-1].dontPrint = true; // Hide ZWJ and ZWNJ characters
+ }
} else {
glyphString[slen++] = (HB_UChar16) thai_get_glyph_index (font_type, rglyphs[lgi]);
}

32
extra/qt/fix-cursortox-crash.patch Normal file
View file

@ -0,0 +1,32 @@
Index: fix-cursortox-crash.patch
===================================================================
--- fix-cursortox-crash.patch (revision 0)
+++ fix-cursortox-crash.patch (arbetskopia)
#commit cac12f4592477d99ef6fffaad40345bf85ef53b5
#Author: Jiang Jiang <jiang.jiang@nokia.com>
#Date: Mon Apr 2 12:32:05 2012 +0200
#
# Fix a crash in cursorToX() when new block is added
#
# When an empty new block is being added, the layoutData->memory data
# will be 0, thus QTextEngine::attributes() will return 0. We should
# only access the attributes pointer when some text actually exist.
#
# Task-number: QTBUG-24718
# Change-Id: I9ce9f7b57bccf24099a02832ce30fb6cebfaad33
#
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index ee658d9..16f7150 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -2508,6 +2508,10 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
int pos = *cursorPos;
int itm;
const HB_CharAttributes *attributes = eng->attributes();
+ if (!attributes) {
+ *cursorPos = 0;
+ return x.toReal();
+ }
while (pos < line.from + line.length && !attributes[pos].charStop)
pos++;
if (pos == line.from + (int)line.length) {

84
extra/qt/improve-cups-support.patch Normal file
View file

@ -0,0 +1,84 @@
diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
--- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-11 16:55:22.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-28 04:34:16.000000000 +0100
@@ -569,6 +569,32 @@
void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
{
options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
+
+ if (cups) {
+ const ppd_option_t* duplex = cups->ppdOption("Duplex");
+ if (duplex) {
+ // copy default ppd duplex to qt dialog
+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
+ options.duplexShort->setChecked(true);
+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
+ options.duplexLong->setChecked(true);
+ else
+ options.noDuplex->setChecked(true);
+ }
+
+ if (cups->currentPPD()) {
+ // set default color
+ if (cups->currentPPD()->color_device)
+ options.color->setChecked(true);
+ else
+ options.grayscale->setChecked(true);
+ }
+
+ // set collation
+ const ppd_option_t *collate = cups->ppdOption("Collate");
+ if (collate)
+ options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
+ }
}
#endif
diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
--- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp 2010-02-11 16:55:22.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp 2010-02-28 04:55:15.000000000 +0100
@@ -627,6 +627,44 @@
&& d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
setOutputFormat(QPrinter::PdfFormat);
}
+
+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+ // fill in defaults from ppd file
+ QCUPSSupport cups;
+
+ int printernum = -1;
+ for (int i = 0; i < cups.availablePrintersCount(); i++) {
+ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
+ printernum = i;
+ }
+ if (printernum >= 0) {
+ cups.setCurrentPrinter(printernum);
+
+ const ppd_option_t* duplex = cups.ppdOption("Duplex");
+ if (duplex) {
+ // copy default ppd duplex to qt dialog
+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
+ setDuplex(DuplexShortSide);
+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
+ setDuplex(DuplexLongSide);
+ else
+ setDuplex(DuplexNone);
+ }
+
+ if (cups.currentPPD()) {
+ // set default color
+ if (cups.currentPPD()->color_device)
+ setColorMode(Color);
+ else
+ setColorMode(GrayScale);
+ }
+
+ // set collation
+ const ppd_option_t *collate = cups.ppdOption("Collate");
+ if (collate)
+ setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
+ }
+#endif
}
/*!