From 1f175a7b07b9553ce98d0546ac04dbb925ec0bc9 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Mon, 30 Aug 2010 22:26:00 +0000 Subject: RESYNC EXTRA: synced extra-testing -> extra repo Signed-off-by: James Meyer --- abs/extra/alpine/2.00-lpam.patch | 13 + abs/extra/alpine/CVE-2008-5514.patch | 20 + abs/extra/alpine/ChangeLog | 43 + abs/extra/alpine/PKGBUILD | 37 + abs/extra/apcupsd/PKGBUILD | 12 +- abs/extra/apcupsd/run | 3 +- abs/extra/asciidoc/ChangeLog | 10 + abs/extra/asciidoc/PKGBUILD | 30 + abs/extra/autofs/Changelog | 4 + abs/extra/autofs/PKGBUILD | 55 +- abs/extra/autofs/autofs.install | 6 +- abs/extra/autofs/finish | 8 +- abs/extra/autofs/heimdal.patch | 24 +- abs/extra/autofs/log.run | 2 + abs/extra/autofs/run | 16 +- abs/extra/bash-completion/PKGBUILD | 34 + abs/extra/bash-completion/cowsay.bashcomp | 34 + abs/extra/bluez/PKGBUILD | 24 +- abs/extra/bluez/__Changelog | 11 + abs/extra/bluez/bluez.install | 15 + abs/extra/bluez/run.bluetoothd | 12 + abs/extra/bluez/run.dund | 14 + abs/extra/bluez/run.hidd | 14 + abs/extra/bluez/run.pand | 14 + abs/extra/bluez/run.rfcomm | 17 + abs/extra/ccache/PKGBUILD | 35 + abs/extra/community/amule/PKGBUILD | 37 + abs/extra/community/blockcontrol/PKGBUILD | 37 + .../community/blockcontrol/blockcontrol.lib.patch | 15 + abs/extra/community/cwiid-git/PKGBUILD | 62 + abs/extra/community/cwiid-git/cwiid.install | 16 + abs/extra/community/deluge/PKGBUILD | 6 +- abs/extra/community/firefox/PKGBUILD | 5 +- .../community/flashplugin-prerelease/PKGBUILD | 28 + abs/extra/community/flashplugin/PKGBUILD | 41 +- abs/extra/community/foldingathome/PKGBUILD | 8 +- abs/extra/community/foldingathome/run | 2 +- abs/extra/community/fuzemux/PKGBUILD | 42 + abs/extra/community/fuzemux/fuzemux-svn.install | 5 + abs/extra/community/mediatomb/PKGBUILD | 57 + .../mediatomb/mediatomb-0.11.0+glibc-2.10.patch | 23 + .../community/mediatomb/mediatomb-gcc-4.3.patch | 24 + abs/extra/community/mediatomb/mediatomb.conf | 5 + abs/extra/community/mediatomb/mediatomb.rc | 58 + abs/extra/community/mobloquer/PKGBUILD | 24 +- abs/extra/community/mre/PKGBUILD | 41 + abs/extra/community/mre/livescores.tgz | Bin 0 -> 39586 bytes abs/extra/community/mre/mre-1.1.2.tar.gz | Bin 0 -> 19685 bytes abs/extra/community/mre/mre.install | 20 + abs/extra/community/mre/mre.lr | 9 + abs/extra/community/mre/patch.diff | 273 ++++ abs/extra/community/mre/run | 10 + abs/extra/community/mythpywii/CONTROLS | 25 + abs/extra/community/mythpywii/PKGBUILD | 22 +- abs/extra/community/mythpywii/mythpywii.install | 59 + abs/extra/community/mythpywii/wiimote.rules | 6 + abs/extra/community/network-ups-tools/PKGBUILD | 53 + abs/extra/community/network-ups-tools/finish.upsd | 16 + abs/extra/community/network-ups-tools/nut.install | 21 + abs/extra/community/network-ups-tools/run.upsd | 21 + abs/extra/community/peardb/PKGBUILD | 22 + abs/extra/community/pearlog/PKGBUILD | 25 + abs/extra/community/powernowd/PKGBUILD | 28 + abs/extra/community/powernowd/finish | 25 + abs/extra/community/powernowd/powernowd.conf.d | 6 + abs/extra/community/powernowd/powernowd.install | 19 + abs/extra/community/powernowd/run | 25 + abs/extra/community/squeezeboxserver/PKGBUILD | 34 + .../squeezeboxserver/squeezeboxserver.conf.d | 7 + .../squeezeboxserver/squeezeboxserver.install | 56 + .../community/squeezeboxserver/squeezeboxserver.rc | 47 + abs/extra/community/transmission-cli/PKGBUILD | 24 +- .../community/transmission-cli/run.transmissiond | 29 + .../transmission-cli/transmission-cli.install | 25 +- .../transmission-cli/transmission.include | 15 + .../community/transmission-cli/transmissiond.conf | 3 +- abs/extra/conky/PKGBUILD | 6 +- abs/extra/cpufreqd/PKGBUILD | 30 + abs/extra/cpufreqd/cpufreqd | 35 + abs/extra/cpufreqd/cpufreqd.install | 26 + abs/extra/cpufrequtils/PKGBUILD | 32 + abs/extra/cpufrequtils/cpufreq.confd | 14 + abs/extra/cpufrequtils/cpufreq.rcd | 60 + abs/extra/crypto++/PKGBUILD | 27 + abs/extra/ddclient/PKGBUILD | 30 +- abs/extra/ddclient/ddclient-foreground.patch | 47 + .../ddclient/ddclient.conf.dynamic.dyndns.sample | 162 ++ abs/extra/deb2targz/PKGBUILD | 20 + abs/extra/dnsmasq/PKGBUILD | 41 + abs/extra/dnsmasq/rc.dnsmasq | 36 + abs/extra/doxygen/PKGBUILD | 14 +- abs/extra/doxygen/PKGBUILD.orig | 24 + abs/extra/dpgconv/PKGBUILD | 22 + abs/extra/dpgconv/dpgconv-panscan.patch | 83 + abs/extra/enchant/PKGBUILD | 4 +- abs/extra/evrouter/PKGBUILD | 13 +- abs/extra/evtest/PKGBUILD | 24 + abs/extra/evtest/evtest.diff | 32 + abs/extra/fakeroot/PKGBUILD | 8 +- abs/extra/fftw/PKGBUILD | 3 +- abs/extra/fuppes-svn/PKGBUILD | 14 +- abs/extra/gdl/PKGBUILD | 6 +- abs/extra/geoip/PKGBUILD | 25 + abs/extra/glew/PKGBUILD | 8 +- abs/extra/gnu-netcat/PKGBUILD | 23 + abs/extra/gnu-netcat/gnu-netcat.install | 13 + abs/extra/gnupg/PKGBUILD | 25 + abs/extra/gnupg/gnupg.install | 21 + abs/extra/gnuplot/PKGBUILD | 4 +- abs/extra/gpgme/PKGBUILD | 25 + abs/extra/gpgme/__changelog | 1 + abs/extra/gpgme/gpgme.install | 18 + abs/extra/gtk-doc/PKGBUILD | 4 +- abs/extra/help2man/PKGBUILD | 28 + .../help2man/help2man-1.37.1-respect-LDFLAGS.patch | 11 + abs/extra/hicolor-icon-theme/PKGBUILD | 4 +- abs/extra/htop/PKGBUILD | 14 +- abs/extra/huludesktop/PKGBUILD | 21 + abs/extra/huludesktop/huludesktop | 25 + abs/extra/huludesktop/huludesktop.install | 26 + abs/extra/hunspell/PKGBUILD | 4 +- abs/extra/hunspell/__changelog | 1 + abs/extra/icon-naming-utils/PKGBUILD | 4 +- abs/extra/imdbpy/PKGBUILD | 28 + abs/extra/irqbalance/PKGBUILD | 25 +- abs/extra/irqbalance/finish | 15 + abs/extra/irqbalance/irqbalance.install | 10 + abs/extra/irqbalance/run | 25 + abs/extra/iso-codes/PKGBUILD | 4 +- abs/extra/iw/PKGBUILD | 4 +- abs/extra/lcdproc/PKGBUILD | 17 +- abs/extra/lcdproc/__changelog | 5 +- abs/extra/lcdproc/lcdproc.install | 7 + abs/extra/libbonobo/PKGBUILD | 6 +- abs/extra/libbonoboui/PKGBUILD | 4 +- abs/extra/libcdio/PKGBUILD | 6 +- abs/extra/libebml/PKGBUILD | 6 +- abs/extra/libftdi/PKGBUILD | 6 +- abs/extra/libmatroska/PKGBUILD | 20 + abs/extra/libmms/PKGBUILD | 4 +- abs/extra/lm_sensors/ChangeLog | 50 + abs/extra/lm_sensors/PKGBUILD | 65 +- abs/extra/lm_sensors/fancontrol.rc | 5 +- abs/extra/lm_sensors/healthd | 46 + abs/extra/lm_sensors/healthd.conf | 16 + abs/extra/lm_sensors/healthd.rc | 52 + abs/extra/lm_sensors/sensord.conf | 4 + abs/extra/lm_sensors/sensord.rc | 37 + abs/extra/lm_sensors/sensors-detect.patch | 114 +- abs/extra/lm_sensors/sensors.rc | 106 +- abs/extra/mediaserv/PKGBUILD | 7 +- abs/extra/mediaserv/linhes-mediaserv.tar.bz2 | Bin 17186 -> 17322 bytes abs/extra/mediaserv/mediaserv.install | 18 +- abs/extra/mediaserv/run | 2 +- abs/extra/mime-types/PKGBUILD | 17 + abs/extra/mime-types/mime.types | 758 +++++++++ abs/extra/mkvtoolnix/PKGBUILD | 6 +- abs/extra/monitorix-linhes.tar.gz | Bin 0 -> 1970 bytes abs/extra/monitorix/PKGBUILD | 58 + abs/extra/monitorix/monitorix.install | 30 + abs/extra/monitorix/monitorix.rc.d | 54 + abs/extra/most/PKGBUILD | 20 + abs/extra/most/most-debian.patch | 1655 ++++++++++++++++++++ abs/extra/mpeg_stat/PKGBUILD | 19 + abs/extra/mpgtx/PKGBUILD | 16 + abs/extra/mupen64plus-svn/PKGBUILD | 71 + .../mupen64plus-svn/fix-gcc4.4-const-char.patch | 22 + abs/extra/mupen64plus-svn/install.patch | 13 + abs/extra/mutt/PKGBUILD | 39 + abs/extra/mutt/mutt-unmailbox.patch | 10 + abs/extra/mutt/mutt.install | 15 + abs/extra/myt2xvid3/PKGBUILD | 2 +- abs/extra/myth2ipod/PKGBUILD | 2 +- abs/extra/myth2ipod/myth2ipod | 2 +- abs/extra/mythappletrailers/PKGBUILD | 7 +- abs/extra/mythappletrailers/appletrailer.xml | 516 +++--- abs/extra/mythappletrailers/loading.sh | 12 +- .../mythappletrailers/mythappletrailers.install | 16 +- abs/extra/mythnuv2mkv/PKGBUILD | 6 +- abs/extra/mythnuv2mkv/mythnuv2mkv.patch | 36 + abs/extra/mythtv-contrib/6200ch.tar.gz | Bin 0 -> 5040 bytes abs/extra/mythtv-contrib/PKGBUILD | 150 ++ abs/extra/mythtv-contrib/dct-channel_make.patch | 16 + abs/extra/mythtv-contrib/mythchanger.10f.beta.tar | Bin 0 -> 30720 bytes abs/extra/mythtv-contrib/mythchanger_make.patch | 8 + abs/extra/mythtv-contrib/mythtv-contrib.install | 7 + abs/extra/mythtv-contrib/xbmc_mythlink.tgz | Bin 0 -> 7766 bytes abs/extra/netkit-bsd-finger/LICENSE | 36 + abs/extra/netkit-bsd-finger/PKGBUILD | 26 + abs/extra/netkit-bsd-finger/finger.xinetd | 8 + abs/extra/numlockx/PKGBUILD | 26 + abs/extra/nvram-wakup/PKGBUILD | 15 + abs/extra/p7zip/PKGBUILD | 45 + abs/extra/postfix/PKGBUILD | 52 + abs/extra/postfix/__changelog | 1 + abs/extra/postfix/postfix | 58 + abs/extra/postfix/postfix.install | 38 + abs/extra/postfix/postfix.patch.bz2 | Bin 0 -> 373 bytes abs/extra/procmail/PKGBUILD | 21 + abs/extra/pth/PKGBUILD | 22 + abs/extra/pyqt/ChangeLog | 21 + abs/extra/pyqt/PKGBUILD | 30 + abs/extra/python-geoip/PKGBUILD | 20 + abs/extra/python-lxml/PKGBUILD | 34 + abs/extra/python-pybluez/PKGBUILD | 5 +- abs/extra/python-pyserial/PKGBUILD | 20 + abs/extra/qscintilla/ChangeLog | 13 + abs/extra/qscintilla/PKGBUILD | 55 + abs/extra/recstat/PKGBUILD | 19 + abs/extra/recstat/recstat | 56 + abs/extra/recstat/recstat.install | 13 + abs/extra/recstat/recstat.py | 38 + abs/extra/recstat/run | 7 + abs/extra/rrd_stats/PKGBUILD | 3 +- abs/extra/rrd_stats/rrd_stats.tgz | Bin 7454 -> 8444 bytes abs/extra/sdlmame/PKGBUILD | 88 +- abs/extra/sdlmame/mame-0137-wiimote.diff | 424 +++++ abs/extra/sdlmame/sdlmame.install | 3 - abs/extra/sip/ChangeLog | 17 + abs/extra/sip/PKGBUILD | 29 + abs/extra/tablet-encode/PKGBUILD | 4 +- abs/extra/terminus-font/PKGBUILD | 20 + abs/extra/terminus-font/install.proto | 27 + abs/extra/terminus-font/terminus-font.install | 21 + abs/extra/tightvnc/PKGBUILD | 6 +- abs/extra/tightvnc/tightvnc-fontpath-xcolors.patch | 21 +- abs/extra/unetbootin/PKGBUILD | 28 + abs/extra/windowmaker/PKGBUILD | 2 +- abs/extra/wxgtk/ChangeLog | 22 + abs/extra/wxgtk/PKGBUILD | 35 +- abs/extra/wxgtk/gsocket.patch | 18 + abs/extra/wxgtk/overflow.patch | 66 + abs/extra/x11vnc/PKGBUILD | 9 +- abs/extra/xbmc-svn/CHANGELOG | 110 ++ abs/extra/xbmc-svn/Lircmap.xml | 233 +++ abs/extra/xbmc-svn/PKGBUILD | 97 ++ abs/extra/xbmc-svn/__changelog | 1 + abs/extra/xbmc-svn/xbmc-svn.install | 13 + abs/extra/xbmc/FEH.sh | 47 + abs/extra/xbmc/Lircmap.xml | 233 +++ abs/extra/xbmc/PKGBUILD | 116 ++ abs/extra/xbmc/__changelog | 1 + .../use_cdio_system_headers_on_non_win32.patch | 130 ++ abs/extra/xbmc/xbmc.install | 7 + abs/extra/xinetd/PKGBUILD | 32 + abs/extra/xinetd/servers | 10 + abs/extra/xinetd/services | 10 + abs/extra/xinetd/xinetd | 38 + abs/extra/xinetd/xinetd-2.3.14.tar.gz | Bin 0 -> 301703 bytes abs/extra/xinetd/xinetd.conf | 14 + abs/extra/xmlto/PKGBUILD | 8 +- 251 files changed, 9204 insertions(+), 801 deletions(-) create mode 100644 abs/extra/alpine/2.00-lpam.patch create mode 100644 abs/extra/alpine/CVE-2008-5514.patch create mode 100644 abs/extra/alpine/ChangeLog create mode 100644 abs/extra/alpine/PKGBUILD create mode 100644 abs/extra/asciidoc/ChangeLog create mode 100644 abs/extra/asciidoc/PKGBUILD mode change 100644 => 100755 abs/extra/autofs/Changelog mode change 100644 => 100755 abs/extra/autofs/PKGBUILD create mode 100755 abs/extra/autofs/log.run create mode 100644 abs/extra/bash-completion/PKGBUILD create mode 100644 abs/extra/bash-completion/cowsay.bashcomp create mode 100644 abs/extra/bluez/__Changelog create mode 100644 abs/extra/bluez/bluez.install create mode 100644 abs/extra/bluez/run.bluetoothd create mode 100644 abs/extra/bluez/run.dund create mode 100644 abs/extra/bluez/run.hidd create mode 100644 abs/extra/bluez/run.pand create mode 100644 abs/extra/bluez/run.rfcomm create mode 100644 abs/extra/ccache/PKGBUILD create mode 100644 abs/extra/community/amule/PKGBUILD create mode 100644 abs/extra/community/blockcontrol/PKGBUILD create mode 100644 abs/extra/community/blockcontrol/blockcontrol.lib.patch create mode 100644 abs/extra/community/cwiid-git/PKGBUILD create mode 100644 abs/extra/community/cwiid-git/cwiid.install create mode 100644 abs/extra/community/flashplugin-prerelease/PKGBUILD create mode 100644 abs/extra/community/fuzemux/PKGBUILD create mode 100644 abs/extra/community/fuzemux/fuzemux-svn.install create mode 100644 abs/extra/community/mediatomb/PKGBUILD create mode 100644 abs/extra/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch create mode 100644 abs/extra/community/mediatomb/mediatomb-gcc-4.3.patch create mode 100644 abs/extra/community/mediatomb/mediatomb.conf create mode 100755 abs/extra/community/mediatomb/mediatomb.rc create mode 100644 abs/extra/community/mre/PKGBUILD create mode 100644 abs/extra/community/mre/livescores.tgz create mode 100644 abs/extra/community/mre/mre-1.1.2.tar.gz create mode 100755 abs/extra/community/mre/mre.install create mode 100644 abs/extra/community/mre/mre.lr create mode 100644 abs/extra/community/mre/patch.diff create mode 100755 abs/extra/community/mre/run create mode 100644 abs/extra/community/mythpywii/CONTROLS create mode 100644 abs/extra/community/mythpywii/mythpywii.install create mode 100644 abs/extra/community/mythpywii/wiimote.rules create mode 100644 abs/extra/community/network-ups-tools/PKGBUILD create mode 100644 abs/extra/community/network-ups-tools/finish.upsd create mode 100644 abs/extra/community/network-ups-tools/nut.install create mode 100644 abs/extra/community/network-ups-tools/run.upsd create mode 100755 abs/extra/community/peardb/PKGBUILD create mode 100755 abs/extra/community/pearlog/PKGBUILD create mode 100644 abs/extra/community/powernowd/PKGBUILD create mode 100644 abs/extra/community/powernowd/finish create mode 100644 abs/extra/community/powernowd/powernowd.conf.d create mode 100644 abs/extra/community/powernowd/powernowd.install create mode 100644 abs/extra/community/powernowd/run create mode 100644 abs/extra/community/squeezeboxserver/PKGBUILD create mode 100644 abs/extra/community/squeezeboxserver/squeezeboxserver.conf.d create mode 100644 abs/extra/community/squeezeboxserver/squeezeboxserver.install create mode 100644 abs/extra/community/squeezeboxserver/squeezeboxserver.rc create mode 100755 abs/extra/community/transmission-cli/run.transmissiond create mode 100644 abs/extra/community/transmission-cli/transmission.include create mode 100644 abs/extra/cpufreqd/PKGBUILD create mode 100644 abs/extra/cpufreqd/cpufreqd create mode 100644 abs/extra/cpufreqd/cpufreqd.install create mode 100644 abs/extra/cpufrequtils/PKGBUILD create mode 100644 abs/extra/cpufrequtils/cpufreq.confd create mode 100644 abs/extra/cpufrequtils/cpufreq.rcd create mode 100644 abs/extra/crypto++/PKGBUILD create mode 100644 abs/extra/ddclient/ddclient-foreground.patch create mode 100644 abs/extra/ddclient/ddclient.conf.dynamic.dyndns.sample create mode 100644 abs/extra/deb2targz/PKGBUILD create mode 100644 abs/extra/dnsmasq/PKGBUILD create mode 100755 abs/extra/dnsmasq/rc.dnsmasq create mode 100644 abs/extra/doxygen/PKGBUILD.orig create mode 100644 abs/extra/dpgconv/PKGBUILD create mode 100644 abs/extra/dpgconv/dpgconv-panscan.patch create mode 100644 abs/extra/evtest/PKGBUILD create mode 100644 abs/extra/evtest/evtest.diff create mode 100644 abs/extra/geoip/PKGBUILD create mode 100644 abs/extra/gnu-netcat/PKGBUILD create mode 100644 abs/extra/gnu-netcat/gnu-netcat.install create mode 100644 abs/extra/gnupg/PKGBUILD create mode 100644 abs/extra/gnupg/gnupg.install create mode 100644 abs/extra/gpgme/PKGBUILD create mode 100644 abs/extra/gpgme/__changelog create mode 100644 abs/extra/gpgme/gpgme.install create mode 100644 abs/extra/help2man/PKGBUILD create mode 100644 abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch create mode 100644 abs/extra/huludesktop/PKGBUILD create mode 100644 abs/extra/huludesktop/huludesktop create mode 100644 abs/extra/huludesktop/huludesktop.install create mode 100644 abs/extra/hunspell/__changelog create mode 100644 abs/extra/imdbpy/PKGBUILD create mode 100644 abs/extra/irqbalance/finish create mode 100644 abs/extra/irqbalance/irqbalance.install create mode 100644 abs/extra/irqbalance/run create mode 100644 abs/extra/lcdproc/lcdproc.install create mode 100644 abs/extra/libmatroska/PKGBUILD create mode 100644 abs/extra/lm_sensors/ChangeLog create mode 100644 abs/extra/lm_sensors/healthd create mode 100644 abs/extra/lm_sensors/healthd.conf create mode 100644 abs/extra/lm_sensors/healthd.rc create mode 100644 abs/extra/lm_sensors/sensord.conf create mode 100644 abs/extra/lm_sensors/sensord.rc create mode 100644 abs/extra/mime-types/PKGBUILD create mode 100644 abs/extra/mime-types/mime.types create mode 100644 abs/extra/monitorix-linhes.tar.gz create mode 100644 abs/extra/monitorix/PKGBUILD create mode 100644 abs/extra/monitorix/monitorix.install create mode 100644 abs/extra/monitorix/monitorix.rc.d create mode 100644 abs/extra/most/PKGBUILD create mode 100644 abs/extra/most/most-debian.patch create mode 100644 abs/extra/mpeg_stat/PKGBUILD create mode 100644 abs/extra/mpgtx/PKGBUILD create mode 100644 abs/extra/mupen64plus-svn/PKGBUILD create mode 100644 abs/extra/mupen64plus-svn/fix-gcc4.4-const-char.patch create mode 100644 abs/extra/mupen64plus-svn/install.patch create mode 100644 abs/extra/mutt/PKGBUILD create mode 100644 abs/extra/mutt/mutt-unmailbox.patch create mode 100644 abs/extra/mutt/mutt.install create mode 100644 abs/extra/mythnuv2mkv/mythnuv2mkv.patch create mode 100644 abs/extra/mythtv-contrib/6200ch.tar.gz create mode 100644 abs/extra/mythtv-contrib/PKGBUILD create mode 100644 abs/extra/mythtv-contrib/dct-channel_make.patch create mode 100644 abs/extra/mythtv-contrib/mythchanger.10f.beta.tar create mode 100644 abs/extra/mythtv-contrib/mythchanger_make.patch create mode 100644 abs/extra/mythtv-contrib/mythtv-contrib.install create mode 100644 abs/extra/mythtv-contrib/xbmc_mythlink.tgz create mode 100644 abs/extra/netkit-bsd-finger/LICENSE create mode 100644 abs/extra/netkit-bsd-finger/PKGBUILD create mode 100644 abs/extra/netkit-bsd-finger/finger.xinetd create mode 100644 abs/extra/numlockx/PKGBUILD create mode 100755 abs/extra/nvram-wakup/PKGBUILD create mode 100644 abs/extra/p7zip/PKGBUILD create mode 100644 abs/extra/postfix/PKGBUILD create mode 100644 abs/extra/postfix/__changelog create mode 100755 abs/extra/postfix/postfix create mode 100644 abs/extra/postfix/postfix.install create mode 100644 abs/extra/postfix/postfix.patch.bz2 create mode 100644 abs/extra/procmail/PKGBUILD create mode 100644 abs/extra/pth/PKGBUILD create mode 100644 abs/extra/pyqt/ChangeLog create mode 100644 abs/extra/pyqt/PKGBUILD create mode 100644 abs/extra/python-geoip/PKGBUILD create mode 100644 abs/extra/python-lxml/PKGBUILD create mode 100644 abs/extra/python-pyserial/PKGBUILD create mode 100644 abs/extra/qscintilla/ChangeLog create mode 100644 abs/extra/qscintilla/PKGBUILD create mode 100644 abs/extra/recstat/PKGBUILD create mode 100644 abs/extra/recstat/recstat create mode 100644 abs/extra/recstat/recstat.install create mode 100644 abs/extra/recstat/recstat.py create mode 100755 abs/extra/recstat/run create mode 100644 abs/extra/sdlmame/mame-0137-wiimote.diff create mode 100644 abs/extra/sip/ChangeLog create mode 100644 abs/extra/sip/PKGBUILD create mode 100644 abs/extra/terminus-font/PKGBUILD create mode 100644 abs/extra/terminus-font/install.proto create mode 100644 abs/extra/terminus-font/terminus-font.install create mode 100644 abs/extra/unetbootin/PKGBUILD create mode 100644 abs/extra/wxgtk/gsocket.patch create mode 100644 abs/extra/wxgtk/overflow.patch create mode 100644 abs/extra/xbmc-svn/CHANGELOG create mode 100644 abs/extra/xbmc-svn/Lircmap.xml create mode 100644 abs/extra/xbmc-svn/PKGBUILD create mode 100644 abs/extra/xbmc-svn/__changelog create mode 100644 abs/extra/xbmc-svn/xbmc-svn.install create mode 100644 abs/extra/xbmc/FEH.sh create mode 100644 abs/extra/xbmc/Lircmap.xml create mode 100644 abs/extra/xbmc/PKGBUILD create mode 100644 abs/extra/xbmc/__changelog create mode 100644 abs/extra/xbmc/use_cdio_system_headers_on_non_win32.patch create mode 100644 abs/extra/xbmc/xbmc.install create mode 100644 abs/extra/xinetd/PKGBUILD create mode 100644 abs/extra/xinetd/servers create mode 100644 abs/extra/xinetd/services create mode 100755 abs/extra/xinetd/xinetd create mode 100644 abs/extra/xinetd/xinetd-2.3.14.tar.gz create mode 100644 abs/extra/xinetd/xinetd.conf diff --git a/abs/extra/alpine/2.00-lpam.patch b/abs/extra/alpine/2.00-lpam.patch new file mode 100644 index 0000000..69e66d7 --- /dev/null +++ b/abs/extra/alpine/2.00-lpam.patch @@ -0,0 +1,13 @@ +--- alpine-2.00.orig/alpine/Makefile.in ++++ alpine-2.00/alpine/Makefile.in +@@ -169,7 +169,7 @@ + LIBICONV = @LIBICONV@ + LIBINTL = @LIBINTL@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lpam + LIBTOOL = @LIBTOOL@ + LN = @LN@ + LN_S = @LN_S@ + LTLIBICONV = @LTLIBICONV@ + LTLIBINTL = @LTLIBINTL@ diff --git a/abs/extra/alpine/CVE-2008-5514.patch b/abs/extra/alpine/CVE-2008-5514.patch new file mode 100644 index 0000000..594bea0 --- /dev/null +++ b/abs/extra/alpine/CVE-2008-5514.patch @@ -0,0 +1,20 @@ +--- alpine-2.00/imap/src/c-client/rfc822.c ++++ alpine-2.00/imap/src/c-client/rfc822.c +@@ -1351,6 +1351,7 @@ + + static long rfc822_output_char (RFC822BUFFER *buf,int c) + { ++ if ((buf->cur == buf->end) && !rfc822_output_flush (buf)) return NIL; + *buf->cur++ = c; /* add character, soutr buffer if full */ + return (buf->cur == buf->end) ? rfc822_output_flush (buf) : LONGT; + } +@@ -1374,7 +1375,8 @@ + len -= i; + } + /* soutr buffer now if full */ +- if (len && !rfc822_output_flush (buf)) return NIL; ++ if ((len || (buf->cur == buf->end)) && !rfc822_output_flush (buf)) ++ return NIL; + } + return LONGT; + } diff --git a/abs/extra/alpine/ChangeLog b/abs/extra/alpine/ChangeLog new file mode 100644 index 0000000..4c3bf81 --- /dev/null +++ b/abs/extra/alpine/ChangeLog @@ -0,0 +1,43 @@ +2010-01-23 Eric Belanger + + * alpine 2.00-7 + * Updated patchset to level 53 + +2009-09-18 Eric Belanger + + * alpine 2.00-6 + * libldap-2.4 rebuild + +2009-09-18 Eric Belanger + + * alpine 2.00-5 + * Updated patchset to level 52 + * Security fix + +2009-09-17 Allan McRae + + * alpine 2.00-4 + * libldap-2.4 rebuild + +2009-02-07 Eric Belanger + + * alpine 2.00-3 + * Updated patchset to level 20 + +2008-12-05 Eric Belanger + + * alpine 2.00-2 + * Rebuilt against heimdal 1.2.1 + * Placed copy of all.patch.gz patch on local ftp (close FS#11964) + +2008-09-04 Eric Belanger + + * alpine 2.00-1 + * Upstream update + * Replaced install scriptlet with optdepends + +2008-03-26 Eric Belanger + + * alpine 1.10-1 + * Upstream update + * Added ChangeLog diff --git a/abs/extra/alpine/PKGBUILD b/abs/extra/alpine/PKGBUILD new file mode 100644 index 0000000..1d75c85 --- /dev/null +++ b/abs/extra/alpine/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 64978 2010-01-23 22:24:15Z eric $ +# Maintainer: Eric Belanger +# Contributor: Fabio Scotoni + +pkgname=alpine +pkgver=2.00 +pkgrel=7 +_patchlevel=53 +pkgdesc="The Apache-licensed PINE (a tool for reading, sending, and managing electronic messages)" +arch=('i686' 'x86_64') +url="http://www.washington.edu/alpine/" +license=('APACHE') +depends=('libldap>=2.4.11' 'heimdal>=1.2.1' 'gettext') +optdepends=('aspell: for spell-checking support') +provides=('pine') +conflicts=('pine') +replaces=('pine') +options=('!makeflags') +source=(ftp://ftp.cac.washington.edu/${pkgname}/${pkgname}.tar.bz2 \ + http://staff.washington.edu/chappa/alpine/patches/alpine-${pkgver}/all_${_patchlevel}.patch.gz \ + 2.00-lpam.patch CVE-2008-5514.patch) +md5sums=('84e44cbf71ed674800a5d57eed9c1c52' 'c4a85b865f59c095f838617d08b1b123'\ + 'cd3911c16fc6a072e853c0ccfc35857c' '1b52a54a656979116c09fb1d948a4325') +sha1sums=('dcbd3c5419954f484ccf706feaba31ce48cdebc4' '7396ed92062924c126087dc32b98ccebf98e17cc'\ + '1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3' 'bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 < ../all_${_patchlevel}.patch || return 1 + patch -p1 < ../2.00-lpam.patch || return 1 + patch -p1 < ../CVE-2008-5514.patch || return 1 + ./configure --prefix=/usr --without-passfile --without-tcl \ + --disable-shared --with-system-pinerc=/etc/alpine.d/pine.conf \ + --with-system-fixed-pinerc=/etc/alpine.d/pine.conf.fixed || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/abs/extra/apcupsd/PKGBUILD b/abs/extra/apcupsd/PKGBUILD index 9f66f5d..ad57d1a 100644 --- a/abs/extra/apcupsd/PKGBUILD +++ b/abs/extra/apcupsd/PKGBUILD @@ -3,8 +3,8 @@ # Maintainer: Todd Musall pkgname=apcupsd -pkgver=3.14.5 -pkgrel=2 +pkgver=3.14.8 +pkgrel=1 pkgdesc="Apcupsd can be used for power mangement and controlling most of APC's UPS models on Unix and Windows machines." arch=(i686 x86_64) url="http://www.apcupsd.org" @@ -17,10 +17,6 @@ source=(http://switch.dl.sf.net/sourceforge/apcupsd/$pkgname-$pkgver.tar.gz \ apcupsd apcupsd.conf run) -md5sums=('4ac73ec91d8ab56f3fac894e172567c4' - '5eae3c4d921eeb81798a0250fe3dd111' - '2f533aec32c9445510bb2127b453b175' - 'd4b8c755ecd30f57810f71a6d6435dd3') build() { cd $startdir/src/$pkgname-$pkgver @@ -36,3 +32,7 @@ build() { mkdir -p $startdir/pkg/etc/sv/apcupsd/supervise install -D -m755 ../run $startdir/pkg/etc/sv/apcupsd } +md5sums=('cd17f0a903dc2220e55ed54e242359d2' + '5eae3c4d921eeb81798a0250fe3dd111' + '2f533aec32c9445510bb2127b453b175' + '32ae73bc096c1d0982c12d8ec46abee2') diff --git a/abs/extra/apcupsd/run b/abs/extra/apcupsd/run index a9dfa3d..bc5c22b 100644 --- a/abs/extra/apcupsd/run +++ b/abs/extra/apcupsd/run @@ -1,3 +1,4 @@ #!/bin/sh exec 2>&1 -exec /sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf >/dev/null 2>/dev/null + stat_runit "Starting APC UPS Daemon" + exec /sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf diff --git a/abs/extra/asciidoc/ChangeLog b/abs/extra/asciidoc/ChangeLog new file mode 100644 index 0000000..e9e5156 --- /dev/null +++ b/abs/extra/asciidoc/ChangeLog @@ -0,0 +1,10 @@ + +2009-11-07 Chris Brannon + + * Fixed optdepends, converted to arch=('any'). + + +2008-07-06 Douglas Soares de Andrade + + * Updated for x86_64 - 8.2.7 + diff --git a/abs/extra/asciidoc/PKGBUILD b/abs/extra/asciidoc/PKGBUILD new file mode 100644 index 0000000..2a73a22 --- /dev/null +++ b/abs/extra/asciidoc/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Daniel J Griffiths +# Contributor: Chris Brannon +# Contributor: Geoffroy Carrier +# Contributor: Dan McGee +# Contributor: Jaroslaw Rosiek +# Contributor: Darwin Bautista + +pkgname=asciidoc +pkgver=8.5.3 +pkgrel=2 +pkgdesc="Text document format for short documents, articles, books and UNIX man pages" +arch=('any') +url="http://www.methods.co.nz/asciidoc/" +license=('GPL') +depends=('python' 'libxslt' 'docbook-xsl') +optdepends=('lilypond: music-filter' + 'imagemagick: music-filter (used in conjunction with lilypond)' + 'source-highlight: source-highlight-filter' + 'fop: pdf generation' + 'lynx: text generation' + 'w3m: text generation (alternative to lynx)') +source=(http://downloads.sourceforge.net/asciidoc/asciidoc-${pkgver}.tar.gz) + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc || return 1 + make install DESTDIR="${pkgdir}" || return 1 + install -Dm644 asciidocapi.py ${pkgdir}/usr/lib/python2.6/site-packages/asciidocapi.py +} +md5sums=('7377872275c2a575151655b19ac6dd3e') diff --git a/abs/extra/autofs/Changelog b/abs/extra/autofs/Changelog old mode 100644 new mode 100755 index f25555e..d8df4dc --- a/abs/extra/autofs/Changelog +++ b/abs/extra/autofs/Changelog @@ -1,2 +1,6 @@ 5.0.4-5 4/29/09 Cecil - Added run and finish files for runit. +6/28/10 +Britney - Updated run to manage automount; removed finish and /etc/rc.d/autofs; added logger +5.0.5-1 6/12/10 +Britney - Updated to 5.0.5 based on arch autofs 5.0.5 PKGBUILD and heimdal.patch with runit support added. diff --git a/abs/extra/autofs/PKGBUILD b/abs/extra/autofs/PKGBUILD old mode 100644 new mode 100755 index 7524ae4..ac317d2 --- a/abs/extra/autofs/PKGBUILD +++ b/abs/extra/autofs/PKGBUILD @@ -1,29 +1,21 @@ -# $Id: PKGBUILD 36638 2009-04-26 19:00:46Z andrea $ +# $Id: PKGBUILD 75323 2010-04-01 10:16:24Z allan $ # Maintainer: Andrea Scarpino # Contributor: Dale Blount # Contributor: Manolis Tzanidakis pkgname=autofs -pkgver=5.0.4 -pkgrel=5 -pkgdesc="A kernel-based automounter for Linux." +pkgver=5.0.5 +pkgrel=1 +pkgdesc="A kernel-based automounter for Linux" arch=('i686' 'x86_64') url="http://wiki.autofs.net/FrontPage" license=('GPL2') depends=('libldap' 'libxml2' 'heimdal') backup=(etc/autofs/auto.master etc/autofs/auto.misc etc/conf.d/autofs) -install=autofs.install +install=${pkgname}.install source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2" - 'autofs' 'autofs.conf.d' 'auto.master' 'auto.misc' - 'heimdal.patch' 'run' 'finish') -md5sums=('2646dde61edd08dd952255558c733c08' - 'b4984b3161f50cba3d189b0ec594d014' - '47f597c870410055e0fdb66103daf928' - 'a6cefb591e77b31b79dbb7243646c96b' - 'd8a15ec9186c5c0b36e5cea1e2739e8a' - '1ee4825e26ad72bfe86acec3d3da5d2a' - '74d3b5b6c4421275448084472cfa691a' - '43410e98ecb224cde73ce32be5a6aa14') + 'autofs.conf.d' 'auto.master' 'auto.misc' + 'heimdal.patch' 'run' 'log.run' 'finish') build() { export MAKEFLAGS="-j1" @@ -37,18 +29,29 @@ build() { --with-mapdir=/etc/autofs \ --without-hesiod make || return 1 + + sed -i "s:/etc:/etc/autofs:g" man/auto.master.5 +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} make INSTALLROOT=${pkgdir} install - local conf_file - for conf_file in auto.{master,misc}; do - install -D -m 644 ${srcdir}/$conf_file ${pkgdir}/etc/autofs/$conf_file - done - - sed -i "s:/etc:/etc/autofs:g" ${pkgdir}/usr/share/man/man5/auto.master.5 - install -D -m 755 ${srcdir}/autofs ${pkgdir}/etc/rc.d/autofs - install -D -m 644 ${srcdir}/autofs.conf.d ${pkgdir}/etc/conf.d/autofs + install -Dm644 ${srcdir}/auto.master ${pkgdir}/etc/autofs/auto.master || return 1 + install -Dm644 ${srcdir}/auto.misc ${pkgdir}/etc/autofs/auto.misc || return 1 + install -Dm644 ${srcdir}/autofs.conf.d ${pkgdir}/etc/conf.d/autofs || return 1 mkdir -p ${pkgdir}/etc/sv/autofs/supervise - install -D -m 744 ${srcdir}/run ${pkgdir}/etc/sv/autofs - install -D -m 744 ${srcdir}/finish ${pkgdir}/etc/sv/autofs + mkdir -p ${pkgdir}/etc/sv/autofs/log/supervise + install -Dm744 ${srcdir}/run ${pkgdir}/etc/sv/autofs || return 1 + install -Dm744 ${srcdir}/finish ${pkgdir}/etc/sv/autofs || return 1 + install -Dm744 ${srcdir}/log.run ${pkgdir}/etc/sv/autofs/log/run || return 1 } -# vim: ts=2 sw=2 et ft=sh + +md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a' + '47f597c870410055e0fdb66103daf928' + 'a6cefb591e77b31b79dbb7243646c96b' + 'd8a15ec9186c5c0b36e5cea1e2739e8a' + 'efd46b6406b940cb48f7c6197790fb8e' + 'f2048c24da7fa1421c2e8b0b90fb17f9' + '518e277f960a1af837ba6c5cca13c615' + '5b30948886b6d71287652d784fccf1fb') diff --git a/abs/extra/autofs/autofs.install b/abs/extra/autofs/autofs.install index 61120bb..7806efa 100644 --- a/abs/extra/autofs/autofs.install +++ b/abs/extra/autofs/autofs.install @@ -1,5 +1,5 @@ post_install(){ - echo "########################################################" - echo "In autofs5 --ghost option isn't valid. In order to start" - echo "autofs you must remove it from your /etc/conf.d/autofs. " + echo "#########################################################" + echo "In autofs5 --ghost option isn't valid. In order to start autofs" + echo "you must remove that option from your /etc/conf.d/autofs. " } diff --git a/abs/extra/autofs/finish b/abs/extra/autofs/finish index 26f9d19..40d2fdc 100755 --- a/abs/extra/autofs/finish +++ b/abs/extra/autofs/finish @@ -1,3 +1,9 @@ #!/bin/sh exec 2>&1 -sv down autofs + +. /etc/rc.conf +. /etc/rc.d/functions + +stat_runit "Stopping autofs4 kernel module" && echo "" +set -e # barf if modprobe fails +/sbin/modprobe -r autofs4 diff --git a/abs/extra/autofs/heimdal.patch b/abs/extra/autofs/heimdal.patch index c49b1fd..4aa3218 100644 --- a/abs/extra/autofs/heimdal.patch +++ b/abs/extra/autofs/heimdal.patch @@ -1,5 +1,5 @@ ---- autofs-5.0.4/modules/cyrus-sasl.c~ 2009-01-11 17:18:55.000000000 +0100 -+++ autofs-5.0.4/modules/cyrus-sasl.c 2009-01-11 17:18:55.000000000 +0100 +--- autofs-5.0.5/modules/cyrus-sasl.c~ 2010-03-03 01:38:41.582901786 +0100 ++++ autofs-5.0.5/modules/cyrus-sasl.c 2010-03-03 01:41:32.313704755 +0100 @@ -66,6 +66,15 @@ #endif #endif @@ -16,19 +16,29 @@ /* * Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME * environment variable so that the library knows where to find it. -@@ -451,11 +460,11 @@ +@@ -452,11 +452,11 @@ /* setup a principal for the ticket granting service */ ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ, - krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, - krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, -+ krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), -+ krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), ++ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), ++ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), strlen(KRB5_TGS_NAME), KRB5_TGS_NAME, - krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, - krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, -+ krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), -+ krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), ++ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), ++ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), 0); if (ret) { error(logopt, +--- autofs-5.0.5/modules/Makefile~ 2010-03-03 01:42:18.532868539 +0100 ++++ autofs-5.0.5/modules/Makefile 2010-03-03 01:42:35.360367371 +0100 +@@ -43,7 +43,7 @@ + ifeq ($(SASL), 1) + SASL_OBJ = cyrus-sasl.o + LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) -DLDAP_THREAD_SAFE +- LIBLDAP += $(LIBSASL) $(XML_LIBS) ++ LIBLDAP += $(LIBSASL) $(XML_LIBS) -lkrb5 + endif + endif \ No newline at end of file diff --git a/abs/extra/autofs/log.run b/abs/extra/autofs/log.run new file mode 100755 index 0000000..d184328 --- /dev/null +++ b/abs/extra/autofs/log.run @@ -0,0 +1,2 @@ +#!/bin/sh +/usr/bin/logger -p info -i -t autofs diff --git a/abs/extra/autofs/run b/abs/extra/autofs/run index b35a4ea..342ade6 100755 --- a/abs/extra/autofs/run +++ b/abs/extra/autofs/run @@ -1,5 +1,19 @@ #!/bin/sh exec 2>&1 + +. /etc/rc.conf +. /etc/rc.d/functions + +stat_runit "Starting autofs4 kernel module" && echo "" set -e # barf if modprobe fails /sbin/modprobe autofs4 -exec /etc/rc.d/autofs start + +stat_runit "Starting autofs automount" && echo "" +# source application-specific settings +[ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs + +if [ ! -z "$TIMEOUT" ]; then + daemonoptions="--timeout=$TIMEOUT $daemonoptions" +fi + +exec /usr/sbin/automount -f $daemonoptions diff --git a/abs/extra/bash-completion/PKGBUILD b/abs/extra/bash-completion/PKGBUILD new file mode 100644 index 0000000..5aa6b22 --- /dev/null +++ b/abs/extra/bash-completion/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 67318 2010-02-06 09:38:55Z eric $ +# Maintainer: Aaron Griffin +# Contributor: Aurelien Foret +# Contributor: Evangelos Foutras + +pkgname=bash-completion +pkgver=1.2 +pkgrel=1 +pkgdesc="Programmable completion for the bash shell" +arch=(any) +url="http://bash-completion.alioth.debian.org/" +license=('GPL') +depends=('bash') +source=(http://bash-completion.alioth.debian.org/files/$pkgname-$pkgver.tar.gz cowsay.bashcomp) + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # fixes for archlinux + sed -i 's#/sbin/lsmod#/bin/lsmod#' bash_completion || return 1 + + ./configure --prefix=/usr --sysconfdir=/etc + make || return 1 + make DESTDIR="$pkgdir" install + install -D -m644 "$srcdir/cowsay.bashcomp" "$pkgdir/etc/bash_completion.d/cowsay" + + # apache2ctl doesn't work, even when renamed to apachectl (and sed'd) + rm "$pkgdir/etc/bash_completion.d/apache2ctl" + # munin-node doesn't work, even i've updated munin to 1.4.0 + rm "$pkgdir/etc/bash_completion.d/munin-node" +} +# vim:set ts=2 sw=2 et: +md5sums=('457c8808ed54f2b2cdd737b1f37ffa24' + 'e9766bdc391caf825cb24e704422987e') diff --git a/abs/extra/bash-completion/cowsay.bashcomp b/abs/extra/bash-completion/cowsay.bashcomp new file mode 100644 index 0000000..77d8be9 --- /dev/null +++ b/abs/extra/bash-completion/cowsay.bashcomp @@ -0,0 +1,34 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/games-misc/cowsay/files/cowsay.bashcomp,v 1.1 2005/02/06 14:37:54 ka0ttic Exp $ + +# bash command-line completion for cowsay +# Author: Aaron Walker +# Modified by: Michal Bentkowski + +_cowsay() { + local cur prev opts x + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + opts="-e -f -h -l -n -T -W -b -d -g -p -s -t -w -y" + + if [[ "${cur}" == -* || ${COMP_CWORD} -eq 1 ]] ; then + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 + fi + + case "${prev}" in + -f) + COMPREPLY=( $( command ls /usr/share/cowsay| \ + sed -ne 's/^\('$cur'.*\)\.cow$/\1/p') ) + return 0 + ;; + -[eTW]) + COMPREPLY=() + ;; + esac +} +complete -o filenames -F _cowsay cowsay cowthink + +# vim: set ft=sh tw=80 sw=4 et : diff --git a/abs/extra/bluez/PKGBUILD b/abs/extra/bluez/PKGBUILD index 9e8f13b..f8dfbe5 100644 --- a/abs/extra/bluez/PKGBUILD +++ b/abs/extra/bluez/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Geoffroy Carrier pkgname=bluez -pkgver=4.30 +pkgver=4.69 pkgrel=1 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" @@ -12,11 +12,13 @@ optdepends=('gstreamer0.10-base' 'alsa-lib' 'libusb') conflicts=('bluez-libs' 'bluez-utils') provides=('bluez-libs' 'bluez-utils') replaces=('bluez-libs' 'bluez-utils') +install='bluez.install' backup=(etc/bluetooth/{main,rfcomm,audio,network,input}.conf etc/conf.d/bluetooth) source=("http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2" - 'bluetooth.conf.d' - 'rc.bluetooth') + bluetooth.conf.d run.bluetoothd run.hidd run.dund run.pand + run.rfcomm) + build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ @@ -45,9 +47,17 @@ build() { install -D -m644 "$srcdir/$pkgname-$pkgver/network/network.conf" "$pkgdir/etc/bluetooth/" || return 1 install -D -m644 "$srcdir/$pkgname-$pkgver/input/input.conf" "$pkgdir/etc/bluetooth/" || return 1 install -D -m644 "$srcdir/$pkgname-$pkgver/audio/audio.conf" "$pkgdir/etc/bluetooth/" || return 1 - install -D -m755 "$srcdir/rc.bluetooth" "$pkgdir/etc/rc.d/bluetooth" || return 1 - install -D -m644 "$srcdir/bluetooth.conf.d" "$pkgdir/etc/conf.d/bluetooth" || return 1 + install -D -m644 "$srcdir/bluetooth.conf.d" "$pkgdir/etc/conf.d/bluetooth" || return 1 + install -D -m755 "$srcdir/run.bluetoothd" "$pkgdir/etc/sv/bluetoothd/run" || return 1 + install -D -m755 "$srcdir/run.hidd" "$pkgdir/etc/sv/hidd/run" || return 1 + install -D -m755 "$srcdir/run.dund" "$pkgdir/etc/sv/dund/run" || return 1 + install -D -m755 "$srcdir/run.pand" "$pkgdir/etc/sv/pand/run" || return 1 + install -D -m755 "$srcdir/run.rfcomm" "$pkgdir/etc/sv/rfcomm/run" || return 1 } -md5sums=('5c37fb99c03f40269b9245eec3e7b7f4' +md5sums=('350568aa11a95eac6e56e9289ff1f91d' 'd12be5b494525bb1ba6eac5c3983dd3e' - '03d4f2463b1b580e8d2ada3767140685') + '1c88fcd455920ad8ee0c7cae3fe15771' + 'a9c1b4da8b5a3969865272bd0fb01da2' + '89c073f43a074844b87e28103e48623d' + '8ee99afea417561d01012b8047fd06d5' + '934a9eaa25c275d18115068101fb75e8') diff --git a/abs/extra/bluez/__Changelog b/abs/extra/bluez/__Changelog new file mode 100644 index 0000000..124d0eb --- /dev/null +++ b/abs/extra/bluez/__Changelog @@ -0,0 +1,11 @@ +# by mihanson +I really have no idea how this bluetooth stuff works. If anyone wants to +take a stab at getting this working properly with runit, feel free. I +only need this package to get mythpywii working. + +2010-04-01: +Make this package work with runit. All daemons were seperated into their +own run scripts. Of particular interest is rfcomm and hid2hci utilities. +They are not daemons and I added "/sbin/sv down ." in their +respective run files. All based on this thread: +http://article.gmane.org/gmane.comp.sysutils.supervision.general/1585/ diff --git a/abs/extra/bluez/bluez.install b/abs/extra/bluez/bluez.install new file mode 100644 index 0000000..f9b757b --- /dev/null +++ b/abs/extra/bluez/bluez.install @@ -0,0 +1,15 @@ +post_install() { + add_service.sh bluetoothd + echo ">>> Only the bluetoothd daemon is started by default." + echo ">>> You can optionally add the following as required:" + echo ">>> hidd dund pand rfcomm" + echo ">>> $ sudo add_service.sh " +} + +pre_remove() { + for d in { bluetoothd,hidd,dund,pand,rfcomm } ; do + if [ -d /var/service/${d} ] ; then + remove_servcie.sh $d + fi + done +} diff --git a/abs/extra/bluez/run.bluetoothd b/abs/extra/bluez/run.bluetoothd new file mode 100644 index 0000000..7a92437 --- /dev/null +++ b/abs/extra/bluez/run.bluetoothd @@ -0,0 +1,12 @@ +#!/bin/sh +# +# Start/stop the Bluetooth daemons +# + +. /etc/rc.conf +. /etc/rc.d/functions + +[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth + + stat_runit "Starting bluetooth subsystem:" + exec /usr/sbin/bluetoothd -n diff --git a/abs/extra/bluez/run.dund b/abs/extra/bluez/run.dund new file mode 100644 index 0000000..c42cfa1 --- /dev/null +++ b/abs/extra/bluez/run.dund @@ -0,0 +1,14 @@ +#!/bin/sh +# +# Start/stop the Bluetooth daemons +# + +. /etc/rc.conf +. /etc/rc.d/functions + +[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth + +svwaitup -s 3 /var/service/bluetoothd || exit 1 + + stat_runit "Starting BlueZ Bluetooth dial-up networking daemon" + exec /usr/bin/dund -n -s diff --git a/abs/extra/bluez/run.hidd b/abs/extra/bluez/run.hidd new file mode 100644 index 0000000..e4f66d3 --- /dev/null +++ b/abs/extra/bluez/run.hidd @@ -0,0 +1,14 @@ +#!/bin/sh +# +# Start/stop the Bluetooth daemons +# + +. /etc/rc.conf +. /etc/rc.d/functions + +[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth + +svwaitup -s 3 /var/service/bluetoothd || exit 1 + + stat_runit "Starting Bluetooth HID daemon:" + exec /usr/bin/hidd -n --server diff --git a/abs/extra/bluez/run.pand b/abs/extra/bluez/run.pand new file mode 100644 index 0000000..ab15ef6 --- /dev/null +++ b/abs/extra/bluez/run.pand @@ -0,0 +1,14 @@ +#!/bin/sh +# +# Start/stop the Bluetooth daemons +# + +. /etc/rc.conf +. /etc/rc.d/functions + +[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth + +svwaitup -s 3 /var/service/bluetoothd || exit 1 + + stat_runit "Starting BlueZ Bluetooth PAN daemon" + exec /usr/bin/pand -n -s diff --git a/abs/extra/bluez/run.rfcomm b/abs/extra/bluez/run.rfcomm new file mode 100644 index 0000000..8bc619b --- /dev/null +++ b/abs/extra/bluez/run.rfcomm @@ -0,0 +1,17 @@ +#!/bin/sh +# +# Start/stop the Bluetooth daemons +# + +. /etc/rc.conf +. /etc/rc.d/functions + +[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth + +RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" + +svwaitup -s 3 /var/service/bluetoothd || exit 1 + + stat_runit "Starting RFCOMM for the bluetooth subsystem" + /usr/bin/rfcomm -f $RFCOMM_CONFIG bind all + /sbin/sv down . diff --git a/abs/extra/ccache/PKGBUILD b/abs/extra/ccache/PKGBUILD new file mode 100644 index 0000000..81f188b --- /dev/null +++ b/abs/extra/ccache/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 33524 2009-04-04 13:56:15Z giovanni $ +# Maintainer: Giovanni Scafora +# Contributor: Tom Newsom + +pkgname=ccache +pkgver=3.0.1 +pkgrel=1 +pkgdesc="ccache is a compiler cache" +url="http://ccache.samba.org/" +source=(http://samba.org/ftp/${pkgname}/$pkgname-$pkgver.tar.gz) +license=('GPL') +arch=('i686' 'x86_64') +depends=('glibc') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make || return 1 + install -Dm 755 ccache ${pkgdir}/usr/bin/ccache + install -Dm 644 ccache.1 ${pkgdir}/usr/share/man/man1/ccache.1 + + mkdir -p ${pkgdir}/usr/lib/ccache/bin + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/cc + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/gcc + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/g++ + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/cpp + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/c++ + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-cc + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-gcc + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-g++ + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-cpp + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-c++ +} + +md5sums=('15f2449899d9e8dc3aff6b86f97ab63e') diff --git a/abs/extra/community/amule/PKGBUILD b/abs/extra/community/amule/PKGBUILD new file mode 100644 index 0000000..3bb5c1b --- /dev/null +++ b/abs/extra/community/amule/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 63810 2010-01-18 20:34:42Z ibiru $ +# Maintainer: Giovanni Scafora +# Contributor: Henrik Ronellenfitsch + +pkgname=amule +pkgver=2.2.6 +pkgrel=2 +pkgdesc="An eMule-like client for ed2k p2p network" +arch=('i686' 'x86_64') +url="http://www.amule.org" +license=('GPL') +depends=('wxgtk>=2.8.10.1' 'gd>=2.0.35' 'geoip') +makedepends=('crypto++') +source=(http://downloads.sourceforge.net/project/${pkgname}/aMule/${pkgver}/aMule-${pkgver}.tar.bz2) +md5sums=('530d9b48187e36f78fc21bb19e94326d') + +build() { + cd ${srcdir}/aMule-${pkgver} + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-cas \ + --enable-wxcas \ + --enable-amule-daemon \ + --enable-amulecmd \ + --enable-amule-gui \ + --enable-alc \ + --enable-alcc \ + --enable-webserver \ + --disable-debug \ + --enable-optimize \ + --enable-ccache \ + --enable-geoip + + make || return 1 + make DESTDIR=${pkgdir}/ install || return 1 +} diff --git a/abs/extra/community/blockcontrol/PKGBUILD b/abs/extra/community/blockcontrol/PKGBUILD new file mode 100644 index 0000000..2507adc --- /dev/null +++ b/abs/extra/community/blockcontrol/PKGBUILD @@ -0,0 +1,37 @@ +# Contributor: Daniele Marinello + +pkgname=blockcontrol +pkgver=1.6.9 +pkgrel=3 +pkgdesc="blockcontrol is designed to do all tasks related to IP block daemons (MoBlock or NFBlock). They check internet traffic based on large lists of IP address ranges in order to protect your privacy." +arch=('i686' 'x86_64') +url="http://moblock-deb.sourceforge.net/" +license=('GPL2' 'BSD') +depends=('moblock' 'wget') +conflicts=('moblockcontrol') +source=(http://downloads.sourceforge.net/moblock-deb/$pkgname-$pkgver.tar.gz \ + blockcontrol.lib.patch) +backup=('etc/blockcontrol/blockcontrol.conf' 'etc/blockcontrol/blocklists.list') + +build() { + cd "$startdir/src/$pkgname-$pkgver" + patch -Np1 -i ../blockcontrol.lib.patch || return 1 + + install -D -m 755 $startdir/src/$pkgname-$pkgver/blockcontrol ${pkgdir}/usr/bin/blockcontrol + install -D -m 755 $startdir/src/$pkgname-$pkgver/blockcontrol.main ${pkgdir}/usr/lib/blockcontrol/blockcontrol.main + install -D -m 644 $startdir/src/$pkgname-$pkgver/blockcontrol.defaults ${pkgdir}/usr/lib/blockcontrol/blockcontrol.defaults + install -D -m 644 $startdir/src/$pkgname-$pkgver/blockcontrol.lib ${pkgdir}/usr/lib/blockcontrol/blockcontrol.lib + install -D -m 755 $startdir/src/$pkgname-$pkgver/blockcontrol.wd ${pkgdir}/usr/bin/blockcontrol.wd + install -D -m 644 $startdir/src/$pkgname-$pkgver/allow.p2p ${pkgdir}/etc/blockcontrol/allow.p2p + install -D -m 644 $startdir/src/$pkgname-$pkgver/blockcontrol.conf ${pkgdir}/etc/blockcontrol/blockcontrol.conf + install -D -m 644 $startdir/src/$pkgname-$pkgver/blocklists.list ${pkgdir}/etc/blockcontrol/blocklists.list +# install -D -m 755 $startdir/src/$pkgname-$pkgver/if-up ${pkgdir}/etc/network/if-up.d/blockcontrol + install -D -m 755 $startdir/src/$pkgname-$pkgver/cron.daily ${pkgdir}/etc/cron.daily/blockcontrol + install -D -m 755 $startdir/src/$pkgname-$pkgver/init ${pkgdir}/etc/rc.d/blockcontrol + install -D -m 644 $startdir/src/$pkgname-$pkgver/logrotate ${pkgdir}/etc/logrotate.d/blockcontrol + install -d ${pkgdir}/var/lib/blockcontrol + install -d ${pkgdir}/var/spool/blockcontrol +} + +md5sums=('d02002745aacf6100ff9057bdc80adf3' + 'efcca84e52ea98cc10610830f9c2ba37') diff --git a/abs/extra/community/blockcontrol/blockcontrol.lib.patch b/abs/extra/community/blockcontrol/blockcontrol.lib.patch new file mode 100644 index 0000000..4be1c75 --- /dev/null +++ b/abs/extra/community/blockcontrol/blockcontrol.lib.patch @@ -0,0 +1,15 @@ +--- blockcontrol/blockcontrol_old.lib 2009-09-14 19:35:24.000000000 +0200 ++++ blockcontrol/blockcontrol.lib 2009-11-05 20:29:50.000000000 +0100 +@@ -1344,10 +1344,10 @@ + DAEMON_OPTS="$CUSTOM_DAEMON_OPTS" + elif [ "$NAME" = moblock ] ; then + # The options MoBlock is started with +- DAEMON_OPTS="-$BLOCKLIST_FORMAT $BLOCKLIST $NFQUEUE_NUMBER_OPT $LOG_SYSLOG_OPT $LOG_TIMESTAMP_OPT $REJECT_OPT $ACCEPT_OPT $DAEMON_LOG" ++ DAEMON_OPTS="-$BLOCKLIST_FORMAT $BLOCKLIST $NFQUEUE_NUMBER_OPT $LOG_SYSLOG_OPT $DAEMON_LOG" + elif [ "$NAME" = nfblockd ] ; then + # The options NFBlock is started with +- DAEMON_OPTS="-d -f $BLOCKLIST -p $PIDFILE $NFQUEUE_NUMBER_OPT $REJECT_OPT $ACCEPT_OPT $LOG_SYSLOG_OPT" ++ DAEMON_OPTS="-d -f $BLOCKLIST -p $PIDFILE $NFQUEUE_NUMBER_OPT $LOG_SYSLOG_OPT" + fi + + # Test NICE_LEVEL setting. diff --git a/abs/extra/community/cwiid-git/PKGBUILD b/abs/extra/community/cwiid-git/PKGBUILD new file mode 100644 index 0000000..909f224 --- /dev/null +++ b/abs/extra/community/cwiid-git/PKGBUILD @@ -0,0 +1,62 @@ +#Contributor:Andrea Tarocchi +pkgname=cwiid-git +#pkgver=`date +%Y%m%d` +pkgver=20100716 +pkgrel=1 +pkgdesc="Cwiid-git is the bleeding edge version of a wiimote's driver and utility tools" +arch=(i686 x86_64) +url="http://github.com/abstrakraft/cwiid" +license=('GPL') + +depends=('bluez>=4' 'gtk2' 'python') +makedepends=('git' 'make' 'automake' 'autoconf') +replaces=('cwiid' 'cwiid-svn') +provides=('cwiid' 'cwiid-git') +install=('cwiid.install') +source=() + +_gitroot=git://github.com/abstrakraft/cwiid.git +_gitname=cwiid +_builddir=$srcdir/$_gitname-build + +build() { + + export LDFLAGS= + + cd $srcdir/ + msg "Connecting to github.com GIT server...." + if [ -d $srcdir/$_gitname ] ; then + pushd $_gitname && git pull origin && popd + msg "The local files are updated." + else + git clone $_gitroot + fi + msg "GIT checkout done or server timeout" + msg "Starting make..." + rm -rf $_gitname-build + git clone $_gitname $_gitname-build + + cd $_builddir + + aclocal + autoreconf + ./configure --prefix=/usr --sysconfdir=/etc --disable-ldconfig + + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + +# aclocal +# autoreconf + +# ./configure --disable-ldconfig --prefix=/usr --sysconfdir=/etc --with-cwiid-plugins-dir=/lib/cwiid/plugins +# make LDFLAGS=-L../libcwiid || return 1 + +# install -d $startdir/pkg/usr/bin +# install -d $startdir/pkg/etc +# install -d $startdir/pkg/usr/lib +# install -d $startdir/pkg/usr/include + +# make install LDFLAGS=-L../libcwiid prefix=$startdir/pkg/usr sysconfdir=$startdir/pkg/etc install + +# install -D -m644 ./wminput/README $pkgdir/usr/share/doc/cwiid/wminput +} diff --git a/abs/extra/community/cwiid-git/cwiid.install b/abs/extra/community/cwiid-git/cwiid.install new file mode 100644 index 0000000..5dc5faf --- /dev/null +++ b/abs/extra/community/cwiid-git/cwiid.install @@ -0,0 +1,16 @@ +# arg 1: the new package version +post_install() { +echo -e "Note:" +echo -e "\033[1;31m==> In order to use wminput you have to load the uinput kernel module:\033[0m" +echo -e "\033[1;31m==> modprobe uinput (as root)\033[0m" +echo -e "\033[1;31m==> and you have to assign correct right acces to /dev/uinput\033[0m" +echo -e "\033[1;31m==> PLEAS READ THE DOC FILE /usr/share/doc/cwiid/wminput\033[0m" +} + +post_upgrade() { + post_install $1 +} + +op=$1 +shift +$op $* \ No newline at end of file diff --git a/abs/extra/community/deluge/PKGBUILD b/abs/extra/community/deluge/PKGBUILD index 6a1a971..8238baa 100644 --- a/abs/extra/community/deluge/PKGBUILD +++ b/abs/extra/community/deluge/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Hugo Doria pkgname=deluge -pkgver=1.1.2 +pkgver=1.2.2 pkgrel=1 pkgdesc="A bittorrent client written with python and pygtk" arch=('i686' 'x86_64') @@ -11,8 +11,7 @@ license=('GPL3') depends=('pygtk' 'boost>=1.37.0' 'pyxdg' 'dbus-python' 'librsvg' 'setuptools') makedepends=('subversion' 'intltool') options=('!emptydirs') -source=(http://download.deluge-torrent.org/source/${pkgver}/${pkgname}-${pkgver}.tar.gz) -md5sums=('c9d56e266e5cb3024f2dbd72c952e182') +source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.gz) build() { @@ -23,3 +22,4 @@ build() { install -D -m644 deluge/data/pixmaps/deluge.svg ${pkgdir}/usr/share/pixmaps/deluge.svg } +md5sums=('5165c6113efa75e2be0310976ce55e43') diff --git a/abs/extra/community/firefox/PKGBUILD b/abs/extra/community/firefox/PKGBUILD index 191c913..17a70b3 100644 --- a/abs/extra/community/firefox/PKGBUILD +++ b/abs/extra/community/firefox/PKGBUILD @@ -3,12 +3,12 @@ pkgname=firefox pkgver=3.5.1 -pkgrel=3 +pkgrel=4 _xulver=1.9.1.1 pkgdesc="Standalone web browser from mozilla.org" arch=(i686 x86_64) license=('MPL' 'GPL' 'LGPL') -depends=("xulrunner>=${_xulver}" 'desktop-file-utils' "nspr>=4.8") +depends=("xulrunner>=${_xulver}" 'desktop-file-utils' "nspr>=4.8" gconf) makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.24.1' 'python') replaces=('firefox3') install=firefox.install @@ -70,6 +70,7 @@ build() { mv ${pkgdir}/usr/bin/firefox ${pkgdir}/usr/bin/firefox.bin echo "#!/bin/bash +/usr/lib/GConf/gconfd-2 & export LD_PRELOAD=/usr/lib/libGL.so.1 /usr/bin/firefox.bin" > ${pkgdir}/usr/bin/firefox chmod 755 ${pkgdir}/usr/bin/firefox diff --git a/abs/extra/community/flashplugin-prerelease/PKGBUILD b/abs/extra/community/flashplugin-prerelease/PKGBUILD new file mode 100644 index 0000000..d6eca0b --- /dev/null +++ b/abs/extra/community/flashplugin-prerelease/PKGBUILD @@ -0,0 +1,28 @@ +# Contributor : Anish Bhatt + +pkgname=flashplugin-prerelease +_licensefile='Reader_Player_AIR_WWEULA-Combined-20080204_1313.pdf' +pkgver=10.1.51.66 +pkgrel=1 +source=('http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_1_p2_linux_121709.tar.gz' + "http://www.adobe.com/products/eulas/pdfs/${_licensefile}") +md5sums=('4f56f8235cb72a59d04d64ca4bd442b3' + '1636037610ee2aa35c5fb736a697b7e0') + +pkgdesc='Adobe Flash Player Prerelease' +url='http://labs.adobe.com/technologies/flashplayer10/' +arch=('i686') +depends=('mozilla-common' 'libxt' 'gtk2' 'nss' 'curl') +conflicts=('flashplugin') +provides=('flashplayer') +license=('custom') + +build() { + install -d -m755 ${pkgdir}/usr/lib/mozilla/plugins/ || return 1 + if [ "${CARCH}" = 'i686' ]; then + install -m755 ${srcdir}/install_flash_player_10_linux/libflashplayer.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1 + fi + install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 + install -m644 "${_licensefile}" ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 +} + diff --git a/abs/extra/community/flashplugin/PKGBUILD b/abs/extra/community/flashplugin/PKGBUILD index 1e68f40..7d7e65f 100644 --- a/abs/extra/community/flashplugin/PKGBUILD +++ b/abs/extra/community/flashplugin/PKGBUILD @@ -1,40 +1,27 @@ -# $Id: PKGBUILD 21951 2008-12-18 13:25:19Z thomas $ +# $Id: PKGBUILD 60911 2009-12-09 11:51:09Z andrea $ +# Contributor: Andrea Scarpino pkgname=flashplugin -_licensefile='Reader_Player_WWEULA-Combined-20060724_1430.pdf' -if [ "${CARCH}" = 'i686' ]; then - pkgver=10.0.15.3 - pkgrel=1 - source=('http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz' - "http://www.adobe.com/products/eulas/pdfs/${_licensefile}") - md5sums=('afab0b40b0ae11445e2e90a4a9224a8a' - '844cea6c9afc13d9e27f28ce1a6e20f3') -elif [ "${CARCH}" = 'x86_64' ]; then - pkgver=10.0.d21.1 - pkgrel=1 - source=("http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${pkgver}.linux-x86_64.so.tar.gz" - "http://www.adobe.com/products/eulas/pdfs/${_licensefile}") - md5sums=('c165af9d4e324bfaf6d1cfbdbe959fbb' - '844cea6c9afc13d9e27f28ce1a6e20f3') -else - error Unknown architecture. - exit 1 -fi +_licensefile='Reader_Player_AIR_WWEULA-Combined-20080204_1313.pdf' +pkgver=10.1.53.64 +pkgrel=1 pkgdesc='Adobe Flash Player' -url='http://www.adobe.com/go/getflash' +url='http://get.adobe.com/flashplayer' arch=('i686' 'x86_64') depends=('mozilla-common' 'libxt' 'gtk2' 'nss' 'curl') replaces=('flashplugin-beta') provides=('flashplayer') license=('custom') +source=('http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz' + "http://www.adobe.com/products/eulas/pdfs/${_licensefile}") +[ "${CARCH}" = "x86_64" ] && source[0]="http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${pkgver}.linux-${CARCH}.so.tar.gz" +[ "${CARCH}" = "x86_64" ] && md5sums[0]='8b427c2991c0447af56a951c653ee383' build() { install -d -m755 ${pkgdir}/usr/lib/mozilla/plugins/ || return 1 - if [ "${CARCH}" = 'i686' ]; then - install -m755 ${srcdir}/install_flash_player_10_linux/libflashplayer.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1 - elif [ "${CARCH}" = 'x86_64' ]; then - install -m755 ${srcdir}/libflashplayer.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1 - fi + install -m755 ${srcdir}/libflashplayer.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1 install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 - install -m644 "${_licensefile}" ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 + install -m644 "${_licensefile}" ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.pdf || return 1 } +md5sums=('e4cb4d26124605a54c3d498cc440368f' + '1636037610ee2aa35c5fb736a697b7e0') diff --git a/abs/extra/community/foldingathome/PKGBUILD b/abs/extra/community/foldingathome/PKGBUILD index bb93407..6f00936 100644 --- a/abs/extra/community/foldingathome/PKGBUILD +++ b/abs/extra/community/foldingathome/PKGBUILD @@ -4,7 +4,7 @@ pkgname=foldingathome pkgver=6.02 -pkgrel=6 +pkgrel=7 pkgdesc="Folding@Home is a distributed computing project which studies protein folding, misfolding, aggregation, and related diseases." arch=('i686') url="http://folding.stanford.edu/" @@ -14,13 +14,15 @@ backup=('etc/conf.d/foldingathome') install=foldingathome.install source=(http://www.stanford.edu/group/pandegroup/folding/release/FAH$pkgver-Linux.tgz run) -md5sums=('112b3d66909050f1bb990993a1464cb9' - '61eb4617e7363d586a05dde980ad1c14') build() { cd $startdir/src/ + tar zxf FAH${pkgver}-Linux.tgz + # At this stage, the mpiexec is not included because it requires x86_64. install -D -c -m755 fah6 $startdir/pkg/usr/bin/fah6 || return 1 install -D -m755 run $startdir/pkg/etc/sv/fah/run } +md5sums=('112b3d66909050f1bb990993a1464cb9' + 'cefaf5ba2f3e2fe81533b5ee4795dc78') diff --git a/abs/extra/community/foldingathome/run b/abs/extra/community/foldingathome/run index ede51f2..cd4a072 100644 --- a/abs/extra/community/foldingathome/run +++ b/abs/extra/community/foldingathome/run @@ -22,5 +22,5 @@ if [ -d $FOLDING_DIR ] ; then # No need to direct output to a log file becase a log file # will automatically be placed in $FOLDING_DIR - exec /usr/bin/fah6 -verbosity 9 &> /dev/null < /dev/null + exec /usr/bin/fah6 &> /dev/null < /dev/null fi diff --git a/abs/extra/community/fuzemux/PKGBUILD b/abs/extra/community/fuzemux/PKGBUILD new file mode 100644 index 0000000..5cce2d0 --- /dev/null +++ b/abs/extra/community/fuzemux/PKGBUILD @@ -0,0 +1,42 @@ +# Contributor: Michael Hanson +# Maintainer: Michael Hanson +pkgname=fuzemux-svn +pkgver=11 +pkgrel=1 +pkgdesc="A tool to remux AVI video files for the San Disk Sansa Fuze portable media player" +arch=('i686' 'x86_64') +url="http://code.google.com/p/fuzemux" +license=('GPL3') +#depends=() +makedepends=('subversion' 'autoconf') +provides=('fuzemux') +install=('fuzemux-svn.install') + +_svntrunk=http://fuzemux.googlecode.com/svn/trunk/ +_svnmod=fuzemux + +build() { + cd "$srcdir" + + if [ -d $_svnmod/.svn ]; then + (cd $_svnmod && svn up -r $pkgver) + else + svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod + fi + + msg "SVN checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$_svnmod-build" + cp -r "$srcdir/$_svnmod" "$srcdir/$_svnmod-build" + cd "$srcdir/$_svnmod-build" + + # + # BUILD + # + /usr/bin/autoreconf --install + ./configure --prefix=/usr + make || return 1 + make DESTDIR="$pkgdir/" install +} +md5sums=() diff --git a/abs/extra/community/fuzemux/fuzemux-svn.install b/abs/extra/community/fuzemux/fuzemux-svn.install new file mode 100644 index 0000000..877ec1b --- /dev/null +++ b/abs/extra/community/fuzemux/fuzemux-svn.install @@ -0,0 +1,5 @@ +post_install() { + echo ">>>" + echo ">>> A user job script is supplied at /usr/LH/bin/myth2fuze" + echo ">>>" +} diff --git a/abs/extra/community/mediatomb/PKGBUILD b/abs/extra/community/mediatomb/PKGBUILD new file mode 100644 index 0000000..aaf4d58 --- /dev/null +++ b/abs/extra/community/mediatomb/PKGBUILD @@ -0,0 +1,57 @@ +# Orginal Contributor: William Rea +# Contributor: Nikhil Bysani +# Contributor: Mika HynnÀ + +# 20090525: +# + makedepends=('gcc' 'patch' 'make') +# + mediatomb-0.11.0+glibc-2.10.patch + +pkgname=mediatomb +pkgver=0.11.0 +pkgrel=10 +pkgdesc="A UPnP mediaserver" +arch=('i686' 'x86_64') +url="http://mediatomb.sourceforge.net" +license=('GPL') +depends=('libexif' 'taglib' 'sqlite3' 'expat' 'spidermonkey' 'curl' 'ffmpeg') +makedepends=('gcc' 'patch' 'make') +backup=(etc/conf.d/mediatomb) +source=( + http://mesh.dl.sourceforge.net/sourceforge/mediatomb/mediatomb-$pkgver.tar.gz \ + mediatomb.rc \ + mediatomb.conf \ + http://kapsi.fi/~ighea/arch/mediatomb-gcc-4.3.patch + mediatomb-0.11.0+glibc-2.10.patch +) + +build() +{ + cd $startdir/src/mediatomb-$pkgver || return 1 + patch -Np1 < ../mediatomb-gcc-4.3.patch || return 1 + patch -Np0 < ../mediatomb-0.11.0+glibc-2.10.patch || return 1 + + sed -e s/"ffmpeg\/avformat.h"/"libavformat\/avformat.h"/g -i configure + sed -e s/"ffmpeg\/avformat.h"/"libavformat\/avformat.h"/g -i configure.ac + sed -e s/"ffmpeg\/avformat.h"/"libavformat\/avformat.h"/g -i src/metadata/ffmpeg_handler.cc + + + ./configure --prefix=/usr --enable-mysql=no --enable-libmagic=yes \ + --enable-libjs=yes --enable-ffmpeg --with-ffmpeg-h=/usr/include/ || return 1 + + make || return 1 + make DESTDIR=$startdir/pkg install || return 1 + + # rc-script + mkdir -p $startdir/pkg/etc/rc.d/ || return 1 + install -m0755 ../mediatomb.rc $startdir/pkg/etc/rc.d/mediatomb || return 1 + + # config-file + mkdir -p $startdir/pkg/etc/conf.d/ || return 1 + install -m0644 ../mediatomb.conf $startdir/pkg/etc/conf.d/mediatomb || return 1 + +} +md5sums=('661f08933830d920de21436fe122fb15' + 'a7ff197d5760b20b04675ba67bfd9e86' + 'a4cbd08c32c93f116363a29bef60e21d' + 'eda28d01e035b3237566da5b1aad7712' + '3b895eabee88a0697b4fd0c30af6cab2') diff --git a/abs/extra/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch b/abs/extra/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch new file mode 100644 index 0000000..b1436c1 --- /dev/null +++ b/abs/extra/community/mediatomb/mediatomb-0.11.0+glibc-2.10.patch @@ -0,0 +1,23 @@ +--- src/tools.cc (revisione 2018) ++++ src/tools.cc (copia locale) +@@ -303,8 +303,8 @@ + Ref buf(new StringBuffer(len / 2)); + for (int i = 0; i < len; i += 2) + { +- char *chi = strchr(HEX_CHARS, ptr[i]); +- char *clo = strchr(HEX_CHARS, ptr[i + 1]); ++ const char *chi = strchr(HEX_CHARS, ptr[i]); ++ const char *clo = strchr(HEX_CHARS, ptr[i + 1]); + int hi, lo; + + if (chi) +@@ -397,7 +397,7 @@ + char clo = data[i++]; + int hi, lo; + +- char *pos; ++ const char *pos; + + pos = strchr(hex, chi); + if (!pos) + diff --git a/abs/extra/community/mediatomb/mediatomb-gcc-4.3.patch b/abs/extra/community/mediatomb/mediatomb-gcc-4.3.patch new file mode 100644 index 0000000..9440bec --- /dev/null +++ b/abs/extra/community/mediatomb/mediatomb-gcc-4.3.patch @@ -0,0 +1,24 @@ +# GCC-4.3 compatibility patch by Mika HynnÀ (ighea) +# +--- mediatomb-0.11.0/src/url.cc 2008-03-02 00:48:36.000000000 +0200 ++++ mediatomb-0.11.0.new/src/url.cc 2008-04-14 00:53:21.000000000 +0300 +@@ -75,7 +75,7 @@ + + if (only_header) + { +- curl_easy_setopt(curl_handle, CURLOPT_NOBODY); ++ curl_easy_setopt(curl_handle, CURLOPT_NOBODY,0); + curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl); + curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA, + (void *)buffer.getPtr()); +--- mediatomb-0.11.0/src/metadata/id3_handler.cc 2008-03-02 00:48:36.000000000 +0200 ++++ mediatomb-0.11.0.new/src/metadata/id3_handler.cc 2008-04-14 01:22:36.000000000 +0300 +@@ -36,6 +36,8 @@ + + #ifdef HAVE_ID3 + ++#include ++ + #ifdef HAVE_CONFIG_H + #undef HAVE_CONFIG_H // else utils.h from the id3 library tries to import "config.h" + diff --git a/abs/extra/community/mediatomb/mediatomb.conf b/abs/extra/community/mediatomb/mediatomb.conf new file mode 100644 index 0000000..339bd9e --- /dev/null +++ b/abs/extra/community/mediatomb/mediatomb.conf @@ -0,0 +1,5 @@ +# User to run the mediatomb as: +USER="" +# Extra parameters to pass to the daemon: +PARAMS="" + diff --git a/abs/extra/community/mediatomb/mediatomb.rc b/abs/extra/community/mediatomb/mediatomb.rc new file mode 100755 index 0000000..b3333cc --- /dev/null +++ b/abs/extra/community/mediatomb/mediatomb.rc @@ -0,0 +1,58 @@ +#!/bin/bash + +DESC="MediaTomb UPnP A/V Media Server" + +USER="" + +if [ "$(whoami)" != "root" ];then + echo "You must be root to start/restart/stop services." + exit 1 +fi + +. /etc/rc.conf +. /etc/rc.d/functions + +[ -r "/etc/conf.d/mediatomb" ] && . /etc/conf.d/mediatomb + +PID=`pidof -o %PPID /usr/bin/mediatomb` + +case "$1" in + start) + stat_busy "Starting $DESC" + if [ -z "$PID" ]; then + if [ -n "$USER" ]; then + echo -n "Starting as user: $USER" + su - $USER -c "/usr/bin/mediatomb -d $PARAMS &> /dev/null" || stat_fail + else + /usr/bin/mediatomb -d $PARAMS &> /dev/null || stat_fail + fi + PID=`pidof -o %PPID /usr/bin/mediatomb` + if [ -z "$PID" ]; then exit 1;fi + echo $PID > /var/run/mediatomb.pid + add_daemon mediatomb + stat_done + else + echo -n "Already running!" + stat_fail + fi + ;; + stop) + stat_busy "Stopping $DESC" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + echo -n "Not started!" + stat_fail + else + rm /var/run/mediatomb.pid + rm_daemon mediatomb + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/abs/extra/community/mobloquer/PKGBUILD b/abs/extra/community/mobloquer/PKGBUILD index eecdb4a..b6254d5 100644 --- a/abs/extra/community/mobloquer/PKGBUILD +++ b/abs/extra/community/mobloquer/PKGBUILD @@ -1,26 +1,26 @@ -# Contributor: marinz +# Contributor: Daniele Marinello pkgname=mobloquer -pkgver=0.5 -pkgrel=5 +pkgver=0.6 +pkgrel=6 pkgdesc="A graphical front end for moblock" arch=('i686' 'x86_64') url="http://mobloquer.foutrelis.com/" license=('GPL') -depends=('qt' 'moblockcontrol') -source=(http://download.sourceforge.net/mobloquer/$pkgname-$pkgver.tar.gz) -md5sums=('2adb03d170fa0e9a7ffcc9dac8d71bf5') +depends=('qt' 'blockcontrol') +source=(http://downloads.sourceforge.net/mobloquer/$pkgname-$pkgver.tar.gz) +md5sums=('6363ee4c42da1d85367fdd65d4bf42ca') build() { - cd $startdir/src/$pkgname + cd $startdir/src/$pkgname-$pkgver qmake make || return 1 - - install -d ${pkgdir}/usr/share/applications ${pkgdir}/usr/bin - install -m 755 -p $startdir/src/mobloquer/images/mobloquer.png $startdir/pkg/usr/share/pixmaps/ - install -m 644 -p $startdir/src/mobloquer/other/Mobloquer.desktop $startdir/pkg/usr/share/applications/ - install -m 755 -p $startdir/src/mobloquer/mobloquer $startdir/pkg/usr/bin/mobloquer + + install -d ${pkgdir}/usr/share/applications ${pkgdir}/usr/bin ${pkgdir}/usr/share/pixmaps + install -m 644 -p $startdir/src/$pkgname-$pkgver/images/mobloquer.png $startdir/pkg/usr/share/pixmaps/ + install -m 644 -p $startdir/src/$pkgname-$pkgver/other/Mobloquer.desktop $startdir/pkg/usr/share/applications/ + install -m 755 -p $startdir/src/$pkgname-$pkgver/mobloquer $startdir/pkg/usr/bin/mobloquer } diff --git a/abs/extra/community/mre/PKGBUILD b/abs/extra/community/mre/PKGBUILD new file mode 100644 index 0000000..72d3bc3 --- /dev/null +++ b/abs/extra/community/mre/PKGBUILD @@ -0,0 +1,41 @@ +arch=('i686') +pkgname=mre +pkgver=1.1.2 +pkgrel=2 +_kernver=2.6.28-LinHES +pkgdesc="Myth Recording Extender" +url="http://sourceforge.net/projects/mythtv-tools/" +license=('GPL-2') +depends=('PearDB' 'PearLog') +makedepends=() +source=('mre-1.1.2.tar.gz' 'patch.diff' 'livescores.tgz' 'run' 'mre.lr') +install=('mre.install') + +build() { + cd $startdir/src/mre-1.1.2/ + patch -p0 < ../patch.diff + ./configure + make INST_ROOT=$startdir/pkg install + cp $startdir/src/mre-1.1.2/conf/mre.conf $startdir/pkg/etc/mre.conf + cp $startdir/src/mre-1.1.2/test/test_title_subtitle.php\ + $startdir/pkg/usr/local/bin/ + chmod a+x $startdir/pkg/usr/local/bin/test_title_subtitle.php + rm -r $startdir/pkg/etc/init.d + mkdir -p $startdir/pkg/var/log/mre + touch $startdir/pkg/var/log/mre/mre.log + chown mythtv:mythtv "$startdir/pkg/var/log/mre/mre.log" + mkdir -p $startdir/pkg/etc/sv/mre + cp $startdir/src/run $startdir/pkg/etc/sv/mre/run + mkdir -p $startdir/pkg/etc/logrotate.d + cp $startdir/src/mre.lr $startdir/pkg/etc/logrotate.d/mre.lr + mkdir -p $startdir/pkg/data/srv/http/htdocs/ + cp -r $startdir/src/scores /$startdir/pkg/data/srv/http/htdocs/ + chown -R http:users "$startdir/pkg/data/srv/http/htdocs/scores" +} + + +md5sums=('8ab312e7597ae9413a57bd5e9a068096' + 'd2591989da512c0faa567408721b6e95' + 'fcc02a234b22ba5c2714a6b8dbaf3bef' + 'dea22d4e0f2c1dd8a2debd2f50756dda' + '6d71ab57afd974c5130c994b94e8746f') diff --git a/abs/extra/community/mre/livescores.tgz b/abs/extra/community/mre/livescores.tgz new file mode 100644 index 0000000..d97175b Binary files /dev/null and b/abs/extra/community/mre/livescores.tgz differ diff --git a/abs/extra/community/mre/mre-1.1.2.tar.gz b/abs/extra/community/mre/mre-1.1.2.tar.gz new file mode 100644 index 0000000..3846e4b Binary files /dev/null and b/abs/extra/community/mre/mre-1.1.2.tar.gz differ diff --git a/abs/extra/community/mre/mre.install b/abs/extra/community/mre/mre.install new file mode 100755 index 0000000..4e3fb0d --- /dev/null +++ b/abs/extra/community/mre/mre.install @@ -0,0 +1,20 @@ +# arg 1: the new package version +post_install() { + add_service.sh mre + sed -i.pacsave '/^open_basedir/s|$|:/var/log/mre:/usr/local/lib/mre|' /etc/php/php.ini +} + +post_upgrade() { + +} + + +# arg 1: the old package version +post_remove() { + remove_service.sh mre + sed -i.pacsave '/^open_basedir/s|:/var/log/mre:/usr/local/lib/mre||' /etc/php/php.ini +} + +op=$1 +shift +$op $* diff --git a/abs/extra/community/mre/mre.lr b/abs/extra/community/mre/mre.lr new file mode 100644 index 0000000..3b54c23 --- /dev/null +++ b/abs/extra/community/mre/mre.lr @@ -0,0 +1,9 @@ +/var/log/mre/mre.log { + copytruncate + daily + size 10M + missingok + rotate 7 + compress + notifempty +} diff --git a/abs/extra/community/mre/patch.diff b/abs/extra/community/mre/patch.diff new file mode 100644 index 0000000..66390d9 --- /dev/null +++ b/abs/extra/community/mre/patch.diff @@ -0,0 +1,273 @@ +--- ../mre-1.1.2/class/MythClient.php.original 2006-04-05 17:39:13.000000000 -0500 ++++ ../mre-1.1.2/class/MythClient.php 2010-05-14 10:16:54.000000000 -0500 +@@ -112,7 +112,7 @@ + return '0'; + } + foreach($out as $line) +- if(preg_match('/^Library API version: (.*)$/', $line, $matches)) ++ if(preg_match('/^Library API *: (.*)$/', $line, $matches)) + return $matches[1]; + return '0'; + } +--- ../mre-1.1.2/class/NHLEvent.php.original 2006-11-05 17:06:57.000000000 -0600 ++++ ../mre-1.1.2/class/NHLEvent.php 2010-05-21 00:44:49.000000000 -0500 +@@ -27,7 +27,7 @@ + /** + * URL to grab game info from + */ +- const url = 'http://scores.espn.go.com/nhl/scoreboard'; ++ const url = 'http://localhost/scores/nhl.php'; + + /** + * Class constructor. +@@ -39,32 +39,27 @@ + parent::__construct(); + + $criteria = $this->generateSearchTerms($gameInfo); ++ + if(!sizeof($criteria)) + trigger_error("Unable to generate valid search terms! [$gameInfo]", E_USER_WARNING); + else + { + $data = file(self::url); +- if($data !== FALSE) +- foreach($criteria as $term) +- { +- $status = ''; +- foreach($data as $line) +- if(preg_match('/' . preg_quote($term) . '/', $line)) +- { +- $status = $line; +- break; +- } +- if(preg_match('/id.*st"\>(.*)\<\/td/U', $status, $match)) +- { +- $this->setStatus($match[1]); +- if(preg_match('/^Final/', $match[1])) +- $this->setEventOver(TRUE); +- else +- $this->setEventOver(FALSE); +- $this->setValid(TRUE); +- break; +- } ++ if($data) ++ { ++ foreach($data as $line) ++ { ++ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) ++ { ++ if(strpos($line,'FINAL')) ++ $this->setEventOver(TRUE); ++ else ++ $this->setEventOver(FALSE); ++ $this->setValid(TRUE); ++ break; ++ } + } ++ } + } + if(!$this->isValid()) + trigger_error("Unable to find NHL info for '$gameInfo'! The NHL parser may need to be updated.", E_USER_WARNING); +--- ../mre-1.1.2/conf/mre.conf.in.original 2006-08-13 16:48:57.000000000 -0500 ++++ ../mre-1.1.2/conf/mre.conf.in 2010-05-04 00:25:26.000000000 -0500 +@@ -28,9 +28,9 @@ + ; *** Application settings + ; Unprivledged user to run as, if started as root + ; This script will not run as root +-user = nobody ++user = mythtv + ; Run MRE as daemon? Requires pcntl_* functions built into PHP +-daemon = true ++daemon = false + ; Number of minutes to sleep between runs + sleep = 5 + ; Logging level (0 = normal, 1 = +error, 2 = +warning, 3 = +debug) +--- ../mre-1.1.2/class/MLBEvent.php.original 2006-11-05 17:06:57.000000000 -0600 ++++ ../mre-1.1.2/class/MLBEvent.php 2010-05-21 20:08:30.000000000 -0500 +@@ -27,7 +27,7 @@ + /** + * URL to grab game info from + */ +- const url = 'http://scores.espn.go.com/mlb/scoreboard'; ++ const url = 'http://localhost/scores/mlb.php'; + + /** + * Class constructor. +@@ -43,41 +43,22 @@ + trigger_error("Unable to generate valid search terms! [$gameInfo]", E_USER_WARNING); + else + { +- $data = file(self::url); +- $games = array(); +- if($data !== FALSE) +- { +- // Split the huge string into individual game data +- foreach($data as $line) +- if(preg_match('/\
.*/', $line)) +- { +- while(($loc = strrpos($line, 'teamTop')) !== FALSE) +- { +- $games[] = substr($line, $loc); +- $line = substr($line, 0, $loc); +- } +- break; +- } +- if(!sizeof($games)) +- trigger_error("Unable to find valid game data within source!", E_USER_WARNING); +- foreach($criteria as $term) +- { +- foreach($games as $game) +- { +- if(preg_match('/' . preg_quote($term) . '/', $game)) +- if(preg_match('/teamTop.*\>(.*)\<\/td\>/U', $game, $matches)) +- { +- $this->setStatus($matches[1]); +- if(preg_match('/^(Final|Postponed)/', $matches[1])) +- $this->setEventOver(TRUE); +- else +- $this->setEventOver(FALSE); +- $this->setValid(TRUE); +- break 2; +- } +- } ++ $data = file(self::url); ++ if($data) ++ { ++ foreach($data as $line) ++ { ++ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) ++ { ++ if((strpos($line,'FINAL'))or(strpos($line,'Postponed'))) ++ $this->setEventOver(TRUE); ++ else ++ $this->setEventOver(FALSE); ++ $this->setValid(TRUE); ++ break; ++ } + } +- } ++ } + } + if(!$this->isValid()) + trigger_error("Unable to find MLB info for '$gameInfo'! The MLB parser may need to be updated.", E_USER_WARNING); +--- ../mre-1.1.2/class/NBAEvent.php.original 2006-11-05 17:06:57.000000000 -0600 ++++ ../mre-1.1.2/class/NBAEvent.php 2010-05-21 21:15:42.000000000 -0500 +@@ -27,7 +27,7 @@ + /** + * URL to grab game info from + */ +- const url = 'http://scores.espn.go.com/nba/scoreboard'; ++ const url = 'http://localhost/scores/nba.php'; + + /** + * Class constructor. +@@ -44,35 +44,21 @@ + else + { + $data = file(self::url); +- if($data !== FALSE) +- foreach($criteria as $term) +- { +- $status = ''; +- $i = 0; +- while($i < sizeof($data)) +- { +- if(preg_match('/' . preg_quote($term) . '/', $data[$i])) +- { +- $status = $data[$i]; +- break; +- } +- ++$i; +- } +- if($i == sizeof($data)) +- --$i; +- +- if(preg_match('/id.*clock"\>(.*)\<\/div/U', $data[$i], $match) || +- preg_match('/id.*clock"\>(.*)\<\/div/U', $data[$i-1], $match)) +- { +- $this->setStatus($match[1]); +- if(preg_match('/^Final/', $match[1])) +- $this->setEventOver(TRUE); +- else +- $this->setEventOver(FALSE); +- $this->setValid(TRUE); +- break; +- } ++ if($data) ++ { ++ foreach($data as $line) ++ { ++ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) ++ { ++ if(strpos($line,'FINAL')) ++ $this->setEventOver(TRUE); ++ else ++ $this->setEventOver(FALSE); ++ $this->setValid(TRUE); ++ break; ++ } + } ++ } + } + if(!$this->isValid()) + trigger_error("Unable to find NBA info for '$gameInfo'! The NBA parser may need to be updated.", E_USER_WARNING); +--- ../mre-1.1.2/class/NFLEvent.php.original 2006-11-05 17:06:57.000000000 -0600 ++++ ../mre-1.1.2/class/NFLEvent.php 2010-05-21 19:09:36.000000000 -0500 +@@ -27,7 +27,7 @@ + /** + * URL to grab game info from + */ +- const url = 'http://scores.espn.go.com/nfl/scoreboard'; ++ const url = 'http://localhost/scores/nfl.php'; + + /** + * Class constructor. +@@ -44,33 +44,21 @@ + else + { + $data = file(self::url); +- $games = array(); +- if($data !== FALSE) +- { +- // Split the huge string into individual game data +- foreach($data as $line) +- if(preg_match('/\.*/', $line)) +- $games[] = $line; +- if(!sizeof($games)) +- trigger_error("Unable to find valid game data within source!", E_USER_WARNING); +- foreach($criteria as $term) +- { +- foreach($games as $game) +- { +- if(preg_match('/' . preg_quote($term) . '/', $game)) +- if(preg_match('/teamTop.*\>(.*)\<\/td\>/U', $game, $matches)) +- { +- $this->setStatus($matches[1]); +- if(preg_match('/^(Final|Postponed)/', $matches[1])) +- $this->setEventOver(TRUE); +- else +- $this->setEventOver(FALSE); +- $this->setValid(TRUE); +- break 2; +- } +- } +- } +- } ++ if($data) ++ { ++ foreach($data as $line) ++ { ++ if((strpos($line,$criteria[0]))&&(strpos($line,$criteria[1]))) ++ { ++ if(strpos($line,'FINAL')) ++ $this->setEventOver(TRUE); ++ else ++ $this->setEventOver(FALSE); ++ $this->setValid(TRUE); ++ break; ++ } ++ } ++ } + } + if(!$this->isValid()) + trigger_error("Unable to find NFL info for '$gameInfo'! The NFL parser may need to be updated.", E_USER_WARNING); diff --git a/abs/extra/community/mre/run b/abs/extra/community/mre/run new file mode 100755 index 0000000..84d08e5 --- /dev/null +++ b/abs/extra/community/mre/run @@ -0,0 +1,10 @@ +#!/bin/bash +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting mythrecordingextender" + +sv start mythbackend || exit 1 +sleep 5 + +exec /usr/local/bin/mre.php diff --git a/abs/extra/community/mythpywii/CONTROLS b/abs/extra/community/mythpywii/CONTROLS new file mode 100644 index 0000000..d733964 --- /dev/null +++ b/abs/extra/community/mythpywii/CONTROLS @@ -0,0 +1,25 @@ + * Keypad : same as keypad on keyboard + * A : Enter (Accept, OK, next, .) + * Minus (-) : d (Delete) + * Home : escape (Exit to previous menu/exit mythfrontend) + * Plus (+) : p (Play/pause) + * 1 : Info + * 2 : Menu + * B + left : rewind to beginning of video + * B + twist wiimote : rewind (if twisted to the left) or fastforward + (otherwise) with speed dependant on twist amount. + * B + A + twist wiimote: timestretching . slower (if twisted left) or + faster (if twisted right) + +A comment on twisting: +Point the wii remote at the screen, and twist from the elbow so that it + continues to point at the screen. + +The maximum fastforward/rewind speed is 180x. The speeds are dictated by +mythfrontend itself. When you rotate the wiimote, you will feel a slight +vibration (0.05 seconds) to let you know you have gone up or down a speed +segment. To stop fastforwarding/rewinding, simply let go of B. + +Beware: there is no power saving built in. However you should be able to +turn the wiimote off (power button) when not in use, and turn it back on +by holding down 1 and 2 to make it sync. diff --git a/abs/extra/community/mythpywii/PKGBUILD b/abs/extra/community/mythpywii/PKGBUILD index 4b57c77..38e456f 100644 --- a/abs/extra/community/mythpywii/PKGBUILD +++ b/abs/extra/community/mythpywii/PKGBUILD @@ -2,17 +2,27 @@ # Maintainer: Cecil Watson pkgname=mythpywii -pkgver=1 -pkgrel=1 +pkgver=17 +pkgrel=8 pkgdesc="Control MythTV using Wiimote." arch=('i686' 'x86_64') license=('GPL2') url="http://www.benjiegillam.com/" depends=('bluez' 'python-pybluez' 'cwiid-svn') -#install=mythpywii.install -source=(http://www.benjiegillam.com/code/myth_py_wii.py) +install=mythpywii.install +source=(http://www.benjiegillam.com/code/myth_py_wii.py \ + wiimote.rules mythpywii.install CONTROLS) build() { - mkdir -p $startdir/pkg/usr/bin - install -D -m 755 myth_py_wii.py $startdir/pkg/usr/bin + install -D -m755 ${srcdir}/myth_py_wii.py ${startdir}/pkg/usr/bin/myth_py_wii.py || return 1 + install -D -m644 ${srcdir}/wiimote.rules ${startdir}/pkg/etc/udev/rules.d/z90-wiimote.rules || return 1 + install -d -o mythtv -g mythtv ${startdir}/pkg/home/mythtv/.cwiid/wminput || return 1 + install -D -m755 -o mythtv -g mythtv /etc/cwiid/wminput/{acc_led,buttons,gamepad,neverball,nunchuk_stick2btn,acc_ptr,ir_ptr,nunchuk_acc_ptr} ${startdir}/pkg/home/mythtv/.cwiid/wminput || return 1 + install -D -m644 ${srcdir}/CONTROLS ${startdir}/pkg/usr/share/docs/mythpywii/CONTROLS || return 1 + cd ${startdir}/pkg/home/mythtv/.cwiid/wminput + ln -s acc_led default } +md5sums=('5bd5e1bb9c4cbfabbffdb28ff616e83b' + '0d817a971d414b9320587a4cf289386b' + '64fa8dbd324dac68f71753ebd828d358' + '0872cbdb3def3dd9aa2b97b191ad76d8') diff --git a/abs/extra/community/mythpywii/mythpywii.install b/abs/extra/community/mythpywii/mythpywii.install new file mode 100644 index 0000000..8d0b867 --- /dev/null +++ b/abs/extra/community/mythpywii/mythpywii.install @@ -0,0 +1,59 @@ +post_install() { + . /home/mythtv/.mythtv/mysql.txt + # Enable the Network Remote Control Interface for use with the wiimote. + # Get local machine's hostname + HOST=`cat /etc/hostname` + # Update mysql for Network Remote Control Support + mysql -u mythtv -pmythtv --host=${DBHostName} mythconverg -e \ + "UPDATE settings SET data = '1' WHERE value = 'NetworkControlEnabled' AND hostname = '${HOST}'"; + echo "------------------------------------------------------------" + echo "myth_py_wii.py expects the Network Control Port to be set to" + echo "mythtv's default port of 6546. It will not work if you have" + echo "changed it to something else." + echo "------------------------------------------------------------" + # Add myth_py_wii.py to ~/mythtv/.fluxbox/apps before LinHES-run + sed -i '/LinHES-run/ i [startup] {/usr/bin/myth_py_wii.py >/dev/null}' /home/mythtv/.fluxbox/apps + # udev needs to pick up our new rule for the mythpywii. + udevadm trigger --subsystem-match="misc" --subsystem-match="bluetooth" + # Add the uinput module + modprobe uinput + # Ensure this module is loaded across reboots + echo "# uinput is needed by mythpywii" >> /etc/modules.mythvantage + echo "uinput" >> /etc/modules.mythvantage + # Bring up the bluetooth interface -- udev will do this after reboot + /usr/sbin/hciconfig hci0 up + # Punting on the multiple bluetooth adapter question. + echo "It is assumed your bluetooth adapter will be hci0." + echo "If you have more than one bluetooth adapter, you" + echo "may need to edit /etc/udev/rules.d/z90-wiimote.rules" + echo "--------------------------------------------------------------" + echo "--------------------------------------------------------------" + # Unfortunately there does not seem to be a way to do this without + # the user manually intervening. + echo "To use your wiimote you will need to restart the frontend service." + echo "$ sudo sv restart frontend" + echo "or simply reboot your machine." + echo "--------------------------------------------------------------" + echo "--------------------------------------------------------------" + echo "After frontend restart, you should now be able to pair your" + echo "Wiimote with your bluetooth adapter by pressing 1 & 2 at the" + echo "same time. After a few seconds the wiimote should vibrate and the" + echo "LEDs will show [ # . . # ] where # is on and . is off." + echo "--------------------------------------------------------------" + echo "See /usr/share/docs/mythpywii/CONTROLS for more information." + echo "--------------------------------------------------------------" +} + +post_remove() { + . /home/mythtv/.mythtv/mysql.txt + # kill myth_py_wii.py + WIIPID=`pidof -o %PPID /usr/bin/myth_py_wii.py` + [ -n "$WIIPID" ] && kill $WIIPID + # Remove uinput + sed -i '/uinput/d' /etc/modules.mythvantage + # Remove line in .fluxbox/apps + sed -i '/myth_py_wii.py/d' /home/mythtv/.fluxbox/apps + # Remove network remote control support + mysql -u mythtv -pmythtv --host=${DBHostName} mythconverg -e \ + "UPDATE settings SET data = '0' WHERE value = 'NetworkControlEnabled' AND hostname = '${HOST}'"; +} diff --git a/abs/extra/community/mythpywii/wiimote.rules b/abs/extra/community/mythpywii/wiimote.rules new file mode 100644 index 0000000..4bb2d9d --- /dev/null +++ b/abs/extra/community/mythpywii/wiimote.rules @@ -0,0 +1,6 @@ +# For Bluetooth/Wiimote + KERNEL=="uinput", MODE="0660", GROUP="mythtv" + +# Automaticly bring up/down the bluetooth interface + ACTION=="add", KERNEL=="hci%n", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/hciconfig hci%n up" + ACTION=="remove", KERNEL=="hci%n", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/hciconfig hci%n down" diff --git a/abs/extra/community/network-ups-tools/PKGBUILD b/abs/extra/community/network-ups-tools/PKGBUILD new file mode 100644 index 0000000..1644c2e --- /dev/null +++ b/abs/extra/community/network-ups-tools/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 12757 2010-03-13 04:22:57Z dgriffiths $ +# Maintainer: Roman Kyrylych +# Contributor: Giuseppe Lucarelli + +pkgname=network-ups-tools +pkgver=2.4.3 +pkgrel=5 +pkgdesc="NUT is a collection of programs for monitoring and administering UPS hardware" +arch=('i686' 'x86_64') +url="http://www.networkupstools.org/" +license=('GPL2') +depends=('openssl' 'hal' 'gd') +makedepends=('libusb') +backup=(etc/ups/{ups.conf,upsd.conf,upsd.users,upsmon.conf,upssched.conf}) +install=nut.install +source=(http://www.networkupstools.org/source/2.4/nut-$pkgver.tar.gz run.upsd finish.upsd) +options=('!emptydirs' '!libtool') + +build() { +cd $srcdir/nut-$pkgver +./configure --with-user=nut \ +--prefix=/usr \ +--datadir=/usr/share/ups \ +--sysconfdir=/etc/ups \ +--with-group=nut \ +--with-hal \ +--with-usb \ +--with-cgi \ +--with-cgipath=/usr/share/webapps/nut \ +--with-htmlpath=/usr/share/webapps/nut \ +--with-udev-dir=/etc/udev || return 1 + + make || return 1 + make DESTDIR=$pkgdir install + #ugly hack because --with-pkgconfig-dir doesn't work + install -D -m644 lib/libupsclient.pc $pkgdir/usr/lib/pkgconfig + + install -D -m644 conf/ups.conf.sample $pkgdir/etc/ups/ups.conf + install -D -m640 conf/upsd.conf.sample $pkgdir/etc/ups/upsd.conf + install -D -m640 conf/upsd.users.sample $pkgdir/etc/ups/upsd.users + install -D -m640 conf/upsmon.conf.sample $pkgdir/etc/ups/upsmon.conf + install -D -m644 conf/upssched.conf.sample $pkgdir/etc/ups/upssched.conf + install -D -m755 ../run.upsd $pkgdir/etc/sv/upsd/run || return 1 + install -D -m755 ../finish.upsd $pkgdir/etc/sv/upsd/finish || return 1 + + # Fix udev rules + sed -i "s|SYSFS|ATTRS|g" $pkgdir/etc/udev/rules.d/52-nut-usbups.rules + install -dm755 ${pkgdir}/lib + mv ${pkgdir}/etc/udev ${pkgdir}/lib +} +md5sums=('6f893b61b07915e7a139324fa3f79121' + 'd7af81650a966660f6fd41f957c66165' + 'd50f13385848a9bb8f8cbc9ee5dd9fd5') diff --git a/abs/extra/community/network-ups-tools/finish.upsd b/abs/extra/community/network-ups-tools/finish.upsd new file mode 100644 index 0000000..8eb335b --- /dev/null +++ b/abs/extra/community/network-ups-tools/finish.upsd @@ -0,0 +1,16 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/upsd` + stat_runit "Stopping UPSd Daemon" + /usr/bin/upsdrvctl stop &> /dev/null + /usr/sbin/upsmon -c stop &> /dev/null + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon upsd + stat_done + fi diff --git a/abs/extra/community/network-ups-tools/nut.install b/abs/extra/community/network-ups-tools/nut.install new file mode 100644 index 0000000..1e6beee --- /dev/null +++ b/abs/extra/community/network-ups-tools/nut.install @@ -0,0 +1,21 @@ +post_install() { + groupadd -g 55 nut &> /dev/null + useradd -u 55 -g nut -G tty -d /var/state/ups -s /bin/false nut >/dev/null 2>&1 + mkdir -p /var/state/ups/ + chmod 0770 /var/state/ups/ + chown root:nut /var/state/ups/ + chown root:nut /etc/ups/upsd.conf /etc/ups/upsd.users /etc/ups/upsmon.conf + echo ">>> Before starting your UPSd daemon, it is imperative" + echo ">>> that you read through and edit where needed these files:" + echo ">>> /etc/ups/{ups.conf,upsd.conf,upsmon.conf,upsd.users}" + echo ">>>" + echo ">>> Then add the the upsd service:" + echo ">>> $ sudo add_service.sh upsd" +} + +pre_remove() { + remove_service.sh upsd + userdel nut >/dev/null 2>&1 + groupdel nut >/dev/null 2>&1 + rm -rf /var/state/ups/ +} diff --git a/abs/extra/community/network-ups-tools/run.upsd b/abs/extra/community/network-ups-tools/run.upsd new file mode 100644 index 0000000..83be88d --- /dev/null +++ b/abs/extra/community/network-ups-tools/run.upsd @@ -0,0 +1,21 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/upsd` + + stat_runit "Starting UPSd Daemon" + /usr/bin/upsdrvctl start &> /dev/null + [ -z "$PID" ] && /usr/sbin/upsd &>/dev/null + /usr/sbin/upsmon &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon upsd + stat_done + fi + + while [ -n $PID ] ; do + sleep 60 + done diff --git a/abs/extra/community/peardb/PKGBUILD b/abs/extra/community/peardb/PKGBUILD new file mode 100755 index 0000000..dafe00f --- /dev/null +++ b/abs/extra/community/peardb/PKGBUILD @@ -0,0 +1,22 @@ +arch=('i686') +pkgname=PearDB +pkgver=1.7.13 +pkgrel=1 +_kernver=2.6.28-LinHES +pkgdesc="Pear Database Abstraction Layer" +url="http://pear.php.net/" +license=('GPL-2') +source=('http://download.pear.php.net/package/DB-1.7.13.tgz') +#install=('') + +build() { + mkdir -p $startdir/pkg/usr/share/pear/ + cp -r $startdir/src/DB-$pkgver/DB* $startdir/pkg/usr/share/pear/ + mkdir -p $startdir/pkg/usr/share/pear/docs/DB/ + cp -r $startdir/src/DB-$pkgver/doc/* $startdir/pkg/usr/share/pear/docs/DB/ + mkdir -p $startdir/pkg/usr/share/pear/tests/DB/ + cp -r $startdir/src/DB-$pkgver/tests/* $startdir/pkg/usr/share/pear/tests/DB/ + + } + +md5sums=('39b451245941a7059511a852f18b4946') diff --git a/abs/extra/community/pearlog/PKGBUILD b/abs/extra/community/pearlog/PKGBUILD new file mode 100755 index 0000000..5bc4ccc --- /dev/null +++ b/abs/extra/community/pearlog/PKGBUILD @@ -0,0 +1,25 @@ +arch=('i686') +pkgname=PearLog +pkgver=1.12.0 +pkgrel=1 +_kernver=2.6.28-LinHES +pkgdesc="Pear Logging Framework" +url="http://pear.php.net/" +license=('GPL-2') +source=('http://download.pear.php.net/package/Log-1.12.0.tgz') +#install=('') + +build() { + mkdir -p $startdir/pkg/usr/share/pear/ + cp -r $startdir/src/Log-$pkgver/Log* $startdir/pkg/usr/share/pear/ + mkdir -p $startdir/pkg/usr/share/pear/docs/Log + cp -r $startdir/src/Log-$pkgver/docs/* $startdir/pkg/usr/share/pear/docs/Log/ + mkdir -p $startdir/pkg/usr/share/pear/examples/Log + cp -r $startdir/src/Log-$pkgver/examples/* $startdir/pkg/usr/share/pear/examples/Log/ + mkdir -p $startdir/pkg/usr/share/pear/misc/Log + cp -r $startdir/src/Log-$pkgver/misc/* $startdir/pkg/usr/share/pear/misc/Log/ + mkdir -p $startdir/pkg/usr/share/pear/tests/Log + cp -r $startdir/src/Log-$pkgver/tests/* $startdir/pkg/usr/share/pear/tests/Log/ + } + +md5sums=('7fe68920afc4b122cb15aba40d735cb6') diff --git a/abs/extra/community/powernowd/PKGBUILD b/abs/extra/community/powernowd/PKGBUILD new file mode 100644 index 0000000..f784523 --- /dev/null +++ b/abs/extra/community/powernowd/PKGBUILD @@ -0,0 +1,28 @@ +# Contributor: kastor + +pkgname=powernowd +pkgver=1.00 +pkgrel=2 +pkgdesc="Program for powering down CPUs dynamicly" +arch=('i686' 'x86_64') +url="http://www.deater.net/john/powernowd.html" +license="GPL" +depends=('glibc') +source=(http://www.deater.net/john/$pkgname-$pkgver.tar.gz \ + run finish powernowd.install powernowd.conf.d) +install=($pkgname.install) + +build() { + cd $startdir/src/$pkgname-$pkgver + make || return 1 + install -D -m755 powernowd $startdir/pkg/usr/sbin/powernowd || return 1 + mkdir -p $startdir/pkg/etc/sv/powernowd || return 1 + install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/powernowd || return 1 + install -D -m755 $startdir/src/finish $startdir/pkg/etc/sv/powernowd || return 1 + install -D -m644 $startdir/src/powernowd.conf.d $startdir/pkg/etc/conf.d/powernowd || return 1 +} +md5sums=('abc48b690d104e9e71a85400ba19d799' + 'ffd9b939665f74dac2220b4311482e04' + '13c6591ffc27d0b16f41f7892671302f' + 'dcbf8e98425b208c29f4c06b687dd0d0' + 'c9385af22c7c74e6cd6bdc982f94644f') diff --git a/abs/extra/community/powernowd/finish b/abs/extra/community/powernowd/finish new file mode 100644 index 0000000..97e3034 --- /dev/null +++ b/abs/extra/community/powernowd/finish @@ -0,0 +1,25 @@ +#!/bin/bash + +# AUR Credits: +# simple init script the ARCH-way for Powernowd +# Made by, CyberTron, packages@linuxportalen.com + +# Modifications by Alexander Baldeck + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/powernowd` + +[ -f /etc/conf.d/powernowd ] && source /etc/conf.d/powernowd + + stat_runit "Stopping Powernowd" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm /var/run/powernowd.pid + rm_daemon powernowd + stat_done + fi diff --git a/abs/extra/community/powernowd/powernowd.conf.d b/abs/extra/community/powernowd/powernowd.conf.d new file mode 100644 index 0000000..287c2bc --- /dev/null +++ b/abs/extra/community/powernowd/powernowd.conf.d @@ -0,0 +1,6 @@ +# Configuration file for powernowd + +# If no options given, powernowd should be able to autodetect +# a sane setup. So most users will not have to put anything +# here. +OPTIONS="-d" diff --git a/abs/extra/community/powernowd/powernowd.install b/abs/extra/community/powernowd/powernowd.install new file mode 100644 index 0000000..af218af --- /dev/null +++ b/abs/extra/community/powernowd/powernowd.install @@ -0,0 +1,19 @@ +post_install() { + add_service.sh powernowd + + echo "Be sure to modprobe the proper module for your CPU and then add it + echo "to /etc/rc.conf in the MODULES section." + echo "i.e. for a Core2Duo modprobe/add acpi_cpufreq" + echo "Then restart the powernowd service: sudo sv restart powernowd" +} + +post_upgrade() { + echo "Be sure to modprobe the proper module for your CPU and then add it + echo "to /etc/rc.conf in the MODULES section." + echo "i.e. for a Core2Duo modprobe/add acpi_cpufreq" + echo "Then restart the powernowd service: sudo sv restart powernowd" +} + +pre_remove() { + remove_service.sh powernowd +} diff --git a/abs/extra/community/powernowd/run b/abs/extra/community/powernowd/run new file mode 100644 index 0000000..0e83b98 --- /dev/null +++ b/abs/extra/community/powernowd/run @@ -0,0 +1,25 @@ +#!/bin/bash + +# AUR Credits: +# simple init script the ARCH-way for Powernowd +# Made by, CyberTron, packages@linuxportalen.com + +# Modifications by Alexander Baldeck + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/powernowd` + +[ -f /etc/conf.d/powernowd ] && source /etc/conf.d/powernowd + + stat_runit "Starting Powernowd" + [ -z "$PID" ] && /usr/sbin/powernowd $OPTIONS 2>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + echo $PID > /var/run/powernowd.pid + add_daemon powernowd + stat_done + fi diff --git a/abs/extra/community/squeezeboxserver/PKGBUILD b/abs/extra/community/squeezeboxserver/PKGBUILD new file mode 100644 index 0000000..45db11f --- /dev/null +++ b/abs/extra/community/squeezeboxserver/PKGBUILD @@ -0,0 +1,34 @@ +# Contributor: Anton Prins + +pkgname=squeezeboxserver +pkgver=7.4.1 +pkgrel=1 +pkgdesc="Powerful streaming audio server from Slim Devices" +depends=( +# unknown to me, default arch install + openssh handles it + ) + +source=(http://downloads.slimdevices.com/SqueezeboxServer_v${pkgver}/squeezeboxserver-${pkgver}.tgz + $pkgname.rc + $pkgname.conf.d + ) + +url="http://www.slimdevices.com/pi_features.html" +license=('GPL') +arch=('i686' 'x86_64') +install=squeezeboxserver.install + +#not sure how to handle the build number -28947? +build() { +cd $startdir/src/squeezeboxserver-${pkgver}-28947 || return 1 + +mkdir -p $startdir/pkg/home/squeezeboxserver || return 1 +cp -a * $startdir/pkg/home/squeezeboxserver || return 1 +install -D -m755 ../squeezeboxserver.rc $startdir/pkg/etc/rc.d/squeezeboxserver || return 1 +install -D -m644 ../squeezeboxserver.conf.d $startdir/pkg/etc/conf.d/squeezeboxserver || return 1 +mkdir $startdir/pkg/home/squeezeboxserver/prefs +} + +md5sums=('fa65636e7df75ae7af884a2efa184639' + '5e57982c257797badbf72c2ae04994f7' + 'aa65896541958e119e63ee7c96be39af') diff --git a/abs/extra/community/squeezeboxserver/squeezeboxserver.conf.d b/abs/extra/community/squeezeboxserver/squeezeboxserver.conf.d new file mode 100644 index 0000000..d14a2e9 --- /dev/null +++ b/abs/extra/community/squeezeboxserver/squeezeboxserver.conf.d @@ -0,0 +1,7 @@ +# Configuration file for SqueezeCenter on Arch Linux. +# Save this as /etc/conf.d/squeezeboxserver + +# Enter space-delimited options on the following line. +# e.g. SQUEEZEBOXSERVER_OPTS="--diag --d_scan --d_command" +# See "/home/squeezeboxserver/slimserver.pl --help" for a full list of possible options. +SQUEEZEBOXSERVER_OPTS="" diff --git a/abs/extra/community/squeezeboxserver/squeezeboxserver.install b/abs/extra/community/squeezeboxserver/squeezeboxserver.install new file mode 100644 index 0000000..058de02 --- /dev/null +++ b/abs/extra/community/squeezeboxserver/squeezeboxserver.install @@ -0,0 +1,56 @@ +post_install() { +echo -n "adding squeezeboxserver user... " +useradd -c "SqueezeBoxServer" -g users -s /bin/false squeezeboxserver && echo "done." +passwd -l squeezeboxserver &>/dev/null + +chown -R squeezeboxserver:users /home/squeezeboxserver + +install -o squeezeboxserver -d /var/cache/squeezeboxserver +touch /var/log/squeezeboxserver.log +chown squeezeboxserver:users /var/log/squeezeboxserver.log + +cat << 'EOM' + +==> SqueezeBoxServer uses MySQL instead of sqlite. If you have MySQL up and running +==> you can configure SqueezeBoxServer to use that server as described here: +==> http://wiki.slimdevices.com/index.php/ExistingMySQLInstance + +==> PLEASE NOTE: SqueezeBoxServer should always be run as the user 'squeezeboxserver'. +==> This is easily done by adding squeezeboxserver to the DAEMONS array in rc.conf, +==> after network and mysql. + +==> Additional run-time options can be added to /etc/conf.d/squeezeboxserver. +==> Please refer to "/home/squeezeboxserver/slimserver.pl --help" for full details. + +EOM +} + +post_upgrade() { +chown -R squeezeboxserver:users /home/squeezeboxserver + +cat << 'EOM' + +==> SqueezeBoxServer uses MySQL instead of sqlite. If you have MySQL up and running +==> you can configure SqueezeBoxServer to use that server as described here: +==> http://wiki.slimdevices.com/index.php/ExistingMySQLInstance + +EOM +} + +pre_remove() { +# pre_remove gets called whenever post_remove is defined. +true +} + +post_remove() { +# post_remove doesn't start at a newline like the other post_* functions, +# so we'll have to make one for ourselves. +echo -n -e "\nremoving squeezeboxserver user... " +userdel squeezeboxserver && echo "done." + +rm -r /var/cache/squeezeboxserver /var/log/squeezeboxserver.log +} + +op=$1 +shift +$op $* diff --git a/abs/extra/community/squeezeboxserver/squeezeboxserver.rc b/abs/extra/community/squeezeboxserver/squeezeboxserver.rc new file mode 100644 index 0000000..d33db16 --- /dev/null +++ b/abs/extra/community/squeezeboxserver/squeezeboxserver.rc @@ -0,0 +1,47 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/squeezeboxserver ] && . /etc/conf.d/squeezeboxserver + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +squeezehome=/home/squeezeboxserver +pidfile=/var/run/squeezeboxserver.pid +logfile=/var/log/squeezeboxserver.log +prefsdir=/home/squeezeboxserver/prefs +cachedir=/var/cache/squeezeboxserver + + +case "$1" in + start) + stat_busy "Starting SqueezeBoxServer" + cd $squeezehome + ./slimserver.pl --daemon --user squeezeboxserver --prefsdir $prefsdir \ + --cachedir $cachedir --pidfile $pidfile --logfile $logfile $SQUEEZEBOXSERVER_OPTS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon squeezeboxserver + stat_done + fi + ;; + stop) + stat_busy "Stopping SqueezeBoxServer" + kill `cat $pidfile` &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon squeezeboxserver + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/abs/extra/community/transmission-cli/PKGBUILD b/abs/extra/community/transmission-cli/PKGBUILD index a3791fc..40af42a 100644 --- a/abs/extra/community/transmission-cli/PKGBUILD +++ b/abs/extra/community/transmission-cli/PKGBUILD @@ -3,33 +3,39 @@ # Contributor: Alessio 'mOLOk' Bolognino pkgname=transmission-cli -pkgver=1.42 +pkgver=2.04 pkgrel=1 pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)" arch=('i686' 'x86_64') url="http://www.transmissionbt.com/" license=('MIT') -depends=('curl') +depends=('curl' 'libevent') makedepends=('intltool') replaces=('transmission') backup=('etc/conf.d/transmissiond') install=transmission-cli.install source=(http://mirrors.m0k.org/transmission/files/transmission-$pkgver.tar.bz2 - transmissiond + run.transmissiond + transmission-cli.install + transmission.include transmissiond.conf) -md5sums=('c083bdcb01426466e80ee339bccd9351' - 'e2326d412e25b4449ff663a5d4015e1a' - '7b019a710493ec4f8b54a1f528e1981d') build() { cd "$srcdir/transmission-$pkgver" - ./configure --prefix=/usr --disable-gtk --disable-wx || return 1 + ./configure --prefix=/usr --disable-gtk || return 1 make || return 1 make DESTDIR="$pkgdir" install || return 1 - install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond" || return 1 + mkdir -p -m744 "$pkgdir/etc/sv/transmissiond" || return 1 + mkdir -p -m777 "$pkgdir/myth/transmission" || return 1 + install -D -m755 "$srcdir/run.transmissiond" "$pkgdir/etc/sv/transmissiond/run" || return 1 install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond" || return 1 - + install -D -m644 "$srcdir/transmission.include" "$pkgdir/etc/transmission/transmission.include" || return 1 install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" || return 1 } +md5sums=('84fe15eb7e000fdc369def513299358b' + 'b91534aaf2e403331c611c615ab2c03d' + 'ff22c13dbd52565f9e88b1de22514eb9' + 'b5a49ea375333cd0fee40f70dbac4c2e' + 'd05567c7a4f9df9f28602d1356d5c05c') diff --git a/abs/extra/community/transmission-cli/run.transmissiond b/abs/extra/community/transmission-cli/run.transmissiond new file mode 100755 index 0000000..714c946 --- /dev/null +++ b/abs/extra/community/transmission-cli/run.transmissiond @@ -0,0 +1,29 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/transmissiond + +CONFIGDIR=/home/$TRANS_USER/.config/transmission-daemon +PID=`pidof -o %PPID /usr/bin/transmission-daemon` +# Update the block lists - try to keep the bad guys out. + cd ${CONFIGDIR}/blocklists + if [ $? -eq 0 ]; then + find . -mtime +4 -type f -name level1 -exec rm {} \; + if [ ! -f ${CONFIGDIR}/blocklists/level1 ]; then + # update blocklist + # echo "updating blocklist, ~4MB" + wget -q -O level1.gz http://download.m0k.org/transmission/files/level1.gz + if [ -f level1.gz ]; then + gunzip level1.gz + if [ $? -eq 0 ]; then + chmod go+r level1 + else + rm -f level1* + fi + fi + fi + cd - 2>&1 >/dev/null + fi + stat_runit "Starting Transmission Daemon" + [ -z "$PID" ] && exec su -l -c "/usr/bin/nice -n 19 /usr/bin/transmission-daemon $TRANS_OPTS" $TRANS_USER 2>/dev/null diff --git a/abs/extra/community/transmission-cli/transmission-cli.install b/abs/extra/community/transmission-cli/transmission-cli.install index cb6bf60..088ecc6 100644 --- a/abs/extra/community/transmission-cli/transmission-cli.install +++ b/abs/extra/community/transmission-cli/transmission-cli.install @@ -1,9 +1,28 @@ post_install() { + /bin/echo 'include "/etc/transmission/transmission.include"' >> /etc/lighttpd/conf.include + killall -HUP lighttpd + + add_service.sh transmissiond + cat << _EOF - If you want to run the Transmission daemon at boot, - add transmissiond to the DAEMONS array in /etc/rc.conf. - You have to set the user in /etc/conf.d/transmissiond. + You can edit the user and options in /etc/conf.d/transmissiond. + + To access the web interface: + http://localhost/transmission + + Configuration file editing information can be found at: + http://trac.transmissionbt.com/wiki/ConfigFiles _EOF + +} + +pre_upgrade() { + rm -f /usr/share/man/man1/transmission* + +} + +pre_remove() { + remove_service.sh transmissiond } diff --git a/abs/extra/community/transmission-cli/transmission.include b/abs/extra/community/transmission-cli/transmission.include new file mode 100644 index 0000000..5cbf399 --- /dev/null +++ b/abs/extra/community/transmission-cli/transmission.include @@ -0,0 +1,15 @@ +#Redirect from /transmission to /transmission/web +url.rewrite-once += ( "^/transmission[/]?$" => "/transmission/web" ) +$HTTP["url"] =~ "^/transmission/" { + #Serve static files from /usr/share/transmission + server.document-root = "/usr/share/" + #Forward RPC requests to the Transmission daemon + proxy.server = ( + "/transmission/rpc" => ( + ( + "host" => "127.0.0.1", + "port" => 9091 + ) + ) + ) +} diff --git a/abs/extra/community/transmission-cli/transmissiond.conf b/abs/extra/community/transmission-cli/transmissiond.conf index 8f1275b..d642c01 100644 --- a/abs/extra/community/transmission-cli/transmissiond.conf +++ b/abs/extra/community/transmission-cli/transmissiond.conf @@ -1 +1,2 @@ -TRANS_USER="" +TRANS_USER="mythtv" +TRANS_OPTS="-f -ep -w /myth/transmission" diff --git a/abs/extra/conky/PKGBUILD b/abs/extra/conky/PKGBUILD index 726f426..0b27d0b 100644 --- a/abs/extra/conky/PKGBUILD +++ b/abs/extra/conky/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: MrGreen pkgname=conky -pkgver=1.6.1 -pkgrel=2 +pkgver=1.8.0 +pkgrel=1 pkgdesc="Conky is an advanced, highly configurable system monitor for X based on torsmo" arch=('i686' 'x86_64') url="http://conky.sourceforge.net/" @@ -13,7 +13,6 @@ replaces=('torsmo') depends=('libxext' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage') makedepends=('pkgconfig') source=(http://downloads.sourceforge.net/sourceforge/conky/$pkgname-$pkgver.tar.bz2) -md5sums=('b2839f21cec18e5eaa338c7440a1ba28') build() { cd $startdir/src/$pkgname-$pkgver @@ -27,3 +26,4 @@ build() { install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING } +md5sums=('494cbaf1108cfdb977fc80454d9b13e2') diff --git a/abs/extra/cpufreqd/PKGBUILD b/abs/extra/cpufreqd/PKGBUILD new file mode 100644 index 0000000..fd6d544 --- /dev/null +++ b/abs/extra/cpufreqd/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 60269 2009-12-02 16:30:29Z giovanni $ +# Maintainer: Andrea Scarpino +# Contributor: Kevin Piche +# Contributor: Manolis Tzanidakis + +pkgname=cpufreqd +pkgver=2.4.2 +pkgrel=1 +pkgdesc="A small daemon to adjust cpu speed (and indeed voltage)" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/cpufreqd" +license=('GPL2') +depends=('cpufrequtils') +install="$pkgname.install" +backup=(etc/cpufreqd.conf) +options=('!libtool') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 + 'cpufreqd') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr \ + --sysconfdir=/etc + make || return 1 + make DESTDIR=$pkgdir install + + install -D -m 755 $srcdir/cpufreqd $pkgdir/etc/rc.d/cpufreqd || return 1 +} +md5sums=('2ca80a77849c9a69b81e27c1843c97f5' + 'ae7b0ec1e8e9f9e7f05fb83749af4ed4') diff --git a/abs/extra/cpufreqd/cpufreqd b/abs/extra/cpufreqd/cpufreqd new file mode 100644 index 0000000..af55456 --- /dev/null +++ b/abs/extra/cpufreqd/cpufreqd @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/cpufreqd` +case "$1" in + start) + stat_busy "Starting cpufreqd" + [ -z "$PID" ] && /usr/sbin/cpufreqd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon cpufreqd + stat_done + fi + ;; + stop) + stat_busy "Stopping cpufreqd" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon cpufreqd + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/abs/extra/cpufreqd/cpufreqd.install b/abs/extra/cpufreqd/cpufreqd.install new file mode 100644 index 0000000..e56ce57 --- /dev/null +++ b/abs/extra/cpufreqd/cpufreqd.install @@ -0,0 +1,26 @@ +post_install() { + cat << EOF + +NOTE +---- +In order to use that daemon you need to either patch your +kernel-2.4.x with cpufreq patch (check +http://www.codemonkey.org.uk/projects/cpufreq/), +or use kernel-2.6.x or 2.4.x.-ac. + +EOF +} + +post_upgrade() { + /bin/true +} + +# arg 1: the old package version +pre_remove() { + /bin/true +} + +op=$1 +shift + +$op $* diff --git a/abs/extra/cpufrequtils/PKGBUILD b/abs/extra/cpufrequtils/PKGBUILD new file mode 100644 index 0000000..c9087aa --- /dev/null +++ b/abs/extra/cpufrequtils/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 66595 2010-02-01 00:00:07Z giovanni $ +# Maintainer: kevin +# Contributor: phrakture +# Contributor: SpepS + +pkgname=cpufrequtils +pkgver=008 +pkgrel=1 +pkgdesc="Userspace tools for the kernel cpufreq subsystem" +arch=('i686' 'x86_64') +url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html" +license=('GPL') +depends=('sysfsutils') +backup=('etc/conf.d/cpufreq') +source=(http://www.kernel.org/pub/linux/utils/kernel/cpufreq/${pkgname}-${pkgver}.tar.bz2 + cpufreq.rcd + cpufreq.confd) +options=(!libtool) + +build() +{ + cd "${srcdir}/${pkgname}-${pkgver}" + + make -j1 || return 1 + make INSTALL="/bin/install -c" mandir=/usr/share/man DESTDIR="${pkgdir}" install || return 1 + + install -D -m755 ${srcdir}/cpufreq.rcd "${pkgdir}/etc/rc.d/cpufreq" || return 1 + install -D -m644 ${srcdir}/cpufreq.confd "${pkgdir}/etc/conf.d/cpufreq" || return 1 +} +md5sums=('c59b71c044d463896f3247e8dd83dd7e' + '7f2b5085df44d2df3e7c2d0b9f6dab08' + 'baae1f2abffc6bef2bd32a8dd8263c09') diff --git a/abs/extra/cpufrequtils/cpufreq.confd b/abs/extra/cpufrequtils/cpufreq.confd new file mode 100644 index 0000000..2189097 --- /dev/null +++ b/abs/extra/cpufrequtils/cpufreq.confd @@ -0,0 +1,14 @@ +#configuration for cpufreq control + +# valid governors: +# ondemand, performance, powersave, +# conservative, userspace +#governor="ondemand" + +# limit frequency range (optional) +# valid suffixes: Hz, kHz (default), MHz, GHz, THz +#min_freq="2.25GHz" +#max_freq="3GHz" + +# use freq to set up the exact cpu frequency using it with userspace governor +#freq= diff --git a/abs/extra/cpufrequtils/cpufreq.rcd b/abs/extra/cpufrequtils/cpufreq.rcd new file mode 100644 index 0000000..9bc19b1 --- /dev/null +++ b/abs/extra/cpufrequtils/cpufreq.rcd @@ -0,0 +1,60 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +# source application-specific settings +[ -f /etc/conf.d/cpufreq ] && . /etc/conf.d/cpufreq + +case "$1" in + start) + stat_busy "Setting cpufreq governing rules" + + params="" + if [ -n "$governor" ]; then + mod="cpufreq_$governor" + params="-g $governor" + grep -qw "$governor" /sys/devices/system/cpu/cpu*/cpufreq/scaling_available_governors || modprobe -q $mod + if [ $? -eq 0 ]; then + if [ "$min_freq" != "" ]; then + params="$params -d $min_freq" + fi + if [ "$max_freq" != "" ]; then + params="$params -u $max_freq" + fi + else + stat_busy " Cannot load governor module '$governor'" + stat_fail + exit + fi + fi + + if [ "$params" != "" ]; then + CPUS=$(sed -ne 's/^processor.* \([0-9]\+\)$/\1/p' /proc/cpuinfo) + stat_append ", cpu" + for cpu in $CPUS; do + stat_append " $cpu" + cpufreq-set -c $cpu $params + if [ "$freq" != "" ]; then + cpufreq-set -c $cpu -f $freq + fi + done + stat_done + else + stat_busy " Invalid configuration in /etc/conf.d/cpufreq" + stat_fail + fi + ;; + stop) + # nothing to do + ;; + restart) + $0 start + ;; + set) + # TODO: make callable... "cpufreq set 800MHz" + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/abs/extra/crypto++/PKGBUILD b/abs/extra/crypto++/PKGBUILD new file mode 100644 index 0000000..35bf2b7 --- /dev/null +++ b/abs/extra/crypto++/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 68024 2010-02-10 14:24:12Z giovanni $ +# Maintainer: Giovanni Scafora +# Contributor: Andrea Scarpino +# Contributor: Kritoke +# Contributor: jlvsimoes + +pkgname=crypto++ +pkgver=5.6.0 +_srcver=560 +pkgrel=2 +pkgdesc="A free C++ class library of cryptographic schemes." +arch=('i686' 'x86_64') +license=('custom') +makedepends=('unzip') +url="http://www.cryptopp.com/" +source=(http://www.cryptopp.com/cryptopp${_srcver}.zip) +md5sums=('36f35789ad60489d58003d3c849807e8') + +build() { + cd ${srcdir} + sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile + make -f GNUmakefile || return 1 + install -d ${pkgdir}/usr/{lib,include/cryptopp} + install -m644 *.h ${pkgdir}/usr/include/cryptopp/ + install -m644 libcryptopp.a ${pkgdir}/usr/lib/ + install -D -m644 License.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/abs/extra/ddclient/PKGBUILD b/abs/extra/ddclient/PKGBUILD index 121d2c5..f283cb9 100644 --- a/abs/extra/ddclient/PKGBUILD +++ b/abs/extra/ddclient/PKGBUILD @@ -3,33 +3,31 @@ # Contributor: David Rosenstrauch pkgname=ddclient -pkgver=3.7.3 -pkgrel=2 +pkgver=3.8.0 +pkgrel=1 pkgdesc="Update dynamic DNS entries for accounts on many dynamic DNS services." arch=('i686' 'x86_64') url="http://ddclient.sourceforge.net/" license=('GPL2') depends=('perl' 'perl-io-socket-ssl') -backup=('etc/ddclient/ddclient.conf' 'etc/conf.d/ddclient') -install=ddclient.install -source=(http://downloads.sourceforge.net/sourceforge/ddclient/ddclient-$pkgver.tar.bz2 ddclient.rc ddclient.conf.d) +backup=('etc/ddclient.conf') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + ddclient.conf.dynamic.dyndns.sample + ddclient-foreground.patch) build() { - cd ${srcdir}/ddclient-${pkgver} + cd ${srcdir}/$pkgname-${pkgver} + patch < ${srcdir}/ddclient-foreground.patch # core files install -D -m755 ddclient ${pkgdir}/usr/sbin/ddclient - install -D -m755 ${srcdir}/ddclient.rc ${pkgdir}/etc/rc.d/ddclient - install -D -m600 sample-etc_ddclient.conf ${pkgdir}/etc/ddclient/ddclient.conf - install -D -m644 ${srcdir}/ddclient.conf.d ${pkgdir}/etc/conf.d/ddclient + install -D -m600 sample-etc_ddclient.conf ${pkgdir}/etc/ddclient/ddclient.conf.sample + install -D -m600 ${srcdir}/ddclient.conf.dynamic.dyndns.sample ${pkgdir}/etc/ddclient/ install -d ${pkgdir}/var/cache/ddclient # additional instructions, sample configs - install -D -m644 README ${pkgdir}/etc/ddclient/samples/README - install -D -m644 sample-etc_cron.d_ddclient ${pkgdir}/etc/ddclient/samples/sample-etc_cron.d_ddclient - install -D -m644 sample-etc_dhcpc_dhcpcd-eth0.exe ${pkgdir}/etc/ddclient/samples/sample-etc_dhcpc_dhcpcd-eth0.exe - install -D -m644 sample-etc_ppp_ip-up.local ${pkgdir}/etc/ddclient/samples/sample-etc_ppp_ip-up.local + install -D -m644 README ${pkgdir}/etc/ddclient/README } -md5sums=('f6a55bc68cf73ffe7e80d2fa5cd44f85' - '7035bf8132f3517a59167f61ee5e8b90' - 'b8f39c82827776da948b76ef83544d33') +md5sums=('6cac7a5eb1da781bfd4d98cef0b21f8e' + '4194825b9b4a7fcc1c57c2f5a4f6162b' + 'd8ffc95f98f9afcb4a06a1e192220e35') diff --git a/abs/extra/ddclient/ddclient-foreground.patch b/abs/extra/ddclient/ddclient-foreground.patch new file mode 100644 index 0000000..a814ede --- /dev/null +++ b/abs/extra/ddclient/ddclient-foreground.patch @@ -0,0 +1,47 @@ +--- ../ddclient-orig/ddclient 2009-10-19 22:45:15.000000000 +1030 ++++ ddclient 2009-10-19 22:50:11.000000000 +1030 +@@ -307,6 +307,7 @@ + my %variables = ( + 'global-defaults' => { + 'daemon' => setv(T_DELAY, 0, 0, 1, 0, interval('60s')), ++ 'foreground' => setv(T_BOOL, 0, 0, 1, 0, undef), + 'file' => setv(T_FILE, 0, 0, 1, "$etc$program.conf", undef), + 'cache' => setv(T_FILE, 0, 0, 1, "$cachedir$program.cache", undef), + 'pid' => setv(T_FILE, 0, 0, 1, "", undef), +@@ -535,6 +536,7 @@ + "usage: ${program} [options]", + "options are:", + [ "daemon", "=s", "-daemon delay : run as a daemon, specify delay as an interval." ], ++ [ "foreground", "!", "-foreground : do not fork" ], + [ "proxy", "=s", "-proxy host : use 'host' as the HTTP proxy" ], + [ "server", "=s", "-server host : update DNS information on 'host'" ], + [ "protocol", "=s", "-protocol type : update protocol used" ], +@@ -623,7 +625,10 @@ + $SIG{'HUP'} = sub { $caught_hup = 1; }; + $SIG{'TERM'} = sub { $caught_term = 1; }; + $SIG{'KILL'} = sub { $caught_kill = 1; }; +-if (opt('daemon') && !opt('force')) { ++# don't fork() if foreground or force is on ++if (opt('foreground') || opt('force')) { ++ ; ++} elsif (opt('daemon')) { + $SIG{'CHLD'} = 'IGNORE'; + my $pid = fork; + if ($pid < 0) { +@@ -633,12 +638,15 @@ + exit 0; + } + $SIG{'CHLD'} = 'DEFAULT'; +- $opt{'syslog'} = 1; + open(STDOUT, ">/dev/null"); + open(STDERR, ">/dev/null"); + open(STDIN, " +# Contributor: Jason Erik Jackson + +pkgname=deb2targz +pkgver=1 +pkgrel=2 +pkgdesc="Converts .deb archives to tar.gz" +arch=('i686' 'x86_64') +url="http://www.miketaylor.org.uk/tech/deb/" +depends=("perl") +source=("http://www.miketaylor.org.uk/tech/deb/$pkgname") + +md5sums=('5b944785778d023a43e33af53bea2056') + +build() { + mkdir -p $startdir/pkg/usr/bin + install -m755 $startdir/src/$pkgname $startdir/pkg/usr/bin +} + + diff --git a/abs/extra/dnsmasq/PKGBUILD b/abs/extra/dnsmasq/PKGBUILD new file mode 100644 index 0000000..f888ccd --- /dev/null +++ b/abs/extra/dnsmasq/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 66607 2010-02-01 01:42:17Z giovanni $ +# Maintainer: Paul Mattal +# Contributor: Tom Newsom + +pkgname=dnsmasq +pkgver=2.55 +pkgrel=1 +pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" +url="http://www.thekelleys.org.uk/dnsmasq/doc.html" +arch=('i686' 'x86_64') +license=('GPL') +depends=('glibc' 'bash') +makedepends=('libcap>=2.16') +backup=('etc/dnsmasq.conf') +install= +source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" + 'rc.dnsmasq') + +build() { + cd $srcdir/$pkgname-$pkgver + + # Build + make || return 1 + + # Install + install -d $pkgdir/etc/rc.d || return 1 + make PREFIX=/usr DESTDIR=$pkgdir install || return 1 + + install -D -m755 \ + $srcdir/rc.dnsmasq $pkgdir/etc/rc.d/dnsmasq || return 1 + install -D -m644 \ + dnsmasq.conf.example $pkgdir/etc/dnsmasq.conf || return 1 + + # Make the Required Directories for DHCP Server Default Directories + install -d $pkgdir/var/db || return 1 + install -d $pkgdir/var/lib/misc || return 1 +} + +# vim: ts=2 sw=2 et ft=sh +md5sums=('b093d7c6bc7f97ae6fd35d048529232a' + 'e956eee1ec24212a3254d2b168187495') diff --git a/abs/extra/dnsmasq/rc.dnsmasq b/abs/extra/dnsmasq/rc.dnsmasq new file mode 100755 index 0000000..1676072 --- /dev/null +++ b/abs/extra/dnsmasq/rc.dnsmasq @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/dnsmasq` +case "$1" in + start) + stat_busy "Starting DNS/DHCP daemon" + [ -z "$PID" ] && /usr/sbin/dnsmasq + if [ $? -gt 0 ] ; then + stat_fail + else + add_daemon dnsmasq # create the 'state' dir + stat_done + fi + ;; + stop) + stat_busy "Stopping DNS/DHCP daemon" + [ "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon dnsmasq # remove the 'state' dir + stat_done + fi + ;; + restart) + $0 stop + sleep 5 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/abs/extra/doxygen/PKGBUILD b/abs/extra/doxygen/PKGBUILD index 5959ce5..272c267 100644 --- a/abs/extra/doxygen/PKGBUILD +++ b/abs/extra/doxygen/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 14308 2008-10-05 15:59:28Z dan $ +# $Id: PKGBUILD 84267 2010-06-28 05:13:23Z dan $ # Maintainer: Dan McGee pkgname=doxygen -pkgver=1.5.7.1 +pkgver=1.7.1 pkgrel=1 pkgdesc="A documentation system for C++, C, Java, IDL and PHP" license=('GPL') @@ -9,17 +9,17 @@ arch=(i686 x86_64) url="http://www.doxygen.org/" depends=('gcc-libs') # qt required to build and run doxywizard, but don't want to drag it in -makedepends=('flex' 'qt3') +makedepends=('flex' 'qt') optdepends=('graphviz: for caller/callee graph generation' - 'qt3: for doxywizard') + 'qt: for doxywizard') source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) build() { - . /etc/profile.d/qt3.sh cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix /usr --with-doxywizard + QTDIR=/usr ./configure --prefix /usr --with-doxywizard make || return 1 make INSTALL=${startdir}/pkg/usr MAN1DIR=share/man/man1 install } -md5sums=('bc35dfd52bdae0247b862e67e0cbe7d7') +md5sums=('13e76e10fb55581a16ee04de35c264f0') + diff --git a/abs/extra/doxygen/PKGBUILD.orig b/abs/extra/doxygen/PKGBUILD.orig new file mode 100644 index 0000000..f4b09d2 --- /dev/null +++ b/abs/extra/doxygen/PKGBUILD.orig @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 14308 2008-10-05 15:59:28Z dan $ +# Maintainer: Dan McGee +pkgname=doxygen +pkgver=1.7.1 +pkgrel=1 +pkgdesc="A documentation system for C++, C, Java, IDL and PHP" +license=('GPL') +arch=(i686 x86_64) +url="http://www.doxygen.org/" +depends=('gcc-libs') +# qt required to build and run doxywizard, but don't want to drag it in +makedepends=('flex' 'qt3') +optdepends=('graphviz: for caller/callee graph generation' + 'qt3: for doxywizard') +source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) + +build() { + . /etc/profile.d/qt3.sh + cd ${startdir}/src/${pkgname}-${pkgver} + ./configure --prefix /usr --with-doxywizard + make || return 1 + make INSTALL=${startdir}/pkg/usr MAN1DIR=share/man/man1 install +} +md5sums=('13e76e10fb55581a16ee04de35c264f0') diff --git a/abs/extra/dpgconv/PKGBUILD b/abs/extra/dpgconv/PKGBUILD new file mode 100644 index 0000000..82fe117 --- /dev/null +++ b/abs/extra/dpgconv/PKGBUILD @@ -0,0 +1,22 @@ +# Contributor: Nick B +pkgname=dpgconv +pkgver=9 +pkgrel=1 +pkgdesc="This is a converter to produce DPG movies for Moonshell software for Nintendo DS." +arch=('i686' 'x86_64') +url="http://theli.is-a-geek.org/blog/static/dpgconv" +license=('GPL2') +depends=('mpeg_stat' 'mplayer') +source=(http://theli.is-a-geek.org/files/dpgconv/dpgconv-$pkgver.py.bz2 + dpgconv-panscan.patch) + +build() { + +cd $startdir/src +patch < dpgconv-panscan.patch +install -m755 -D $startdir/src/dpgconv-$pkgver.py $startdir/pkg/usr/bin/dpgconv-$pkgver.py +cd $startdir/pkg/usr/bin +ln -s dpgconv-$pkgver.py dpgconv.py +} +md5sums=('fa61ceb4ebb241e98fc005aed86406e5') + diff --git a/abs/extra/dpgconv/dpgconv-panscan.patch b/abs/extra/dpgconv/dpgconv-panscan.patch new file mode 100644 index 0000000..471d518 --- /dev/null +++ b/abs/extra/dpgconv/dpgconv-panscan.patch @@ -0,0 +1,83 @@ +--- dpgconv-9.py.old 2009-10-28 19:33:46.000000000 +1030 ++++ dpgconv-9.py 2009-10-28 19:28:01.000000000 +1030 +@@ -49,9 +49,12 @@ + --width xxx + destination video width (default: 256) + --keep-aspect +- try to keep aspect ratio ++ try to keep aspect ratio by letterboxing ++ --keep-aspect-panscan ++ try to keep aspect ratio by cropping original + + NOTE: width/height have no effect when --keep-aspect is set ++ --keep-aspect-panscan overrides --keep-aspect + + --mv + additional parameters for mencoder for video +@@ -150,8 +153,38 @@ + v_pf = "format=rgb24," + options.pf = 3 + +- if options.aspect: +- aspect = commands.getoutput( MPLAYER + " -frames 1 -vo null -ao null -identify \"" + file + "\" | grep -E \"^ID_VIDEO_ASPECT\"") ++ crop="" ++ if options.panscan: ++ options.width=256 ++ options.height=192 ++ ++ aspect = commands.getoutput( MPLAYER + " -frames 1 -vo null -ao null -identify \"" + file + "\" | grep -E \"^ID_VIDEO_ASPECT\" | tail -1") ++ p1 = re.compile ("ID_VIDEO_ASPECT=(.*)") ++ m1 = p1.search( aspect ) ++ width = commands.getoutput( MPLAYER + " -frames 1 -vo null -ao null -identify \"" + file + "\" | grep -E \"^ID_VIDEO_WIDTH\" | tail -1") ++ p2 = re.compile ("ID_VIDEO_WIDTH=(.*)") ++ m2 = p2.search( width ) ++ height = commands.getoutput( MPLAYER + " -frames 1 -vo null -ao null -identify \"" + file + "\" | grep -E \"^ID_VIDEO_HEIGHT\" | tail -1") ++ p3 = re.compile ("ID_VIDEO_HEIGHT=(.*)") ++ m3 = p3.search( height ) ++ if m1 and m2 and m3: ++ print "Input Aspect %s" % m1.group(1) ++ print "Input Width %s" % m2.group(1) ++ print "Input Height %s" % m3.group(1) ++ ar = float (m1.group(1)) ++ iw = int (m2.group(1)) ++ ih = int (m3.group(1)) ++ if aspect > 1.333333: ++ cropw=int(round(iw / ar * 4 / 3, 0)) ++ croph=ih ++ else: ++ cropw=iw ++ croph=int(round(ih * ar * 3 / 4, 0)) ++ crop="crop="+`cropw`+":"+`croph`+"," ++ print crop ++ ++ elif options.aspect: ++ aspect = commands.getoutput( MPLAYER + " -frames 1 -vo null -ao null -identify \"" + file + "\" | grep -E \"^ID_VIDEO_ASPECT\" | tail -1") + p = re.compile ("ID_VIDEO_ASPECT=(.*)") + m = p.search( aspect ) + if m: +@@ -169,13 +202,13 @@ + if options.fps < 24: + print "mencoder won't work with double pass and fps < 24, forcing fps = 24" + options.fps = 24 +- v_cmd = ( " \""+ file +"\" -v -ofps " + `options.fps` + " -sws 9 -vf " + v_pf + "scale=" + `options.width` + ":" + `options.height` +":::3,harddup -nosound -ovc lavc -lavcopts vcodec=mpeg1video:vstrict=-2:mbd=2:trell:cbp:mv0:vmax_b_frames=2:cmp=6:subcmp=6:precmp=6:dia=4:predia=4:bidir_refine=4:mv0_threshold=0:last_pred=3:vbitrate=" + `options.vbps` ) ++ v_cmd = ( " \""+ file +"\" -v -ofps " + `options.fps` + " -sws 9 -vf " + v_pf + crop + "scale=" + `options.width` + ":" + `options.height` +":::3,harddup -nosound -ovc lavc -lavcopts vcodec=mpeg1video:vstrict=-2:mbd=2:trell:cbp:mv0:vmax_b_frames=2:cmp=6:subcmp=6:precmp=6:dia=4:predia=4:bidir_refine=4:mv0_threshold=0:last_pred=3:vbitrate=" + `options.vbps` ) + elif options.hq: +- v_cmd = ( " \""+ file +"\" -v -ofps " + `options.fps` + " -sws 9 -vf " + v_pf + "scale=" + `options.width` + ":" + `options.height` +":::3,harddup -nosound -ovc lavc -lavcopts vcodec=mpeg1video:vstrict=-2:mbd=2:trell:cbp:mv0:cmp=6:subcmp=6:precmp=6:dia=3:predia=3:last_pred=3:vbitrate=" + `options.vbps` + " -o " + MPGTMP + " -of rawvideo" ) ++ v_cmd = ( " \""+ file +"\" -v -ofps " + `options.fps` + " -sws 9 -vf " + v_pf + crop + "scale=" + `options.width` + ":" + `options.height` +":::3,harddup -nosound -ovc lavc -lavcopts vcodec=mpeg1video:vstrict=-2:mbd=2:trell:cbp:mv0:cmp=6:subcmp=6:precmp=6:dia=3:predia=3:last_pred=3:vbitrate=" + `options.vbps` + " -o " + MPGTMP + " -of rawvideo" ) + elif options.lq: +- v_cmd = ( " \"" + file + "\" -v -ofps " + `options.fps` + " -vf " + v_pf + "scale=" + `options.width` + ":" + `options.height` + ",harddup -nosound -ovc lavc -lavcopts vcodec=mpeg1video:vstrict=-2:vbitrate=" + `options.vbps` + " -o " + MPGTMP + " -of rawvideo" ) ++ v_cmd = ( " \"" + file + "\" -v -ofps " + `options.fps` + " -vf " + v_pf + crop + "scale=" + `options.width` + ":" + `options.height` + ",harddup -nosound -ovc lavc -lavcopts vcodec=mpeg1video:vstrict=-2:vbitrate=" + `options.vbps` + " -o " + MPGTMP + " -of rawvideo" ) + else : +- v_cmd = ( " \""+ file +"\" -v -ofps " + `options.fps` + " -sws 9 -vf " + v_pf + "scale=" + `options.width` + ":" + `options.height` + ":::3,harddup -nosound -ovc lavc -lavcopts vcodec=mpeg1video:vstrict=-2:mbd=2:trell:cbp:mv0:cmp=2:subcmp=2:precmp=2:vbitrate=" + `options.vbps` + " -o " + MPGTMP + " -of rawvideo") ++ v_cmd = ( " \""+ file +"\" -v -ofps " + `options.fps` + " -sws 9 -vf " + v_pf + crop + "scale=" + `options.width` + ":" + `options.height` + ":::3,harddup -nosound -ovc lavc -lavcopts vcodec=mpeg1video:vstrict=-2:mbd=2:trell:cbp:mv0:cmp=2:subcmp=2:precmp=2:vbitrate=" + `options.vbps` + " -o " + MPGTMP + " -of rawvideo") + + if options.nosub: + if options.sub != None: +@@ -459,6 +492,7 @@ + parser.add_option("-a","--abps", type="int", dest="abps", default=128) + parser.add_option("--volnorm", action="store_true", dest="volnorm", default=False) + parser.add_option("--keep-aspect", action="store_true", dest="aspect", default=False) ++parser.add_option("--keep-aspect-panscan", action="store_true", dest="panscan", default=False) + parser.add_option("--height", type="int", dest="height", default=192) + parser.add_option("--width", type="int", dest="width", default=256) + parser.add_option("-z","--hz", type="int", dest="hz", default=32000) diff --git a/abs/extra/enchant/PKGBUILD b/abs/extra/enchant/PKGBUILD index e22aa05..0937bd8 100644 --- a/abs/extra/enchant/PKGBUILD +++ b/abs/extra/enchant/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 2581 2008-06-08 12:52:18Z jgc $ # Maintainer: dorphell pkgname=enchant -pkgver=1.4.2 +pkgver=1.6.0 pkgrel=1 pkgdesc="A wrapper library for generic spell checking" arch=(i686 x86_64) @@ -11,7 +11,6 @@ makedepends=('hspell') options=(!libtool) source=(http://www.abisource.com/downloads/enchant/${pkgver}/${pkgname}-${pkgver}.tar.gz) url="http://www.abisource.com/enchant/" -md5sums=('fe4558269ff59f569ab9581c907d58cb') build() { cd ${startdir}/src/${pkgname}-${pkgver} @@ -19,3 +18,4 @@ build() { make || return 1 make DESTDIR=${startdir}/pkg install || return 1 } +md5sums=('de11011aff801dc61042828041fb59c7') diff --git a/abs/extra/evrouter/PKGBUILD b/abs/extra/evrouter/PKGBUILD index e4fb59d..0f7d7b7 100644 --- a/abs/extra/evrouter/PKGBUILD +++ b/abs/extra/evrouter/PKGBUILD @@ -1,18 +1,19 @@ # Contributor: Jonathan Liu pkgname=evrouter -pkgver=0.3.3 -pkgrel=2 +pkgver=0.4 +pkgrel=1 pkgdesc="An Input Event Router for Linux" arch=(i686) url="http://www.bedroomlan.org/~alexios/coding_evrouter.html" license=('GPL2') depends=('libxt' 'libxtst' 'xorg-server') -source=(http://www.bedroomlan.org/~alexios/files/SOFTWARE/evrouter/${pkgname}_${pkgver}.tar.gz) -md5sums=('a20073e04679eb11a5c2da9ab59e75fd') +source=(http://debian.bedroomlan.org/debian/pool/main/e/evrouter/${pkgname}_${pkgver}.tar.gz) build() { - cd "$startdir/src/$pkgname" + cd "${startdir}/src/${pkgname}-${pkgver}" + ./autogen.sh ./configure --prefix=/usr --without-xmms make || return 1 - make DESTDIR="$startdir/pkg" install + make DESTDIR="${startdir}/pkg" install } +md5sums=('eef1b9d8e3b545c330eb025670ffa3e8') diff --git a/abs/extra/evtest/PKGBUILD b/abs/extra/evtest/PKGBUILD new file mode 100644 index 0000000..0952c5e --- /dev/null +++ b/abs/extra/evtest/PKGBUILD @@ -0,0 +1,24 @@ +# Contributor: Andrej Gelenberg +pkgname=evtest +pkgver=1.25 +pkgrel=2 +pkgdesc="Simple tool for input event debugging." +arch=('i686' 'x86_64') +url="http://cgit.freedesktop.org/~whot/evtest/" +license=('GPL') +depends=(libxml2) +makedepends=(xmlto asciidoc) +optdepends=(libxslt) +source=("http://cgit.freedesktop.org/~whot/evtest/snapshot/$pkgname-$pkgver.zip" "evtest.diff") + +build() +{ + cd $srcdir/$pkgname-$pkgver + patch -p1 < ../evtest.diff || return 1 + autoreconf -iv + ./configure --prefix=/usr + make || return 1 + make DESTDIR=${startdir}/pkg install +} +md5sums=('1edddfcd366bb52490e08cbf1dbaeddf' + '1753bd5825ca7e5244a1a09029b8a47d') diff --git a/abs/extra/evtest/evtest.diff b/abs/extra/evtest/evtest.diff new file mode 100644 index 0000000..0dc7ba5 --- /dev/null +++ b/abs/extra/evtest/evtest.diff @@ -0,0 +1,32 @@ +diff -ruaN evtest-1.25.orig/evtest-capture.c evtest-1.25/evtest-capture.c +--- evtest-1.25.orig/evtest-capture.c 2009-12-02 22:24:44.000000000 +0000 ++++ evtest-1.25/evtest-capture.c 2010-05-06 08:38:03.000000000 +0000 +@@ -560,16 +560,6 @@ + [ABS_TOOL_WIDTH] = "ABS_TOOL_WIDTH", + [ABS_VOLUME] = "ABS_VOLUME", + [ABS_MISC] = "ABS_MISC", +- [ABS_MT_TOUCH_MAJOR] = "ABS_MT_TOUCH_MAJOR", +- [ABS_MT_TOUCH_MINOR] = "ABS_MT_TOUCH_MINOR", +- [ABS_MT_WIDTH_MAJOR] = "ABS_MT_WIDTH_MAJOR", +- [ABS_MT_WIDTH_MINOR] = "ABS_MT_WIDTH_MINOR", +- [ABS_MT_ORIENTATION] = "ABS_MT_ORIENTATION", +- [ABS_MT_POSITION_X] = "ABS_MT_POSITION_X", +- [ABS_MT_POSITION_Y] = "ABS_MT_POSITION_Y", +- [ABS_MT_TOOL_TYPE] = "ABS_MT_TOOL_TYPE", +- [ABS_MT_BLOB_ID] = "ABS_MT_BLOB_ID", +- [ABS_MT_TRACKING_ID] = "ABS_MT_TRACKING_ID", + }; + + const char *misc[MSC_MAX + 1] = { +diff -ruaN evtest-1.25.orig/evtest.c evtest-1.25/evtest.c +--- evtest-1.25.orig/evtest.c 2009-12-02 22:24:44.000000000 +0000 ++++ evtest-1.25/evtest.c 2010-05-06 08:38:21.000000000 +0000 +@@ -192,7 +192,7 @@ + [BTN_TOOL_MOUSE] = "ToolMouse", [BTN_TOOL_LENS] = "ToolLens", + [BTN_TOUCH] = "Touch", [BTN_STYLUS] = "Stylus", + [BTN_STYLUS2] = "Stylus2", [BTN_TOOL_DOUBLETAP] = "Tool Doubletap", +- [BTN_TOOL_TRIPLETAP] = "Tool Tripletap", [BTN_TOOL_QUADTAP] = "Tool Quadtap", ++ [BTN_TOOL_TRIPLETAP] = "Tool Tripletap", + [BTN_GEAR_DOWN] = "WheelBtn", + [BTN_GEAR_UP] = "Gear up", [KEY_OK] = "Ok", + [KEY_SELECT] = "Select", [KEY_GOTO] = "Goto", diff --git a/abs/extra/fakeroot/PKGBUILD b/abs/extra/fakeroot/PKGBUILD index f8dd4b2..688c3d3 100644 --- a/abs/extra/fakeroot/PKGBUILD +++ b/abs/extra/fakeroot/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Jochem Kossen pkgname=fakeroot -pkgver=1.12.2 -pkgrel=2 +pkgver=1.14.4 +pkgrel=1 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" arch=('i686' 'x86_64') license=('GPL') @@ -13,8 +13,7 @@ groups=('base-devel') install=fakeroot.install depends=('glibc' 'filesystem' 'grep' 'sed') options=('!libtool') -source=(http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.tar.gz) -md5sums=('1eb7d972a19159035892e7d132602726') +source=(http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2) build() { cd ${srcdir}/$pkgname-$pkgver @@ -26,3 +25,4 @@ build() { # install README for sysv/tcp usage install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README } +md5sums=('bea628be77838aaa7323a2f7601c2d7e') diff --git a/abs/extra/fftw/PKGBUILD b/abs/extra/fftw/PKGBUILD index 1556108..a4ca689 100644 --- a/abs/extra/fftw/PKGBUILD +++ b/abs/extra/fftw/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: damir pkgname=fftw -pkgver=3.2 +pkgver=3.2.2 pkgrel=1 pkgdesc="A library for computing the discrete Fourier transform (DFT)" arch=('i686' 'x86_64') @@ -46,3 +46,4 @@ build() { rm -f $pkgdir/usr/share/info/dir gzip $pkgdir/usr/share/info/* } +md5sums=('b616e5c91218cc778b5aa735fefb61ae') diff --git a/abs/extra/fuppes-svn/PKGBUILD b/abs/extra/fuppes-svn/PKGBUILD index 67936c0..03ffb9c 100644 --- a/abs/extra/fuppes-svn/PKGBUILD +++ b/abs/extra/fuppes-svn/PKGBUILD @@ -2,8 +2,8 @@ # patch for svn r634: Ivan Yurasov pkgname=fuppes-svn -pkgver=636 -pkgrel=9 +pkgver=664 +pkgrel=1 pkgdesc="A free, multiplatform Universal Plug and Play A/V MediaServer" arch=('i686' 'x86_64') url="http://fuppes.ulrich-voelkel.de/" @@ -12,9 +12,6 @@ depends=('pcre' 'libxml2' 'sqlite3' 'gettext' 'taglib' 'imagemagick' 'ffmpeg' 'l makdepends=('pkgconfig' 'autoconf' 'subversion') install=fuppes.install source=(fuppes-r634-archlinux.patch fuppes.diff fuppes.cfg run fuppes.ch fuppes.lr) -md5sums=('5d9f6331cc91b64aab69449ce327b214' 'c495fa1bd9a870ae36820632434319ee' \ - 'b0cef07d8e60d01c8146a69870672e1f' '3850001378088e5efac60487e5550d54' \ - '3c355b860f1b0d273f5aa8b2bea1bde6') _svnmod="fuppes" _svntrunk="https://fuppes.svn.sourceforge.net/svnroot/fuppes/trunk" @@ -45,8 +42,13 @@ build() cp $startdir/src/fuppes.cfg $startdir/pkg/etc/fuppes mkdir -p $startdir/pkg/etc/cron.hourly mkdir -p $startdir/pkg/etc/logrotate.d/ - mkdir -p $startdir/pkg/etc/sv/fuppes/supervise install -D -m755 $startdir/src/fuppes.ch $startdir/pkg/etc/cron.hourly install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/fuppes install -D -m755 $startdir/src/fuppes.lr $startdir/pkg/etc/logrotate.d } +md5sums=('5d9f6331cc91b64aab69449ce327b214' + 'c495fa1bd9a870ae36820632434319ee' + 'b0cef07d8e60d01c8146a69870672e1f' + '3850001378088e5efac60487e5550d54' + '3c355b860f1b0d273f5aa8b2bea1bde6' + '3151a3862fbc6b758d7ae5776eba3d57') diff --git a/abs/extra/gdl/PKGBUILD b/abs/extra/gdl/PKGBUILD index ee649c2..f7ee580 100644 --- a/abs/extra/gdl/PKGBUILD +++ b/abs/extra/gdl/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot pkgname=gdl -pkgver=2.26.0 +pkgver=2.90.0 pkgrel=1 pkgdesc="Gnome Devtool Libraries" arch=(i686 x86_64) @@ -11,8 +11,7 @@ url="http://www.gnome.org/" depends=('libglade>=2.6.4') makedepends=('pkgconfig') options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/gdl/2.26/${pkgname}-${pkgver}.tar.bz2) -md5sums=('8915b8808d88e12c1bb53e84f50e6707') +source=(http://ftp.gnome.org/pub/GNOME/sources/gdl/2.90/${pkgname}-${pkgver}.tar.bz2) build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -21,3 +20,4 @@ build() { make || return 1 make DESTDIR="${pkgdir}" install || return 1 } +md5sums=('7ccaafc1b55c510a4e39ea7e54844bb3') diff --git a/abs/extra/geoip/PKGBUILD b/abs/extra/geoip/PKGBUILD new file mode 100644 index 0000000..9ae74ba --- /dev/null +++ b/abs/extra/geoip/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 40078 2009-05-27 06:04:17Z juergen $ +# Maintainer: Dan McGee +# Contributor: Manolis Tzanidakis + +pkgname=geoip +pkgver=1.4.6 +pkgrel=1 +pkgdesc="Non-DNS IP-to-country resolver C library & utils" +arch=(i686 x86_64) +license=('GPL') +url="http://www.maxmind.com/app/c" +depends=('zlib') +backup=(etc/geoip/GeoIP.conf) +options=('!libtool') +source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-${pkgver}.tar.gz) +md5sums=('cb14b1beeb40631a12676b11ca0c309a') + +build() { + cd ${startdir}/src/GeoIP-${pkgver} + ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc/geoip + make || return 1 + make check || return 1 + make DESTDIR=${startdir}/pkg install +} + diff --git a/abs/extra/glew/PKGBUILD b/abs/extra/glew/PKGBUILD index 989621b..1db995d 100644 --- a/abs/extra/glew/PKGBUILD +++ b/abs/extra/glew/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: SleepyDog pkgname=glew -pkgver=1.5.1 +pkgver=1.5.5 pkgrel=1 pkgdesc="A cross-platform C/C++ extension loading library" arch=('i686' 'x86_64') @@ -11,13 +11,13 @@ url="http://glew.sourceforge.net" license=('BSD' 'MIT' 'GPL') depends=('libxmu' 'libxi' 'mesa') makedepends=('hd2u') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-src.tgz) -md5sums=('759a59853dfaae4d007b414a3c1712f2') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) build() { - cd ${startdir}/src/${pkgname} + cd ${startdir}/src/${pkgname}-${pkgver} dos2unix config/config.guess make || return 1 make GLEW_DEST=${startdir}/pkg/usr LIBDIR=${startdir}/pkg/usr/lib install || return 1 install -D -m644 LICENSE.txt ${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE.txt || return 1 } +md5sums=('3621f27cfd3e33d5dbcc1111ecb5b762') diff --git a/abs/extra/gnu-netcat/PKGBUILD b/abs/extra/gnu-netcat/PKGBUILD new file mode 100644 index 0000000..82c90f3 --- /dev/null +++ b/abs/extra/gnu-netcat/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 49781 2009-08-15 16:06:57Z jgc $ +# Maintainer: Tom K + +pkgname=gnu-netcat +pkgver=0.7.1 +pkgrel=3 +pkgdesc="GNU rewrite of netcat, the network piping application" +depends=('glibc' 'texinfo') +arch=('i686' 'x86_64') +url="http://netcat.sourceforge.net/" +license=('GPL') +replaces=('netcat') +provides=('netcat') +install=gnu-netcat.install +source=(http://internap.dl.sourceforge.net/sourceforge/netcat/netcat-$pkgver.tar.bz2) +md5sums=('0a29eff1736ddb5effd0b1ec1f6fe0ef') + +build() { + cd "${srcdir}/netcat-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/abs/extra/gnu-netcat/gnu-netcat.install b/abs/extra/gnu-netcat/gnu-netcat.install new file mode 100644 index 0000000..a946aa2 --- /dev/null +++ b/abs/extra/gnu-netcat/gnu-netcat.install @@ -0,0 +1,13 @@ +infodir=/usr/share/info + +post_install() { + install-info $infodir/netcat.info.gz $infodir/dir 2> /dev/null +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + install-info --delete $infodir/netcat.info.gz $infodir/dir 2> /dev/null +} diff --git a/abs/extra/gnupg/PKGBUILD b/abs/extra/gnupg/PKGBUILD new file mode 100644 index 0000000..cb980ce --- /dev/null +++ b/abs/extra/gnupg/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 52155 2009-09-16 11:08:07Z allan $ +# Maintainer: Andreas Radke +# Committer: Judd Vinet +pkgname=gnupg +pkgver=1.4.10 +pkgrel=2 +pkgdesc="GNU Privacy Guard - a PGP replacement tool" +arch=('i686' 'x86_64') +license=('GPL3') +depends=('zlib' 'bzip2' 'libldap>=2.4.11' 'libusb' 'curl>=7.16.2' 'readline>=5.0.00') +source=(ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/$pkgname-$pkgver.tar.bz2) +install=gnupg.install +url="http://www.gnupg.org/" +md5sums=('dcf7ed712997888d616e029637bfc303') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --libexecdir=/usr/lib # docdir can't be set properly + make || return 1 + ln -s ${pkgname}-${pkgver}/scripts .. + make DESTDIR=${pkgdir} install || return 1 + + # fix fileconflict with gnupg2 pkg + rm ${pkgdir}/usr/share/man/man1/gpg-zip.1 +} diff --git a/abs/extra/gnupg/gnupg.install b/abs/extra/gnupg/gnupg.install new file mode 100644 index 0000000..5a67047 --- /dev/null +++ b/abs/extra/gnupg/gnupg.install @@ -0,0 +1,21 @@ +info_dir=/usr/share/info +info_files=(gnupg1.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} +# vim:set ts=2 sw=2 et: diff --git a/abs/extra/gnuplot/PKGBUILD b/abs/extra/gnuplot/PKGBUILD index ec372f0..3b04bde 100644 --- a/abs/extra/gnuplot/PKGBUILD +++ b/abs/extra/gnuplot/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Niklas Volbers pkgname=gnuplot -pkgver=4.2.5 +pkgver=4.4.0 pkgrel=1 pkgdesc="Command-line driven interactive data and function plotting utility" url="http://www.gnuplot.info" @@ -12,7 +12,6 @@ makedepends=('texinfo') license='custom' arch=('i686') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=(85d042f8efd7aae3d9cbfd85b14d06d2) build() { cd $startdir/src/$pkgname-$pkgver @@ -32,3 +31,4 @@ build() { install -D $startdir/src/$pkgname-$pkgver/Copyright $startdir/pkg/usr/share/licenses/custom/gnuplot/Copyright } +md5sums=('e708665bd512153ad5c35252fe499059') diff --git a/abs/extra/gpgme/PKGBUILD b/abs/extra/gpgme/PKGBUILD new file mode 100644 index 0000000..ce03d89 --- /dev/null +++ b/abs/extra/gpgme/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 48153 2009-07-31 20:34:25Z tpowa $ +# Maintainer: Roman Kyrylych +# Contributor: Sarah Hay + +pkgname=gpgme +pkgver=1.2.0 +pkgrel=1 +pkgdesc="A C wrapper library for GnuPG." +arch=('i686' 'x86_64') +url="http://www.gnupg.org/related_software/gpgme/" +license=('GPL') +depends=('libgpg-error>=1.5' 'pth' 'gnupg') +install=gpgme.install +options=('!libtool' '!emptydirs') +source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('3164bbbd49f94863f2849f39c343521e') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make || return 1 + make DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/share/info/dir + gzip ${pkgdir}/usr/share/info/* +} diff --git a/abs/extra/gpgme/__changelog b/abs/extra/gpgme/__changelog new file mode 100644 index 0000000..4074d1b --- /dev/null +++ b/abs/extra/gpgme/__changelog @@ -0,0 +1 @@ +removed gnupg2 requirement diff --git a/abs/extra/gpgme/gpgme.install b/abs/extra/gpgme/gpgme.install new file mode 100644 index 0000000..b54620d --- /dev/null +++ b/abs/extra/gpgme/gpgme.install @@ -0,0 +1,18 @@ +infodir=/usr/share/info +filelist=(gpgme.info gpgme.info-1 gpgme.info-2) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/abs/extra/gtk-doc/PKGBUILD b/abs/extra/gtk-doc/PKGBUILD index 6bbbb94..3b07565 100644 --- a/abs/extra/gtk-doc/PKGBUILD +++ b/abs/extra/gtk-doc/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: dorphell pkgname=gtk-doc -pkgver=1.10 +pkgver=1.15 pkgrel=1 options=('docs') pkgdesc="Used to document the public API of libraries" @@ -13,7 +13,6 @@ makedepends=('pkgconfig' 'jade') install=gtk-doc.install url="http://www.gtk.org/gtk-doc/" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('cbd4be396b0cf8b8ce1fc9b927cdf451') build() { cd ${startdir}/src/${pkgname}-${pkgver} @@ -21,3 +20,4 @@ build() { make || return 1 make DESTDIR=${startdir}/pkg install || return 1 } +md5sums=('c022788b1fbbec30d55df4ccb34eeb90') diff --git a/abs/extra/help2man/PKGBUILD b/abs/extra/help2man/PKGBUILD new file mode 100644 index 0000000..ef9642e --- /dev/null +++ b/abs/extra/help2man/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 67994 2010-02-10 11:34:11Z giovanni $ +# Maintainer: Giovanni Scafora +# Contributor: Paul Mattal + +pkgname=help2man +pkgver=1.37.1 +pkgrel=1 +pkgdesc="Conversion tool to create man files" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/help2man/" +license=('GPL') +depends=('perl-locale-gettext') +source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz + help2man-1.37.1-respect-LDFLAGS.patch) +md5sums=('371b5cc74fe9c2ea3ee1ca23c19b19a8' + '6f80dfd75b46c6bfbc2eeb5516771096') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i ${srcdir}/help2man-1.37.1-respect-LDFLAGS.patch || return 1 + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --libdir=/lib + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch b/abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch new file mode 100644 index 0000000..a314c27 --- /dev/null +++ b/abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in 2009-11-14 07:21:34.000000000 +0100 ++++ b/Makefile.in 2010-02-10 12:23:35.000000000 +0100 +@@ -103,7 +103,7 @@ + + preload: $(preload).so + $(preload).so: $(srcdir)/$(preload).c +- $(CC) $(CFLAGS) -o $@ -fPIC -shared $? $(LIBS) ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS) + + man: $(target).1 + $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m diff --git a/abs/extra/hicolor-icon-theme/PKGBUILD b/abs/extra/hicolor-icon-theme/PKGBUILD index 55e4c34..7109330 100644 --- a/abs/extra/hicolor-icon-theme/PKGBUILD +++ b/abs/extra/hicolor-icon-theme/PKGBUILD @@ -2,14 +2,13 @@ # Maintainer: arjan # Contributer: Jan De Groot pkgname=hicolor-icon-theme -pkgver=0.10 +pkgver=0.12 pkgrel=1 pkgdesc="Freedesktop.org Hicolor icon theme" arch=(i686 x86_64) depends=() url="http://icon-theme.freedesktop.org/wiki/HicolorTheme" source=(http://icon-theme.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('3534f7b8e59785c7d5bfa923e85510a7') build() { cd ${startdir}/src/${pkgname}-${pkgver} @@ -17,3 +16,4 @@ build() { make || return 1 make DESTDIR=${startdir}/pkg install } +md5sums=('55cafbcef8bcf7107f6d502149eb4d87') diff --git a/abs/extra/htop/PKGBUILD b/abs/extra/htop/PKGBUILD index 326a98a..95b9660 100644 --- a/abs/extra/htop/PKGBUILD +++ b/abs/extra/htop/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Alexander Fehr pkgname=htop -pkgver=0.8.1 +pkgver=0.8.3 pkgrel=1 pkgdesc="Interactive process viewer" arch=('i686' 'x86_64') @@ -10,19 +10,13 @@ url="http://htop.sourceforge.net/" license=('GPL') depends=('ncurses') options=('!emptydirs') -source=(http://downloads.sourceforge.net/htop/htop-$pkgver.tar.gz - htop-treeview.patch) -md5sums=('f0b259ca29175656de48bf0fa0a2e619' - '54613e5237592691da8903fae05780d9') +source=(http://downloads.sourceforge.net/htop/htop-$pkgver.tar.gz) build() { cd "$srcdir/htop-$pkgver" - - # Fix tree view - # http://sourceforge.net/tracker2/?func=detail&aid=2343835&group_id=108839&atid=651635 - patch -Np1 -i "$srcdir/htop-treeview.patch" || return 1 - + sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c || return 1 ./configure --prefix=/usr --enable-unicode || return 1 make || return 1 make DESTDIR="$pkgdir" install || return 1 } +md5sums=('5c9f093f9eaddf6e77aa6d54c2116d0c') diff --git a/abs/extra/huludesktop/PKGBUILD b/abs/extra/huludesktop/PKGBUILD new file mode 100644 index 0000000..b215d19 --- /dev/null +++ b/abs/extra/huludesktop/PKGBUILD @@ -0,0 +1,21 @@ +pkgname=huludesktop +pkgver=0.1 +pkgrel=5 +pkgdesc="Hulu Desktop for Linux" +arch=(i686) +url="http://www.hulu.com/labs/hulu-desktop-linux" +license=('unknown') +makedepends=('deb2targz') +depends=('glib2' 'gtk2' 'lirc' 'flashplugin') +install=huludesktop.install +options=('') +source=('http://download.hulu.com/huludesktop_i386.deb' 'huludesktop') +md5sums=('ee339181b7fb206e2ca2795d46213529') + +build() { + cd $startdir/src + deb2targz huludesktop_i386.deb + tar -xzvf huludesktop_i386.tar.gz -C $pkgdir + mkdir -p $pkgdir/home/mythtv + cp huludesktop $pkgdir/home/mythtv/.huludesktop +} diff --git a/abs/extra/huludesktop/huludesktop b/abs/extra/huludesktop/huludesktop new file mode 100644 index 0000000..c3ae870 --- /dev/null +++ b/abs/extra/huludesktop/huludesktop @@ -0,0 +1,25 @@ +[display] +fullscreen = TRUE +width = 1024 +height = 576 +pos_x = 201 +pos_y = 179 + +[remote] +lirc_device = /dev/lircd +lirc_remote_identifier = mceusb +lirc_release_suffix = _UP +lirc_repeat_threshold = 10 +button_name_up = Up +button_name_down = Down +button_name_left = Left +button_name_right = Right +button_name_select = OK +button_name_menu = Home + +[flash] +flash_location = /usr/lib/mozilla/plugins/libflashplayer.so + +[version] +latest = (null) +eula_version = 0 diff --git a/abs/extra/huludesktop/huludesktop.install b/abs/extra/huludesktop/huludesktop.install new file mode 100644 index 0000000..271c5a1 --- /dev/null +++ b/abs/extra/huludesktop/huludesktop.install @@ -0,0 +1,26 @@ +# arg 1: the new package version +post_install() { + mv /usr/share/mythtv/is.xml /tmp + grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp + echo "" >> /tmp/is.xml.tmp + echo " " >> /tmp/is.xml.tmp + echo "" >> /tmp/is.xml.tmp + echo "" >> /tmp/is.xml.tmp + echo "" >> /tmp/is.xml.tmp + mv /tmp/is.xml.tmp /usr/share/mythtv/is.xml +} +# arg 1: the new package version +# arg 2: the old package version +post_remove() { + rm -fr /usr/share/mythtv/appletrailer.xml + mv /usr/share/mythtv/is.xml /tmp/is.xml.tmp + sed -e '/\#Hulu/,/\#Hulu/d' < /tmp/is.xml.tmp > /usr/share/mythtv/is.xml +} + +op=$1 +shift +$op $* diff --git a/abs/extra/hunspell/PKGBUILD b/abs/extra/hunspell/PKGBUILD index 2db38c2..07a6e66 100644 --- a/abs/extra/hunspell/PKGBUILD +++ b/abs/extra/hunspell/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Hussam Al-Tayeb pkgname=hunspell -pkgver=1.2.8 +pkgver=1.2.11 pkgrel=1 pkgdesc="Spell checker and morphological analyzer library and program" arch=('i686' 'x86_64') @@ -12,7 +12,6 @@ license=('GPL' 'LGPL' 'MPL') depends=('gcc-libs') options=('!libtool') source=(http://downloads.sourceforge.net/hunspell/hunspell-$pkgver.tar.gz) -md5sums=('1177af54a09e320d2c24015f29c3a93e') build() { cd "$srcdir/hunspell-$pkgver" @@ -21,3 +20,4 @@ build() { make || return 1 make DESTDIR="$pkgdir" install || return 1 } +md5sums=('8f57cdc4db091d69e1f682ed4d8ab282') diff --git a/abs/extra/hunspell/__changelog b/abs/extra/hunspell/__changelog new file mode 100644 index 0000000..173ca43 --- /dev/null +++ b/abs/extra/hunspell/__changelog @@ -0,0 +1 @@ +update to 1.2.11 diff --git a/abs/extra/icon-naming-utils/PKGBUILD b/abs/extra/icon-naming-utils/PKGBUILD index 82592ff..ce025df 100644 --- a/abs/extra/icon-naming-utils/PKGBUILD +++ b/abs/extra/icon-naming-utils/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: William Rea pkgname=icon-naming-utils -pkgver=0.8.7 +pkgver=0.8.90 pkgrel=1 pkgdesc="Maps the new names of icons for Tango to the legacy names used by the GNOME and KDE desktops." arch=(i686 x86_64) @@ -11,7 +11,6 @@ license=('GPL') url="http://tango.freedesktop.org/" depends=('perl-xml-simple') source=(http://tango.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2bcd77b8b6361831a932a5e76e82b66d') build() { cd ${startdir}/src/${pkgname}-${pkgver} @@ -22,3 +21,4 @@ build() { make DESTDIR=${startdir}/pkg install mv ${startdir}/pkg/usr/share/pkgconfig ${startdir}/pkg/usr/lib/pkgconfig } +md5sums=('dd8108b56130b9eedc4042df634efa66') diff --git a/abs/extra/imdbpy/PKGBUILD b/abs/extra/imdbpy/PKGBUILD new file mode 100644 index 0000000..f3fe589 --- /dev/null +++ b/abs/extra/imdbpy/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 5794 2009-11-19 01:18:33Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Geoffroy Carrier +# Contributor: lang2 + +pkgname=imdbpy +pkgver=4.6 +pkgrel=1 +pkgdesc="Python bindings for imdb" +url="http://imdbpy.sourceforge.net/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('python') +makedepends=('setuptools') +optdepends=('python-lxml' 'python-sqlalchemy' 'python-sqlobject') +source=(http://downloads.sourceforge.net/$pkgname/IMDbPY-$pkgver.tar.gz) + +build(){ + cd "$srcdir/IMDbPY-$pkgver" + python setup.py install --root="$pkgdir" || return 1 + + # fix directories path + mv ${pkgdir}/usr/etc ${pkgdir} + install -d ${pkgdir}/usr/share + mv ${pkgdir}/usr/imdb ${pkgdir}/usr/share + mv ${pkgdir}/usr/doc ${pkgdir}/usr/share/imdb/ +} +md5sums=('876d4cd041fa23633e3637c22bf95622') diff --git a/abs/extra/irqbalance/PKGBUILD b/abs/extra/irqbalance/PKGBUILD index 5d823cd..a21cda2 100644 --- a/abs/extra/irqbalance/PKGBUILD +++ b/abs/extra/irqbalance/PKGBUILD @@ -3,7 +3,7 @@ pkgname=irqbalance pkgver=0.55 -pkgrel=3 +pkgrel=4 pkgdesc="IRQ balancing daemon for SMP systems" arch=('i686' 'x86_64') url="http://www.irqbalance.org/" @@ -11,14 +11,13 @@ license=('GPL') depends=(glib2) makedepends=(pkgconfig) backup=(etc/conf.d/irqbalance) +install=($pkgname.install) source=(http://www.irqbalance.org/releases/$pkgname-$pkgver.tar.gz Makefile.irqbalance irqbalance.conf.d - irqbalance.rc.d) -md5sums=('9f6b314ff1fdc14173abeb40592d4edf' - '45bc9e1d041d8547f2dbf12f887216df' - '336c1ee99818f9ecda1687e34c69fd6b' - '96efae052553711f74a61760cefa93b5') + run + finish + irqbalance.install) build() { cd $srcdir/$pkgname-$pkgver @@ -26,7 +25,15 @@ build() { cp ../Makefile.irqbalance Makefile make || return 1 - install -D -m755 irqbalance $pkgdir/usr/sbin/irqbalance - install -D -m644 ../irqbalance.conf.d $pkgdir/etc/conf.d/irqbalance - install -D -m755 ../irqbalance.rc.d $pkgdir/etc/rc.d/irqbalance + install -D -m755 irqbalance $pkgdir/usr/sbin/irqbalance || return 1 + mkdir -p $pkgdir/etc/sv/irqbalance || return 1 + install -D -m644 ../irqbalance.conf.d $pkgdir/etc/conf.d/irqbalance || return 1 + install -D -m755 ../run $pkgdir/etc/sv/irqbalance || return 1 + install -D -m755 ../finish $pkgdir/etc/sv/irqbalance || return 1 } +md5sums=('9f6b314ff1fdc14173abeb40592d4edf' + '45bc9e1d041d8547f2dbf12f887216df' + '336c1ee99818f9ecda1687e34c69fd6b' + '7f3ee7fb2fccb619f7c66668b6d96d35' + 'ebb35e88267f4c2e6f68e675c81b2a34' + '5f5e96d2fbf35e85d4a8004a3d6b73fc') diff --git a/abs/extra/irqbalance/finish b/abs/extra/irqbalance/finish new file mode 100644 index 0000000..ccd9278 --- /dev/null +++ b/abs/extra/irqbalance/finish @@ -0,0 +1,15 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/irqbalance` + + stat_runit "Stopping IRQ balancing" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon irqbalance + stat_done + fi diff --git a/abs/extra/irqbalance/irqbalance.install b/abs/extra/irqbalance/irqbalance.install new file mode 100644 index 0000000..d4e15f1 --- /dev/null +++ b/abs/extra/irqbalance/irqbalance.install @@ -0,0 +1,10 @@ +post_install () { + add_service.sh irqbalance + +} + +pre_remove () { + remove_service.sh irqbalance + +} + diff --git a/abs/extra/irqbalance/run b/abs/extra/irqbalance/run new file mode 100644 index 0000000..f0d18f7 --- /dev/null +++ b/abs/extra/irqbalance/run @@ -0,0 +1,25 @@ +#!/bin/bash + +# source application-specific settings +ONESHOT=0 +[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance + +if [ "$ONESHOT" -ne 0 ]; then + ONESHOT_CMD="oneshot" +fi + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/irqbalance` + + stat_runit "Starting IRQ balancing" + [ -z "$PID" ] && /usr/sbin/irqbalance --debug $ONESHOT_CMD >/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + if [ "$ONESHOT" -eq 0 ]; then + add_daemon irqbalance + fi + stat_done + fi diff --git a/abs/extra/iso-codes/PKGBUILD b/abs/extra/iso-codes/PKGBUILD index 21504a3..9477d74 100644 --- a/abs/extra/iso-codes/PKGBUILD +++ b/abs/extra/iso-codes/PKGBUILD @@ -2,14 +2,13 @@ # Maintainer: Jan de Groot pkgname=iso-codes -pkgver=2.0 +pkgver=3.18 pkgrel=1 arch=(i686 x86_64) license=('LGPL') pkgdesc="Lists of the country, language, and currency names" source=(ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/${pkgname}-${pkgver}.tar.bz2) url="http://pkg-isocodes.alioth.debian.org/" -md5sums=('58e7fee45749583e11a3880c8e1ae567') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -17,3 +16,4 @@ build() { make || return 1 make DESTDIR=${pkgdir} pkgconfigdir=/usr/lib/pkgconfig install || return 1 } +md5sums=('96d22a03e307a8e0ca1e43280392cdc4') diff --git a/abs/extra/iw/PKGBUILD b/abs/extra/iw/PKGBUILD index 052e6d0..2f66bdc 100644 --- a/abs/extra/iw/PKGBUILD +++ b/abs/extra/iw/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Baechler pkgname=iw -pkgver=0.9.8 +pkgver=0.9.20 pkgrel=1 pkgdesc="nl80211 based CLI configuration utility for wireless devices" arch=("i686" "x86_64") @@ -11,10 +11,10 @@ license=("GPL") depends=("libnl") makedepends=("kernel-headers") source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('d39f85e3866b1be5533fe0edce412951') build() { cd $pkgname-$pkgver make || return 1 make DESTDIR=$pkgdir install } +md5sums=('1055799b544b3e08169d155bb6c21bb0') diff --git a/abs/extra/lcdproc/PKGBUILD b/abs/extra/lcdproc/PKGBUILD index 7ee6e50..e5cc719 100644 --- a/abs/extra/lcdproc/PKGBUILD +++ b/abs/extra/lcdproc/PKGBUILD @@ -1,29 +1,26 @@ # Contributor: Bernhard Walle pkgname=lcdproc -pkgver=0.5.2 -pkgrel=2 +pkgver=0.5.3 +pkgrel=3 pkgdesc="LCDproc is a utility to drive one or more LCD (and LCD-like) devices attached to a host." url="http://lcdproc.omnipotent.net/" license="GPL" depends=(libusb serdisplib libftdi autoconf automake lirc libnxml libmrss pkgconfig xosd) backup=(etc/LCDd.conf) arch=(i686 x86_64) +install=lcdproc.install source=(http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - lcdd lcdproc-add-serdisplib ) -md5sums=('860f192d061d87dda6512b11b79daac2' - '56f52dcccd6e129a9cf84cd1a0452d56' - '274322642740ad323c43ec5d324519d4') build() { cd $startdir/src/$pkgname-$pkgver - patch -p1 < ../lcdproc-add-serdisplib +# patch -p1 < ../lcdproc-add-serdisplib autoreconf ./configure --prefix=/usr --sysconfdir=/etc --enable-libusb --enable-lcdproc-menus --enable-stat-smbfs --enable-drivers=all make make DESTDIR=$startdir/pkg install - sed -e "s/server\/drivers\//\/usr\/lib\/lcdproc\//g" LCDd.conf > $startdir/pkg/etc/LCDd.conf - mkdir -p $startdir/pkg/etc/rc.d - install -m 755 $startdir/src/lcdd $startdir/pkg/etc/rc.d + sed -e "s/server\/drivers\//\/usr\/lib\/lcdproc\//g" LCDd.conf > $pkgdir/etc/LCDd.conf } +md5sums=('fe9a7c9d8f2c5e76250ce2ea8f644921' + '274322642740ad323c43ec5d324519d4') diff --git a/abs/extra/lcdproc/__changelog b/abs/extra/lcdproc/__changelog index 52c2d35..96fd954 100644 --- a/abs/extra/lcdproc/__changelog +++ b/abs/extra/lcdproc/__changelog @@ -1 +1,4 @@ -add xosd \ No newline at end of file +add xosd +# mihanson 2010-04-05 +updated to 0.5.3 +removed lcdproc-add-serdisplib as it does not appear to be needed anymore diff --git a/abs/extra/lcdproc/lcdproc.install b/abs/extra/lcdproc/lcdproc.install new file mode 100644 index 0000000..bd3c85e --- /dev/null +++ b/abs/extra/lcdproc/lcdproc.install @@ -0,0 +1,7 @@ +post_install() { + add_service.sh lcdd +} + +pre_remove() { + remove_service.sh lcdd +} diff --git a/abs/extra/libbonobo/PKGBUILD b/abs/extra/libbonobo/PKGBUILD index 93e2538..de48e25 100644 --- a/abs/extra/libbonobo/PKGBUILD +++ b/abs/extra/libbonobo/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot pkgname=libbonobo -pkgver=2.24.1 +pkgver=2.24.3 pkgrel=1 pkgdesc="A set of language and system independant CORBA interfaces for creating reusable components" arch=(i686 x86_64) @@ -16,8 +16,6 @@ url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.24/libbonobo-${pkgver}.tar.bz2 bonobo-activation-config.xml) install=libbonobo.install -md5sums=('8868b6083392964a6969547ceb8d7cd1' - '6392efaca30a26f826eafc4b8ccbc01f') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,3 +26,5 @@ build() { make DESTDIR="${pkgdir}" install || return 1 install -m644 "${srcdir}/bonobo-activation-config.xml" "${pkgdir}/etc/bonobo-activation/" || return 1 } +md5sums=('b217cef6a187505290c66c5bf8225d38' + '6392efaca30a26f826eafc4b8ccbc01f') diff --git a/abs/extra/libbonoboui/PKGBUILD b/abs/extra/libbonoboui/PKGBUILD index b008798..7118102 100644 --- a/abs/extra/libbonoboui/PKGBUILD +++ b/abs/extra/libbonoboui/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot pkgname=libbonoboui -pkgver=2.24.1 +pkgver=2.24.3 pkgrel=1 pkgdesc="User Interface library for Bonobo" arch=(i686 x86_64) @@ -12,7 +12,6 @@ makedepends=('perlxml' 'pkgconfig') options=('!libtool' '!emptydirs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2) -md5sums=('9ff3ec1c7aefd0b1a15a5b21ecc7b4e4') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -22,3 +21,4 @@ build() { make DESTDIR="${pkgdir}" install || return 1 rm -f "${pkgdir}/usr/share/applications/bonobo-browser.desktop" } +md5sums=('3a754b1df0a4d5fd4836a05020a0bb4a') diff --git a/abs/extra/libcdio/PKGBUILD b/abs/extra/libcdio/PKGBUILD index d3aaaa9..1d4cacf 100644 --- a/abs/extra/libcdio/PKGBUILD +++ b/abs/extra/libcdio/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: damir pkgname=libcdio -pkgver=0.80 -pkgrel=3 +pkgver=0.82 +pkgrel=1 pkgdesc="GNU Compact Disc Input and Control Library" arch=("i686" "x86_64") license=('GPL') @@ -12,7 +12,6 @@ url="http://www.gnu.org/software/libcdio/" depends=('gcc-libs>=4.3.0' 'libcddb' 'ncurses') options=('!libtool') source=(http://ftp.gnu.org/gnu/libcdio/$pkgname-$pkgver.tar.gz) -md5sums=('6495add276ed11b7ac8a88092799ab4f') build() { cd $startdir/src/$pkgname-$pkgver @@ -24,3 +23,4 @@ build() { rm ${pkgdir}/usr/share/info/dir } +md5sums=('1c29b18e01ab2b966162bc727bf3c360') diff --git a/abs/extra/libebml/PKGBUILD b/abs/extra/libebml/PKGBUILD index d537999..ffa4331 100644 --- a/abs/extra/libebml/PKGBUILD +++ b/abs/extra/libebml/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: 03/08/04 pkgname=libebml -pkgver=0.7.8 +pkgver=1.0.0 pkgrel=1 pkgdesc="Extensible Binary Meta Language library" arch=(i686 x86_64) @@ -18,6 +18,4 @@ build() { make || return 1 make prefix=$startdir/pkg/usr install } - - -md5sums=('6278109f52e4f9d2c8a8dfc0d668b587') +md5sums=('6d438f03d8928d83a2d120ed02705f03') diff --git a/abs/extra/libftdi/PKGBUILD b/abs/extra/libftdi/PKGBUILD index b435b9a..b5a72da 100644 --- a/abs/extra/libftdi/PKGBUILD +++ b/abs/extra/libftdi/PKGBUILD @@ -1,14 +1,13 @@ # Contributor: Bernhard Walle pkgname=libftdi -pkgver=0.13 -pkgrel=0 +pkgver=0.18 +pkgrel=1 pkgdesc="Library to program and control the FTDI USB controller" url="http://www.intra2net.com/de/produkte/opensource/ftdi/" license="GPL" depends=(libusb) arch=(i686 x86_64) source=(http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/$pkgname-$pkgver.tar.gz) -md5sums=('7b4a660fd644980f3d45873d156d021a') build() { cd $startdir/src/$pkgname-$pkgver @@ -17,3 +16,4 @@ build() { make DESTDIR=$startdir/pkg install } # :mode=shellscript: +md5sums=('916f65fa68d154621fc0cf1f405f2726') diff --git a/abs/extra/libmatroska/PKGBUILD b/abs/extra/libmatroska/PKGBUILD new file mode 100644 index 0000000..f515d3e --- /dev/null +++ b/abs/extra/libmatroska/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# Maintainer: damir +# Contributor 03/08/04 + +pkgname=libmatroska +pkgver=1.0.0 +pkgrel=1 +pkgdesc="Matroska library" +arch=(i686 x86_64) +url="http://dl.matroska.org/downloads/libmatroska/" +depends=('libebml>=1.0.0') +#source=(http://www.bunkus.org/videotools/mkvtoolnix/sources/$pkgname-$pkgver.tar.bz2) +source=($url/$pkgname-$pkgver.tar.bz2) + +build() { + cd $startdir/src/$pkgname-$pkgver/make/linux + make sharedlib || return 1 + make prefix=$startdir/pkg/usr install +} +md5sums=('4efcf3945b17a6f0320cf1aaa326a4de') diff --git a/abs/extra/libmms/PKGBUILD b/abs/extra/libmms/PKGBUILD index 81c7474..230b082 100644 --- a/abs/extra/libmms/PKGBUILD +++ b/abs/extra/libmms/PKGBUILD @@ -2,7 +2,7 @@ #Maintainer: Jan de Groot pkgname=libmms -pkgver=0.4 +pkgver=0.5 pkgrel=1 pkgdesc="MMS stream protocol library" arch=(i686 x86_64) @@ -11,7 +11,6 @@ license=(LGPL) depends=('glib2>=2.16.4') options=('!libtool') source=(http://launchpad.net/libmms/trunk/${pkgver}/+download/libmms-${pkgver}.tar.gz) -md5sums=('4a681a815186fe26bb1b02ccea57fb75') build() { cd ${startdir}/src/${pkgname}-${pkgver} @@ -19,3 +18,4 @@ build() { make || return 1 make DESTDIR=${startdir}/pkg install || return 1 } +md5sums=('cf83053ec891f14e73a04c84d9de08ee') diff --git a/abs/extra/lm_sensors/ChangeLog b/abs/extra/lm_sensors/ChangeLog new file mode 100644 index 0000000..dfec49d --- /dev/null +++ b/abs/extra/lm_sensors/ChangeLog @@ -0,0 +1,50 @@ +2010-02-02 Eric Belanger + + * lm_sensors 3.1.2-1 + * Upstream update + * Fixed fancontrol daemon script (close FS#17775) + +2009-11-23 Eric Belanger + + * lm_sensors 3.1.1-4 + * Added more configs in backup array (close FS#17260) + * Changed rrdtool optdepends to a depends + +2009-11-20 Eric Belanger + + * lm_sensors 3.1.1-3 + * Fixed stopping of fancontrol daemon script (close FS#17083) + * Fixed healthd script (close FS#17089) + +2009-09-28 Eric Belanger + + * lm_sensors 3.1.1-2 + * Fixed fancontrol daemon script (close FS#15269) + * Added sensord daemon script (close FS#15811) + +2009-06-24 Eric Belanger + + * lm_sensors 3.1.1-1 + * Upstream update + * Added healthd daemon (close FS#14597) + +2009-03-03 Eric Belanger + + * lm_sensors 3.1.0-1 + * Upstream update + * Updated sensors-detect.patch + +2009-01-03 Eric Belanger + + * lm_sensors 3.0.3-2 + * Rebuilt against rrdtool 1.3.5 + +2008-11-08 Eric Belanger + + * lm_sensors 3.0.3-1 + * Upstream update + * Updated sensors-detect.patch patch + * FHS man pages + * Changed sensors daemon script to move config in new location (cf. FS#9516) + * Did several other fixes and clean up in sensors daemon script + * Added ChangeLog diff --git a/abs/extra/lm_sensors/PKGBUILD b/abs/extra/lm_sensors/PKGBUILD index 487a6fe..226139a 100644 --- a/abs/extra/lm_sensors/PKGBUILD +++ b/abs/extra/lm_sensors/PKGBUILD @@ -1,41 +1,44 @@ -# $Id: PKGBUILD 8687 2008-08-15 15:06:46Z andyrtr $ -# Maintainer: aurelien +# $Id: PKGBUILD 67093 2010-02-03 03:55:56Z eric $ +# Maintainer: Eric Belanger # Contributor: Aurelien Foret + pkgname=lm_sensors -pkgver=3.0.2 -pkgrel=2 -pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring." +pkgver=3.1.2 +pkgrel=7 +pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64') +url="http://www.lm-sensors.org/" license=('GPL') -depends=('perl' 'sysfsutils') -makedepends=('bison' 'flex' 'rrdtool') -optdepends=('rrdtool: for logging with sensord') -backup=(etc/sensors3.conf) +depends=('perl' 'sysfsutils' 'rrdtool') +backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord') +options=('!emptydirs') install=sensors.install -source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-$pkgver.tar.bz2 - sensors.rc - fancontrol.rc - sensors-detect.patch) -url="http://www.lm-sensors.org/" -md5sums=('5b210ba9cc01f00161c438fd618484e5' - 'c9f7f38964963ae3ced4dff3f1f0b7b9' - 'f14e335a8eea27388892c36af8099782' - '6fd30ed1e5ac739b8a27f3913ba706f4') +source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \ + sensors.rc fancontrol.rc sensors-detect.patch healthd healthd.conf healthd.rc \ + sensord.conf sensord.rc) +md5sums=('58a9a225808ac4587c4c8cbd12b40b5c' 'c370f5e620bfe41113354a1e22c0c18c'\ + '1e04aad66debdb72557b4528bf79b742' '47c40b381d1f25d6634ae84cecf35f33'\ + '6549050897c237514aeaa2bb6cfd29ea' 'f649261f52bd4329347bf93f5f83cb0a'\ + '970408d2e509dc4138927020efefe323' '96a8dd468e81d455ec9b165bdf33e0b7'\ + '41a5c20854bbff00ea7174bd2276b736') +sha1sums=('4a3b13e4f9c18c29e7f853739bdd88ca7799fcc7' 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'\ + '66f3cdde688127f4e4e81b5ec3c180149b5c36ea' '47095a32a918d6be50bd8daa8aaa9c24940d60e9'\ + '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8' 'c6ddfebc20685ba69700f66038c6b00a7c0bdb80'\ + 'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f' 'de8d4d65406815c389f8a04e2a8508a1ae6749c8'\ + '72a60251d1d55a67307dab4105d9f3f01a080af4') build() { - cd ${srcdir}/$pkgname-$pkgver - patch -Np0 -i ${srcdir}/sensors-detect.patch || return 1 - - make PREFIX=/usr PROG_EXTRA:=sensord user || return 1 - make user_install PREFIX=/usr DESTDIR=${pkgdir} - install -DT -m755 ${srcdir}/$pkgname-$pkgver/prog/sensord/sensord ${pkgdir}/usr/sbin/sensord - - install -DT -m755 ${srcdir}/sensors.rc ${pkgdir}/etc/rc.d/sensors - install -DT -m755 ${srcdir}/fancontrol.rc ${pkgdir}/etc/rc.d/fancontrol + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 < ../sensors-detect.patch || return 1 - # remove the static lib - rm -rf ${pkgdir}/usr/lib/libsensors.a + make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \ + PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install || return 1 - # FIXME: avoid conflicts with glibc headers - rm -rf ${pkgdir}/usr/include/linux + install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors" || return 1 + install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol" || return 1 + install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd" || return 1 + install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd" || return 1 + install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd" || return 1 + install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord" || return 1 + install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord" || return 1 } diff --git a/abs/extra/lm_sensors/fancontrol.rc b/abs/extra/lm_sensors/fancontrol.rc index 7fc1bbf..bce5d7e 100644 --- a/abs/extra/lm_sensors/fancontrol.rc +++ b/abs/extra/lm_sensors/fancontrol.rc @@ -3,10 +3,11 @@ . /etc/rc.conf . /etc/rc.d/functions +PID=$(pidof -o %PPID -x /usr/sbin/fancontrol) case "$1" in start) stat_busy "Starting fancontrol" - /usr/sbin/fancontrol >/dev/null 2>&1 & + [ -z "$PID" ] && /usr/sbin/fancontrol >/dev/null 2>&1 & if [ $? -gt 0 ]; then stat_fail else @@ -16,7 +17,7 @@ case "$1" in ;; stop) stat_busy "Stopping fancontrol" - [ -f /var/run/fancontrol.pid ] && kill `cat /var/run/fancontrol.pid` + [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail else diff --git a/abs/extra/lm_sensors/healthd b/abs/extra/lm_sensors/healthd new file mode 100644 index 0000000..0315dd7 --- /dev/null +++ b/abs/extra/lm_sensors/healthd @@ -0,0 +1,46 @@ +#!/bin/bash + +# +# /usr/sbin/healthd +# + +. /etc/conf.d/healthd + +cmd="${ALARM_CMD}" +addr="${ADMIN_EMAIL}" +slp="${ALARM_SLEEP}" +sensors="/usr/bin/sensors" + + +while [ $# -gt 0 ] ; do + case "${1}" in + -c ) cmd="${2}" ; shift 2 ;; + -m ) addr="${2}" ; shift 2 ;; + -s ) slp="${2}" ; shift 2 ;; + * ) shift 1 ;; + esac +done + +[ -n "${cmd}" ] && [ -n "$( which -- "${cmd%% *}" )" ] || \ + [ -n "${addr}" ] || exit 1 + +[ "${slp}" -ge 2 ] || slp=600 + +while true ; do + sleep 15 + message="$( $sensors )" + case "$message" in + '' ) message='Could not get any sensor values !' ;; + *ALARM* ) : ;; + * ) message='' ;; + esac + if [ -n "$message" ]; then + if [ -n "${addr}" ]; then + echo "$message" | mail -s \ + "Sensors ALARM detected at host: $( hostname )" \ + "${addr}" + fi + [ -z "${cmd}" ] || ${cmd} & + sleep ${slp} + fi +done & diff --git a/abs/extra/lm_sensors/healthd.conf b/abs/extra/lm_sensors/healthd.conf new file mode 100644 index 0000000..36c5f55 --- /dev/null +++ b/abs/extra/lm_sensors/healthd.conf @@ -0,0 +1,16 @@ +# +# /etc/conf.d/healthd +# + +# reset any pending alarms on startup +ALARM_RESET="yes" + +# where to sent mails on alarm +ADMIN_EMAIL="root" + +# Seconds to sleep when alarm detected before checking again +# If you want to fill up your mail inbox set this to 2. ;-) +ALARM_SLEEP=600 + +# command to run in background on each alarm +ALARM_CMD="beep -f 800 -l 500 -d 500 -r 600" diff --git a/abs/extra/lm_sensors/healthd.rc b/abs/extra/lm_sensors/healthd.rc new file mode 100644 index 0000000..7bb7951 --- /dev/null +++ b/abs/extra/lm_sensors/healthd.rc @@ -0,0 +1,52 @@ +#!/bin/bash + +# +# /etc/rc.d/healthd +# + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/healthd + +maybe_alarm_reset() { + case "${ALARM_RESET}" in + yes) /usr/bin/sensors > /dev/null + ;; + no) true + ;; + *) false + esac + return $? +} + +PID=$(pidof -x -o %PPID /usr/sbin/healthd) +case "${1}" in + start) + stat_busy "Starting Health Daemon" + [ -z "${PID}" ] && maybe_alarm_reset && /usr/sbin/healthd &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + echo "${PID}" > /var/run/healthd.pid + add_daemon healthd + stat_done + fi + ;; + stop) + stat_busy "Stopping Health Daemon" + [ ! -z "${PID}" ] && kill ${PID} &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon healthd + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/abs/extra/lm_sensors/sensord.conf b/abs/extra/lm_sensors/sensord.conf new file mode 100644 index 0000000..a1cf091 --- /dev/null +++ b/abs/extra/lm_sensors/sensord.conf @@ -0,0 +1,4 @@ +# +# Parameters to be passed to sensord +# +SENSORD_ARGS="" diff --git a/abs/extra/lm_sensors/sensord.rc b/abs/extra/lm_sensors/sensord.rc new file mode 100644 index 0000000..e3ef4d2 --- /dev/null +++ b/abs/extra/lm_sensors/sensord.rc @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/sensord + +PID=$(pidof -o %PPID /usr/sbin/sensord) +case "$1" in + start) + stat_busy "Starting sensord" + [ -z "$PID" ] && /usr/sbin/sensord ${SENSORD_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon sensord + stat_done + fi + ;; + stop) + stat_busy "Stopping sensord" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon sensord + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/abs/extra/lm_sensors/sensors-detect.patch b/abs/extra/lm_sensors/sensors-detect.patch index 981ed3d..1d12a2c 100644 --- a/abs/extra/lm_sensors/sensors-detect.patch +++ b/abs/extra/lm_sensors/sensors-detect.patch @@ -1,61 +1,61 @@ ---- prog/detect/sensors-detect.orig 2008-02-07 20:59:25.125302226 +0100 -+++ prog/detect/sensors-detect 2008-02-07 21:06:53.821929489 +0100 -@@ -5879,21 +5879,21 @@ - } - } +diff -Naur lm_sensors-3.1.0/prog/detect/sensors-detect lm_sensors-3.1.0-new/prog/detect/sensors-detect +--- lm_sensors-3.1.0/prog/detect/sensors-detect 2009-03-03 20:36:33.000000000 -0500 ++++ lm_sensors-3.1.0-new/prog/detect/sensors-detect 2009-03-03 20:52:06.000000000 -0500 +@@ -5282,21 +5282,21 @@ + } + } -- my $have_sysconfig = -d '/etc/sysconfig'; -- printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ", -- (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'), -+ my $have_sysconfig = -d '/etc/conf.d'; -+ printf "Do you want to \%s /etc/conf.d/lm_sensors? (\%s): ", -+ (-e '/etc/conf.d/lm_sensors' ? 'overwrite' : 'generate'), - ($have_sysconfig ? 'YES/no' : 'yes/NO'); - $_ = ; - if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) { - unless ($have_sysconfig) { -- mkdir '/etc/sysconfig', 0777 -- or die "Sorry, can't create /etc/sysconfig ($!)"; -+ mkdir '/etc/conf.d', 0777 -+ or die "Sorry, can't create /etc/conf.d ($!)"; - } -- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors") -- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)"; -+ open(local *SYSCONFIG, ">/etc/conf.d/lm_sensors") -+ or die "Sorry, can't create /etc/conf.d/lm_sensors ($!)"; - print SYSCONFIG <<'EOT'; --# /etc/sysconfig/lm_sensors - Defines modules loaded by --# /etc/init.d/lm_sensors -+# /etc/conf.d/lm_sensors - Defines modules loaded by -+# /etc/rc.d/sensors - # Copyright (c) 1998 - 2001 Frodo Looijaard +- my $have_sysconfig = -d '/etc/sysconfig'; +- printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ", +- (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'), ++ my $have_sysconfig = -d '/etc/conf.d'; ++ printf "Do you want to \%s /etc/conf.d/lm_sensors? (\%s): ", ++ (-e '/etc/conf.d/lm_sensors' ? 'overwrite' : 'generate'), + ($have_sysconfig ? 'YES/no' : 'yes/NO'); + $_ = ; + if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) { + unless ($have_sysconfig) { +- mkdir('/etc/sysconfig', 0777) +- or die "Sorry, can't create /etc/sysconfig ($!)"; ++ mkdir('/etc/conf.d', 0777) ++ or die "Sorry, can't create /etc/conf.d ($!)"; + } +- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors") +- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)"; ++ open(local *SYSCONFIG, ">/etc/conf.d/lm_sensors") ++ or die "Sorry, can't create /etc/conf.d/lm_sensors ($!)"; + print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n"; + print SYSCONFIG <<'EOT'; +-# This file is sourced by /etc/init.d/lm_sensors and defines the modules to ++# This file is sourced by /etc/rc.d/lm_sensors and defines the modules to + # be loaded/unloaded. # - # This program is free software; you can redistribute it and/or modify -@@ -5914,8 +5914,8 @@ - # See also the lm_sensors homepage at: - # http://www.lm-sensors.org/ - # --# This file is used by /etc/init.d/lm_sensors and defines the modules to --# be loaded/unloaded. This file is sourced into /etc/init.d/lm_sensors. -+# This file is used by /etc/rc.d/sensors and defines the modules to -+# be loaded/unloaded. This file is sourced into /etc/rc.d/sensors. - # - # The format of this file is a shell script that simply defines the modules - # in order as normal variables with the special names: -@@ -5952,12 +5952,12 @@ - print SYSCONFIG $sysconfig; - close(SYSCONFIG); + # The format of this file is a shell script that simply defines variables: +@@ -5322,13 +5322,13 @@ + } + close(SYSCONFIG); + +- print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n". ++ print "Copy prog/init/lm_sensors.init to /etc/rc.d/lm_sensors\n". + "for initialization at boot time.\n" +- unless -f "/etc/init.d/lm_sensors"; ++ unless -f "/etc/rc.d/lm_sensors"; -- print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n". -+ print "Copy prog/init/lm_sensors.init to /etc/rc.d/sensors\n". - "for initialization at boot time.\n" -- unless -f "/etc/init.d/lm_sensors"; -+ unless -f "/etc/rc.d/sensors"; +- if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") { +- system("/sbin/insserv", "/etc/init.d/lm_sensors"); +- } elsif (-x "/sbin/chkconfig" && -f "/etc/init.d/lm_sensors") { ++ if (-x "/sbin/insserv" && -f "/etc/rc.d/lm_sensors") { ++ system("/sbin/insserv", "/etc/rc.d/lm_sensors"); ++ } elsif (-x "/sbin/chkconfig" && -f "/etc/rc.d/lm_sensors") { + system("/sbin/chkconfig", "lm_sensors", "on"); + if (-x "/sbin/service") { + system("/sbin/service", "lm_sensors", "start"); +@@ -5377,7 +5377,7 @@ + exit -1; + } -- if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") { -- system("/sbin/insserv", "/etc/init.d/lm_sensors"); -+ if (-x "/sbin/insserv" && -f "/etc/rc.d/sensors") { -+ system("/sbin/insserv", "/etc/rc.d/sensors"); - } elsif (-x "/sbin/chkconfig" && -f "/etc/init.d/lm_sensors") { - system("/sbin/chkconfig", "lm_sensors", "on"); - if (-x "/sbin/service") { +- if (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" && ++ if (-x "/sbin/service" && -f "/etc/rc.d/sensors" && + -f "/var/lock/subsys/lm_sensors") { + system("/sbin/service", "lm_sensors", "stop"); + } diff --git a/abs/extra/lm_sensors/sensors.rc b/abs/extra/lm_sensors/sensors.rc index aa086eb..4acde22 100644 --- a/abs/extra/lm_sensors/sensors.rc +++ b/abs/extra/lm_sensors/sensors.rc @@ -1,27 +1,12 @@ #!/bin/bash -# -# chkconfig: 2345 26 74 + # description: sensors is used for monitoring motherboard sensor values. -# config: /etc/sysconfig/sensors -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# config: /etc/conf.d/lm_sensors # See also the lm_sensors homepage at: # http://www2.lm-sensors.nu/~lm78/index.html -# It uses a config file /etc/sysconfig/sensors that contains the modules to +# It uses a config file /etc/conf.d/lm_sensors that contains the modules to # be loaded/unloaded. That file is sourced into this one. # The format of that file a shell script that simply defines the modules @@ -31,46 +16,52 @@ . /etc/rc.conf . /etc/rc.d/functions -if grep -q sysfs /proc/mounts; then +PSENSORS=/usr/bin/sensors + +if $(grep -q sysfs /proc/mounts); then WITHSYS=1 else WITHSYS=0 fi -CONFIG=/etc/conf.d/lm_sensors -PSENSORS=/usr/bin/sensors -if [ ! -x $PSENSORS ]; then - PSENSORS=/usr/bin/sensors +if [ $WITHSYS == "0" ]; then + # If sensors isn't supported by the kernel, try loading the module... + [ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null + + # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have support for sensors. + if ! [ -e /proc/sys/dev/sensors ]; then + echo "lm_sensors: kernel does not have sensors support" + stat_fail + fi + + # If sensors was not already running, unload the module... + [ -e /var/run/daemons/sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null +fi + +if [ -e /etc/conf.d/lm_sensors ]; then + CONFIG=/etc/conf.d/lm_sensors +elif [ -e /etc/sysconfig/lm_sensors ]; then + # Moving config to new Arch-specific location + mv /etc/sysconfig/lm_sensors /etc/conf.d/lm_sensors + CONFIG=/etc/conf.d/lm_sensors fi case "$1" in start) stat_busy "Starting Up Sensors" - if [ $WITHSYS == "0" ]; then - # If sensors isn't supported by the kernel, try loading the module... - [ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null - - # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have - # support for sensors. - [ -e /proc/sys/dev/sensors ] || exit 0 - - # If sensors was not already running, unload the module... - [ -e /var/lock/subsys/lm_sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null - fi - - if [ -r "$CONFIG" ]; then - . "$CONFIG" - modules=`grep \^MODULE_ $CONFIG | wc -l | tr -d ' '` - i=0 - while [ $i -lt $modules ] ; do - module=`eval echo '$'MODULE_$i` - #echo starting module __${module}__ #debug - /sbin/modprobe $module &>/dev/null - i=`expr $i + 1` - done + . "$CONFIG" + modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ') + i=0 + while [ $i -lt $modules ] ; do + module=$(eval echo '$'MODULE_$i) + # echo starting module __${module}__ #debug + /sbin/modprobe $module &>/dev/null + i=$(expr $i + 1) + done fi + $PSENSORS -s if [ $? -gt 0 ]; then @@ -85,14 +76,15 @@ case "$1" in stat_busy "Shutting Down Sensors" if [ -r "$CONFIG" ]; then - . "$CONFIG" - modules=`grep \^MODULE_ $CONFIG | wc -l | tr -d ' '` - i=`expr $modules` - while [ $i -ge 0 ] ; do - module=`eval echo '$'MODULE_$i` - /sbin/modprobe -r $module &>/dev/null - i=`expr $i - 1` - done + . "$CONFIG" + modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ') + i=$(expr $modules - 1) + while [ $i -ge 0 ] ; do + module=$(eval echo '$'MODULE_$i) + # echo stoping module __${module}__ #debug + /sbin/modprobe -r $module &>/dev/null + i=$(expr $i - 1) + done fi if [ $WITHSYS == "0" ]; then @@ -107,9 +99,8 @@ case "$1" in fi ;; - dostatus) + status) $PSENSORS - RETVAL=$? ;; restart) @@ -119,9 +110,10 @@ case "$1" in ;; condrestart) - [ -e /var/lock/subsys/lm_sensors ] && restart || : + [ -e /var/run/daemons/sensors ] && $0 restart || : ;; *) - echo "Usage: sensors.init {start|stop|status|restart|reload|condrestart}" + echo "Usage: $0 {start|stop|restart|status|condrestart}" esac +exit 0 diff --git a/abs/extra/mediaserv/PKGBUILD b/abs/extra/mediaserv/PKGBUILD index 0ed43fa..59eed79 100644 --- a/abs/extra/mediaserv/PKGBUILD +++ b/abs/extra/mediaserv/PKGBUILD @@ -3,7 +3,7 @@ pkgname=mediaserv pkgver=0.05 -pkgrel=5 +pkgrel=20 pkgdesc="On-demand transcoding server for videos, targetting the Nokia Internet Tablets." arch=('i686' 'x86_64') license=('ARTISTIC') @@ -26,3 +26,8 @@ build() { cp -a ${srcdir}/.mediaserv/* ${pkgdir}/myth/mediaserv install -D -m755 ${srcdir}/run ${srcdir}/finish $startdir/pkg/etc/sv/mediaserv } +md5sums=('94c300a0e95c55dae42a61f77e4e41fe' + 'e7b6fcc91b73939db350c4854c19e9ee' + '68d25630786e76fa36c9e6bb29821367' + 'd047f0fa5f1d39d864debd8a76f677e2' + 'f2022c1cc8f04959299c97edde06d023') diff --git a/abs/extra/mediaserv/linhes-mediaserv.tar.bz2 b/abs/extra/mediaserv/linhes-mediaserv.tar.bz2 index 7630679..6397fb7 100644 Binary files a/abs/extra/mediaserv/linhes-mediaserv.tar.bz2 and b/abs/extra/mediaserv/linhes-mediaserv.tar.bz2 differ diff --git a/abs/extra/mediaserv/mediaserv.install b/abs/extra/mediaserv/mediaserv.install index 7a26077..4a9de8e 100644 --- a/abs/extra/mediaserv/mediaserv.install +++ b/abs/extra/mediaserv/mediaserv.install @@ -1,8 +1,20 @@ # arg 1: the new package version + + post_install() { - ln -s /myth/mediaserv /home/mythtv/.mediaserv - ln -s /myth/pretty /myth/mediaserv/media/tv - ln -s /myth/video /myth/mediaserv/media/video + if [ ! -e /home/mythtv/.mediaserv ] + then + ln -s /myth/mediaserv /home/mythtv/.mediaserv + fi + + if [ ! -e /myth/mediaserv/media/tv ] + then + ln -s /myth/pretty /myth/mediaserv/media/tv + fi + if [ ! -e /myth/mediaserv/media/video ] + then + ln -s /myth/video /myth/mediaserv/media/video + fi chown -R mythtv.mythtv /myth/mediaserv add_service.sh mediaserv sv start mediaserv diff --git a/abs/extra/mediaserv/run b/abs/extra/mediaserv/run index 82a1705..fbd1c97 100644 --- a/abs/extra/mediaserv/run +++ b/abs/extra/mediaserv/run @@ -4,5 +4,5 @@ export TERM=linux . /etc/rc.conf . /etc/rc.d/functions stat_runit "Starting mediaserv" -exec su mythtv -c "/usr/bin/mediaserv" +exec su mythtv -c "/usr/bin/mediaserv" 2>/dev/null wait diff --git a/abs/extra/mime-types/PKGBUILD b/abs/extra/mime-types/PKGBUILD new file mode 100644 index 0000000..563857d --- /dev/null +++ b/abs/extra/mime-types/PKGBUILD @@ -0,0 +1,17 @@ +# $Id: PKGBUILD 35674 2009-04-15 05:29:19Z eric $ +# Maintainer: Jan de Groot +pkgname=mime-types +pkgver=1.0 +pkgrel=2 +pkgdesc="Provides /etc/mime.types" +arch=('i686' 'x86_64') +url="http://www.archlinux.org/" +license=('GPL2') +backup=('etc/mime.types') +source=(mime.types) +md5sums=('aa90248272ba2e9dca0a243746686739') + +build() { + cd ${srcdir} + install -D -m644 mime.types ${pkgdir}/etc/mime.types || return 1 +} diff --git a/abs/extra/mime-types/mime.types b/abs/extra/mime-types/mime.types new file mode 100644 index 0000000..5a6bbd4 --- /dev/null +++ b/abs/extra/mime-types/mime.types @@ -0,0 +1,758 @@ +############################################################################### +# +# MIME-TYPES and the extensions that represent them +# +# This file is part of the mime-types package, which is based on +# gentoo's "app-misc/mime-types". If you would like new types and/or +# extensions to be added here, please file a bug on http://bugs.archlinux.org +# +# The reason that all types are managed by the mime-support package instead +# allowing individual packages to install types in much the same way as they +# add entries in to the mailcap file is so these types can be referenced by +# other programs (such as a web server) even if the specific support package +# for that type is not installed. +# +# Users can add their own types if they wish by creating a ".mime.types" +# file in their home directory. Definitions included there will take +# precedence over those listed here. +# +# Note: Compression schemes like "gzip", "bzip", and "compress" are not +# actually "mime-types". They are "encodings" and hence must _not_ have +# entries in this file to map their extensions. The "mime-type" of an +# encoded file refers to the type of data that has been encoded, not the +# type of encoding. +# +############################################################################### + + +application/activemessage +application/andrew-inset ez +application/applefile +application/atomicmail +application/batch-SMTP +application/beep+xml +application/cals-1840 +application/commonground +application/cu-seeme cu +application/cybercash +application/dca-rft +application/dec-dx +application/docbook+xml +application/dsptype tsp +application/dvcs +application/edi-consent +application/edi-x12 +application/edifact +application/eshop +application/font-tdpfr +application/futuresplash spl +application/ghostview +application/hta hta +application/http +application/hyperstudio +application/iges +application/index +application/index.cmd +application/index.obj +application/index.response +application/index.vnd +application/iotp +application/ipp +application/isup +application/java-archive jar +application/java-serialized-object ser +application/java-vm class +application/mac-binhex40 hqx +application/mac-compactpro cpt +application/macwriteii +application/marc +application/mathematica nb +application/mathematica-old +application/msaccess mdb +application/msword doc dot +application/news-message-id +application/news-transmission +application/ocsp-request +application/ocsp-response +application/octet-stream bin +application/oda oda +application/ogg ogg +application/parityfec +application/pdf pdf +application/pgp-encrypted +application/pgp-keys key +application/pgp-signature pgp +application/pics-rules prf +application/pkcs10 +application/pkcs7-mime +application/pkcs7-signature +application/pkix-cert +application/pkix-crl +application/pkixcmp +application/postscript ps ai eps +application/prs.alvestrand.titrax-sheet +application/prs.cww +application/prs.nprend +application/qsig +application/rar rar +application/rdf+xml rdf +application/remote-printing +application/riscos +application/rss+xml rss +application/rtf +application/sdp +application/set-payment +application/set-payment-initiation +application/set-registration +application/set-registration-initiation +application/sgml +application/sgml-open-catalog +application/sieve +application/slate +application/smil smi smil +application/timestamp-query +application/timestamp-reply +application/vemmi +application/whoispp-query +application/whoispp-response +application/wita +application/wordperfect wpd +application/wordperfect5.1 wp5 +application/x400-bp +application/xhtml+xml xhtml xht +application/xml xml xsl +application/xml-dtd +application/xml-external-parsed-entity +application/zip zip +application/vnd.3M.Post-it-Notes +application/vnd.accpac.simply.aso +application/vnd.accpac.simply.imp +application/vnd.acucobol +application/vnd.aether.imp +application/vnd.anser-web-certificate-issue-initiation +application/vnd.anser-web-funds-transfer-initiation +application/vnd.audiograph +application/vnd.bmi +application/vnd.businessobjects +application/vnd.canon-cpdl +application/vnd.canon-lips +application/vnd.cinderella cdy +application/vnd.claymore +application/vnd.commerce-battelle +application/vnd.commonspace +application/vnd.comsocaller +application/vnd.contact.cmsg +application/vnd.cosmocaller +application/vnd.ctc-posml +application/vnd.cups-postscript +application/vnd.cups-raster +application/vnd.cups-raw +application/vnd.cybank +application/vnd.dna +application/vnd.dpgraph +application/vnd.dxr +application/vnd.ecdis-update +application/vnd.ecowin.chart +application/vnd.ecowin.filerequest +application/vnd.ecowin.fileupdate +application/vnd.ecowin.series +application/vnd.ecowin.seriesrequest +application/vnd.ecowin.seriesupdate +application/vnd.enliven +application/vnd.epson.esf +application/vnd.epson.msf +application/vnd.epson.quickanime +application/vnd.epson.salt +application/vnd.epson.ssf +application/vnd.ericsson.quickcall +application/vnd.eudora.data +application/vnd.fdf +application/vnd.ffsns +application/vnd.flographit +application/vnd.framemaker +application/vnd.fsc.weblaunch +application/vnd.fujitsu.oasys +application/vnd.fujitsu.oasys2 +application/vnd.fujitsu.oasys3 +application/vnd.fujitsu.oasysgp +application/vnd.fujitsu.oasysprs +application/vnd.fujixerox.ddd +application/vnd.fujixerox.docuworks +application/vnd.fujixerox.docuworks.binder +application/vnd.fut-misnet +application/vnd.grafeq +application/vnd.groove-account +application/vnd.groove-identity-message +application/vnd.groove-injector +application/vnd.groove-tool-message +application/vnd.groove-tool-template +application/vnd.groove-vcard +application/vnd.hhe.lesson-player +application/vnd.hp-HPGL +application/vnd.hp-PCL +application/vnd.hp-PCLXL +application/vnd.hp-hpid +application/vnd.hp-hps +application/vnd.httphone +application/vnd.hzn-3d-crossword +application/vnd.ibm.MiniPay +application/vnd.ibm.afplinedata +application/vnd.ibm.modcap +application/vnd.informix-visionary +application/vnd.intercon.formnet +application/vnd.intertrust.digibox +application/vnd.intertrust.nncp +application/vnd.intu.qbo +application/vnd.intu.qfx +application/vnd.irepository.package+xml +application/vnd.is-xpr +application/vnd.japannet-directory-service +application/vnd.japannet-jpnstore-wakeup +application/vnd.japannet-payment-wakeup +application/vnd.japannet-registration +application/vnd.japannet-registration-wakeup +application/vnd.japannet-setstore-wakeup +application/vnd.japannet-verification +application/vnd.japannet-verification-wakeup +application/vnd.koan +application/vnd.lotus-1-2-3 +application/vnd.lotus-approach +application/vnd.lotus-freelance +application/vnd.lotus-notes +application/vnd.lotus-organizer +application/vnd.lotus-screencam +application/vnd.lotus-wordpro +application/vnd.mcd +application/vnd.mediastation.cdkey +application/vnd.meridian-slingshot +application/vnd.mif +application/vnd.minisoft-hp3000-save +application/vnd.mitsubishi.misty-guard.trustweb +application/vnd.mobius.daf +application/vnd.mobius.dis +application/vnd.mobius.msl +application/vnd.mobius.plc +application/vnd.mobius.txf +application/vnd.motorola.flexsuite +application/vnd.motorola.flexsuite.adsi +application/vnd.motorola.flexsuite.fis +application/vnd.motorola.flexsuite.gotap +application/vnd.motorola.flexsuite.kmr +application/vnd.motorola.flexsuite.ttc +application/vnd.motorola.flexsuite.wem +application/vnd.mozilla.xul+xml xul +application/vnd.ms-artgalry +application/vnd.ms-asf +application/vnd.ms-excel xls xlb xlt +application/vnd.ms-lrm +application/vnd.ms-pki.seccat cat +application/vnd.ms-pki.stl stl +application/vnd.ms-powerpoint ppt pps +application/vnd.ms-project +application/vnd.ms-tnef +application/vnd.ms-works +application/vnd.mseq +application/vnd.msign +application/vnd.music-niff +application/vnd.musician +application/vnd.netfpx +application/vnd.noblenet-directory +application/vnd.noblenet-sealer +application/vnd.noblenet-web +application/vnd.novadigm.EDM +application/vnd.novadigm.EDX +application/vnd.novadigm.EXT +application/vnd.oasis.opendocument.chart odc +application/vnd.oasis.opendocument.database odb +application/vnd.oasis.opendocument.formula odf +application/vnd.oasis.opendocument.graphics odg +application/vnd.oasis.opendocument.graphics-template otg +application/vnd.oasis.opendocument.image odi +application/vnd.oasis.opendocument.presentation odp +application/vnd.oasis.opendocument.presentation-template otp +application/vnd.oasis.opendocument.spreadsheet ods +application/vnd.oasis.opendocument.spreadsheet-template ots +application/vnd.oasis.opendocument.text odt +application/vnd.oasis.opendocument.text-master odm +application/vnd.oasis.opendocument.text-template ott +application/vnd.oasis.opendocument.text-web oth +application/vnd.osa.netdeploy +application/vnd.palm +application/vnd.pg.format +application/vnd.pg.osasli +application/vnd.powerbuilder6 +application/vnd.powerbuilder6-s +application/vnd.powerbuilder7 +application/vnd.powerbuilder7-s +application/vnd.powerbuilder75 +application/vnd.powerbuilder75-s +application/vnd.previewsystems.box +application/vnd.publishare-delta-tree +application/vnd.pvi.ptid1 +application/vnd.pwg-xhtml-print+xml +application/vnd.rapid +application/vnd.rim.cod cod +application/vnd.s3sms +application/vnd.seemail +application/vnd.shana.informed.formdata +application/vnd.shana.informed.formtemplate +application/vnd.shana.informed.interchange +application/vnd.shana.informed.package +application/vnd.smaf mmf +application/vnd.sss-cod +application/vnd.sss-dtf +application/vnd.sss-ntf +application/vnd.stardivision.calc sdc +application/vnd.stardivision.draw sda +application/vnd.stardivision.impress sdd sdp +application/vnd.stardivision.math smf +application/vnd.stardivision.writer sdw vor +application/vnd.stardivision.writer-global sgl +application/vnd.street-stream +application/vnd.sun.xml.calc sxc +application/vnd.sun.xml.calc.template stc +application/vnd.sun.xml.draw sxd +application/vnd.sun.xml.draw.template std +application/vnd.sun.xml.impress sxi +application/vnd.sun.xml.impress.template sti +application/vnd.sun.xml.math sxm +application/vnd.sun.xml.writer sxw +application/vnd.sun.xml.writer.global sxg +application/vnd.sun.xml.writer.template stw +application/vnd.svd +application/vnd.swiftview-ics +application/vnd.symbian.install sis +application/vnd.triscape.mxs +application/vnd.trueapp +application/vnd.truedoc +application/vnd.tve-trigger +application/vnd.ufdl +application/vnd.uplanet.alert +application/vnd.uplanet.alert-wbxml +application/vnd.uplanet.bearer-choice +application/vnd.uplanet.bearer-choice-wbxml +application/vnd.uplanet.cacheop +application/vnd.uplanet.cacheop-wbxml +application/vnd.uplanet.channel +application/vnd.uplanet.channel-wbxml +application/vnd.uplanet.list +application/vnd.uplanet.list-wbxml +application/vnd.uplanet.listcmd +application/vnd.uplanet.listcmd-wbxml +application/vnd.uplanet.signal +application/vnd.vcx +application/vnd.vectorworks +application/vnd.vidsoft.vidconference +application/vnd.visio vsd +application/vnd.vividence.scriptfile +application/vnd.wap.sic +application/vnd.wap.slc +application/vnd.wap.wbxml wbxml +application/vnd.wap.wmlc wmlc +application/vnd.wap.wmlscriptc wmlsc +application/vnd.webturbo +application/vnd.wrq-hp3000-labelled +application/vnd.wt.stf +application/vnd.xara +application/vnd.xfdl +application/vnd.yellowriver-custom-menu +application/x-123 wk +application/x-abiword abw +application/x-apple-diskimage dmg +application/x-bcpio bcpio +application/x-bittorrent torrent +application/x-cdf cdf +application/x-cdlink vcd +application/x-chess-pgn pgn +application/x-core +application/x-cpio cpio +application/x-csh csh +application/x-debian-package deb udeb +application/x-director dcr dir dxr +application/x-dms dms +application/x-doom wad +application/x-dvi dvi +application/x-executable +application/x-flac flac +application/x-font pfa pfb gsf pcf pcf.Z +application/x-freemind mm +application/x-futuresplash spl +application/x-gnumeric gnumeric +application/x-go-sgf sgf +application/x-graphing-calculator gcf +application/x-gtar gtar tgz taz +application/x-hdf hdf +application/x-ica ica +application/x-internet-signup ins isp +application/x-iphone iii +application/x-iso9660-image iso +application/x-java-applet +application/x-java-bean +application/x-java-jnlp-file jnlp +application/x-javascript js +application/x-jmol jmz +application/x-kchart chrt +application/x-kdelnk +application/x-killustrator kil +application/x-koan skp skd skt skm +application/x-kpresenter kpr kpt +application/x-kspread ksp +application/x-kword kwd kwt +application/x-latex latex +application/x-lha lha +application/x-lzh lzh +application/x-lzx lzx +application/x-maker frm maker frame fm fb book fbdoc +application/x-mif mif +application/x-ms-wmd wmd +application/x-ms-wmz wmz +application/x-msdos-program com exe bat dll +application/x-msi msi +application/x-netcdf nc +application/x-ns-proxy-autoconfig pac +application/x-nwc nwc +application/x-object o +application/x-oz-application oza +application/x-pkcs7-certreqresp p7r +application/x-pkcs7-crl crl +application/x-python-code pyc pyo +application/x-quicktimeplayer qtl +application/x-redhat-package-manager rpm +application/x-rx +application/x-sh sh +application/x-shar shar +application/x-shellscript +application/x-shockwave-flash swf swfl +application/x-stuffit sit +application/x-sv4cpio sv4cpio +application/x-sv4crc sv4crc +application/x-tar tar +application/x-tcl tcl +application/x-tex-gf gf +application/x-tex-pk pk +application/x-texinfo texinfo texi +application/x-trash ~ % bak old sik +application/x-troff t tr roff +application/x-troff-man man +application/x-troff-me me +application/x-troff-ms ms +application/x-ustar ustar +application/x-videolan +application/x-wais-source src +application/x-wingz wz +application/x-x509-ca-cert crt +application/x-xcf xcf +application/x-xfig fig +application/x-xpinstall xpi + +audio/32kadpcm +audio/basic au snd +audio/dvi4 +audio/g.722.1 +audio/g722 +audio/g723 +audio/g726-16 +audio/g726-24 +audio/g726-32 +audio/g726-40 +audio/g728 +audio/g729 +audio/g729d +audio/g729e +audio/gsm +audio/gsm-efr +audio/l8 +audio/l16 +audio/lpc +audio/midi mid midi kar +audio/mp4a-latm +audio/mpa +audio/mpa-robust +audio/mpeg mpga mpega mp2 mp3 m4a +audio/mpegurl m3u +audio/parityfec +audio/pcma +audio/pcmu +audio/prs.sid sid +audio/qcelp +audio/red +audio/telephone-event +audio/tone +audio/vdvi +audio/vnd.cisco.nse +audio/vnd.cns.anp1 +audio/vnd.cns.inf1 +audio/vnd.digital-winds +audio/vnd.everad.plj +audio/vnd.lucent.voice +audio/vnd.nortel.vbk +audio/vnd.nuera.ecelp4800 +audio/vnd.nuera.ecelp7470 +audio/vnd.nuera.ecelp9600 +audio/vnd.octel.sbc +audio/vnd.qcelp +audio/vnd.rhetorex.32kadpcm +audio/vnd.vmx.cvsd +audio/x-aiff aif aiff aifc +audio/x-gsm gsm +audio/x-mpegurl m3u +audio/x-ms-wma wma +audio/x-ms-wax wax +audio/x-pn-realaudio-plugin +audio/x-pn-realaudio ra rm ram +audio/x-realaudio ra +audio/x-scpls pls +audio/x-sd2 sd2 +audio/x-wav wav + +chemical/x-alchemy alc +chemical/x-cache cac cache +chemical/x-cache-csf csf +chemical/x-cactvs-binary cbin cascii ctab +chemical/x-cdx cdx +chemical/x-cerius cer +chemical/x-chem3d c3d +chemical/x-chemdraw chm +chemical/x-cif cif +chemical/x-cmdf cmdf +chemical/x-cml cml +chemical/x-compass cpa +chemical/x-crossfire bsd +chemical/x-csml csml csm +chemical/x-ctx ctx +chemical/x-cxf cxf cef +#chemical/x-daylight-smiles smi +chemical/x-embl-dl-nucleotide emb embl +chemical/x-galactic-spc spc +chemical/x-gamess-input inp gam gamin +chemical/x-gaussian-checkpoint fch fchk +chemical/x-gaussian-cube cub +chemical/x-gaussian-input gau gjc gjf +chemical/x-gaussian-log gal +chemical/x-gcg8-sequence gcg +chemical/x-genbank gen +chemical/x-hin hin +chemical/x-isostar istr ist +chemical/x-jcamp-dx jdx dx +chemical/x-kinemage kin +chemical/x-macmolecule mcm +chemical/x-macromodel-input mmd mmod +chemical/x-mdl-molfile mol +chemical/x-mdl-rdfile rd +chemical/x-mdl-rxnfile rxn +chemical/x-mdl-sdfile sd sdf +chemical/x-mdl-tgf tgf +#chemical/x-mif mif +chemical/x-mmcif mcif +chemical/x-mol2 mol2 +chemical/x-molconn-Z b +chemical/x-mopac-graph gpt +chemical/x-mopac-input mop mopcrt mpc dat zmt +chemical/x-mopac-out moo +chemical/x-mopac-vib mvb +chemical/x-ncbi-asn1 asn +chemical/x-ncbi-asn1-ascii prt ent +chemical/x-ncbi-asn1-binary val aso +chemical/x-ncbi-asn1-spec asn +chemical/x-pdb pdb ent +chemical/x-rosdal ros +chemical/x-swissprot sw +chemical/x-vamas-iso14976 vms +chemical/x-vmd vmd +chemical/x-xtel xtel +chemical/x-xyz xyz + +image/cgm +image/g3fax +image/gif gif +image/ief ief +image/jpeg jpeg jpg jpe +image/naplps +image/pcx pcx +image/png png +image/prs.btif +image/prs.pti +image/svg+xml svg svgz +image/tiff tiff tif +image/vnd.cns.inf2 +image/vnd.djvu djvu djv +image/vnd.dwg +image/vnd.dxf +image/vnd.fastbidsheet +image/vnd.fpx +image/vnd.fst +image/vnd.fujixerox.edmics-mmr +image/vnd.fujixerox.edmics-rlc +image/vnd.mix +image/vnd.net-fpx +image/vnd.svf +image/vnd.wap.wbmp wbmp +image/vnd.xiff +image/x-cmu-raster ras +image/x-coreldraw cdr +image/x-coreldrawpattern pat +image/x-coreldrawtemplate cdt +image/x-corelphotopaint cpt +image/x-icon ico +image/x-jg art +image/x-jng jng +image/x-ms-bmp bmp +image/x-photoshop psd +image/x-portable-anymap pnm +image/x-portable-bitmap pbm +image/x-portable-graymap pgm +image/x-portable-pixmap ppm +image/x-rgb rgb +image/x-xbitmap xbm +image/x-xpixmap xpm +image/x-xwindowdump xwd + +inode/chardevice +inode/blockdevice +inode/directory-locked +inode/directory +inode/fifo +inode/socket + +message/delivery-status +message/disposition-notification +message/external-body +message/http +message/s-http +message/news +message/partial +message/rfc822 + +model/iges igs iges +model/mesh msh mesh silo +model/vnd.dwf +model/vnd.flatland.3dml +model/vnd.gdl +model/vnd.gs-gdl +model/vnd.gtw +model/vnd.mts +model/vnd.vtu +model/vrml wrl vrml + +multipart/alternative +multipart/appledouble +multipart/byteranges +multipart/digest +multipart/encrypted +multipart/form-data +multipart/header-set +multipart/mixed +multipart/parallel +multipart/related +multipart/report +multipart/signed +multipart/voice-message + +text/calendar ics icz +text/comma-separated-values csv +text/css css +text/directory +text/english +text/enriched +text/h323 323 +text/html html htm shtml +text/iuls uls +text/mathml mml +text/parityfec +text/plain asc txt text diff pot +text/prs.lines.tag +text/x-psp psp +text/rfc822-headers +text/richtext rtx +text/rtf rtf +text/scriptlet sct wsc +text/t140 +text/texmacs tm ts +text/tab-separated-values tsv +text/uri-list +text/vnd.abc +text/vnd.curl +text/vnd.DMClientScript +text/vnd.flatland.3dml +text/vnd.fly +text/vnd.fmi.flexstor +text/vnd.in3d.3dml +text/vnd.in3d.spot +text/vnd.IPTC.NewsML +text/vnd.IPTC.NITF +text/vnd.latex-z +text/vnd.motorola.reflex +text/vnd.ms-mediapackage +text/vnd.sun.j2me.app-descriptor jad +text/vnd.wap.si +text/vnd.wap.sl +text/vnd.wap.wml wml +text/vnd.wap.wmlscript wmls +text/x-bibtex bib +text/x-c++hdr h++ hpp hxx hh +text/x-c++src c++ cpp cxx cc +text/x-chdr h +text/x-crontab +text/x-csh csh +text/x-csrc c +text/x-haskell hs +text/x-java java +text/x-literate-haskell lhs +text/x-makefile +text/x-moc moc +text/x-pascal p pas +text/x-pcs-gcd gcd +text/x-perl pl pm +text/x-python py +text/x-server-parsed-html +text/x-setext etx +text/x-sh sh +text/x-tcl tcl tk +text/x-tex tex ltx sty cls +text/x-vcalendar vcs +text/x-vcard vcf + +video/bmpeg +video/bt656 +video/celb +video/dl dl +video/dv dif dv +video/fli fli +video/gl gl +video/jpeg +video/h261 +video/h263 +video/h263-1998 +video/h263-2000 +video/mp1s +video/mp2p +video/mp2t +video/mp4 mp4 +video/mp4v-es +video/mpeg mpeg mpg mpe +video/mpv +video/nv +video/parityfec +video/pointer +video/quicktime qt mov +video/vnd.fvt +video/vnd.motorola.video +video/vnd.motorola.videop +video/vnd.mpegurl mxu +video/vnd.mts +video/vnd.nokia.interleaved-multimedia +video/vnd.vivo +video/x-la-asf lsf lsx +video/x-mng mng +video/x-ms-asf asf asx +video/x-ms-wm wm +video/x-ms-wmv wmv +video/x-ms-wmx wmx +video/x-ms-wvx wvx +video/x-msvideo avi +video/x-sgi-movie movie +video/x-flv flv + +x-conference/x-cooltalk ice + +x-world/x-vrml vrm vrml wrl diff --git a/abs/extra/mkvtoolnix/PKGBUILD b/abs/extra/mkvtoolnix/PKGBUILD index 21681a9..6404481 100644 --- a/abs/extra/mkvtoolnix/PKGBUILD +++ b/abs/extra/mkvtoolnix/PKGBUILD @@ -3,15 +3,14 @@ # Contributor: 03/08/04 pkgname=mkvtoolnix -pkgver=2.9.8 +pkgver=4.1.1 pkgrel=1 pkgdesc="Set of tools to create, edit and inspect Matroska files" arch=('i686' 'x86_64') license=('GPL2') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" -depends=('libmatroska>=0.8.1' 'flac>=1.1.4' 'libvorbis' 'wxgtk>=2.8.0.1' 'file' 'boost' 'lzo2') +depends=('libmatroska>=1.0.0' 'libebml>=1.0.0' 'flac>=1.1.4' 'libvorbis' 'wxgtk>=2.8.0.1' 'file' 'boost' 'lzo2') source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7b049aa43c6b39dfcb19f5a46d5574ac') build() { cd ${srcdir}/${pkgname}-${pkgver}/ @@ -20,3 +19,4 @@ build() { make || return 1 make DESTDIR=${pkgdir}/ install } +md5sums=('6f38fefd73b8b95de3ea3feb9de4cdd7') diff --git a/abs/extra/monitorix-linhes.tar.gz b/abs/extra/monitorix-linhes.tar.gz new file mode 100644 index 0000000..02ea6e2 Binary files /dev/null and b/abs/extra/monitorix-linhes.tar.gz differ diff --git a/abs/extra/monitorix/PKGBUILD b/abs/extra/monitorix/PKGBUILD new file mode 100644 index 0000000..e73fcd1 --- /dev/null +++ b/abs/extra/monitorix/PKGBUILD @@ -0,0 +1,58 @@ +# Maintainer: graysky + +pkgname=monitorix +pkgver=1.4.2 +pkgrel=8 +pkgdesc='A lightweight system monitoring tool that uses rrd databases.' +arch=(i686) +url=http://www.$pkgname.org/ +license=(GPL) +depends=(dcron rrdtool lighttpd ) +optdepends=('lm_sensors: enable support for system temp monitoring' +'hddtemp: enable support for hdd temp monitoring') + +backup=(etc/$pkgname.conf) +source=($url$pkgname-$pkgver.tar.gz + monitorix.rc.d) +md5sums=('6db1bdbeeb0d128622590dfecb9694e4' +'34e7cb2d78bb4e3ece4aeb4ed26a0d43') +install=('monitorix.install') + +build() { + cd $pkgname-$pkgver + + install -D $pkgname.pl $pkgdir/usr/sbin/$pkgname.pl + install -D ../$pkgname.rc.d $pkgdir/etc/rc.d/$pkgname + +# use LinHES defaults + sed -e '/^our $OSTYPE/ s,RHFC,Arch,' \ + -e '/^our $TITLE/ s,FIBRANET NSP\, SL,LinHES,' \ + -e '/^our @HDDTEMP_LIST/ s,hda,sda,' \ + -e '/^our $ENABLE_CROND_MAIL/ s,Y,N,' \ + -e '/^our $ENABLE_SERVU/ s,Y,N,' \ + -e '/^our $ENABLE_PORT/ s,Y,N,' \ + -e '/^our $ENABLE_USER/ s,Y,N,' \ + -e '/^our $ENABLE_INT/ s,Y,N,' \ + -e '/^our @HDDTEMP_LIST/ s,hda,sda,' \ + -e '/^our @MNT_LIST/ s,boot,myth,' \ + -e '/^\s*"Linux-Arch"/ s,/var/log/httpd/access.log,/var/log/httpd/access_log,' \ + -e '/^\s*"Linux-Arch"/ s,/var/log/secure,/var/log/auth.log,' \ + -e '/^\s*"Linux-Arch"/ s,/srv/http,/data/srv/httpd/htdocs,' < $pkgname.conf \ + > $pkgdir/etc/$pkgname.conf + + mkdir -p $pkgdir/var/lib/$pkgname/usage + cp -r reports $pkgdir/var/lib/$pkgname + + mkdir -p $pkgdir/usr/share/doc/$pkgname + cp Changes $pkgname-apache.conf $pkgname-alert.sh README README.nginx TODO \ + $pkgdir/usr/share/doc/$pkgname + + install -dm777 $pkgdir/data/srv/httpd/htdocs/$pkgname/imgs + cp {logo_bot,logo_top,${pkgname}ico}.png $pkgdir/data/srv/httpd/htdocs/$pkgname + + install -D $pkgname.cgi $pkgdir/data/srv/httpd/htdocs/cgi-bin/$pkgname.cgi + + gzip -9 man/man5/$pkgname.conf.5 + install -Dm644 man/man5/$pkgname.conf.5.gz $pkgdir/usr/share/man/man5/$pkgname.conf.5.gz +} + diff --git a/abs/extra/monitorix/monitorix.install b/abs/extra/monitorix/monitorix.install new file mode 100644 index 0000000..6c1d1bd --- /dev/null +++ b/abs/extra/monitorix/monitorix.install @@ -0,0 +1,30 @@ +remove_notes() { + echo '----------------------------------------------------------------------' + echo 'To remove all traces of monitorix from your system, you must manually' + echo 'remove the following dir trees (doing so will delete your databases):' + echo + echo '/var/lib/monitorix' + echo '/srv/http/monitorix' + echo '----------------------------------------------------------------------' +} + +# $1: The new package version +# $2: The old package version +post_upgrade() { + echo '' + echo '' + echo 'now edit /etc/monitorix.conf' + echo ' our $HOSTNAME - your hostname.' + echo ' our $ENABLE_LMTEMP - switch this on if you wanna log your temps.' + echo ' our @HDDTEMP_LIST - If you system has more than one hdd, add it to the array.' + echo ' stats can be seen at http://$THIS_SYSTEMS_IP/monitorix/' + + echo '' + echo '' +} + +post_install(){ + . /etc/systemconfig + sed -i "s/^our \$HOSTNAME.*$/our \$HOSTNAME = \"${hostname}\"\; /" /etc/monitorix.conf| + post_upgrade +} diff --git a/abs/extra/monitorix/monitorix.rc.d b/abs/extra/monitorix/monitorix.rc.d new file mode 100644 index 0000000..9649519 --- /dev/null +++ b/abs/extra/monitorix/monitorix.rc.d @@ -0,0 +1,54 @@ +#!/bin/bash +# +# @(#) Fibranet NSP, SL +# Copyright (C) 2005-2009 by Jordi Sanfeliu +# +. /etc/rc.conf +. /etc/rc.d/functions + +case $1 in + start) + stat_busy "Starting Monitorix" + if ck_daemon monitorix; then + if [ -x /etc/cron.hourly/sync-monitorix.sh ]; then + /etc/cron.hourly/sync-monitorix.sh >/dev/null 2>&1 + fi + # Creates RRDs files if needed + /usr/sbin/monitorix.pl create >/dev/null 2>&1 || stat_die $? + /usr/sbin/monitorix.pl init >/dev/null 2>&1 || stat_die $? + add_daemon monitorix + # restart crond so data gets collected + /sbin/sv restart cron + stat_done + else + stat_fail + fi + ;; + + stop) + stat_busy "Stopping Monitorix" + if ! ck_daemon monitorix; then + if [ -x /etc/cron.hourly/sync-monitorix.sh ]; then + /etc/cron.hourly/sync-monitorix.sh >/dev/null 2>&1 + fi + /usr/sbin/monitorix.pl stop 2>&1 || stat_die $? + rm_daemon monitorix + # restart crond data stops getting collected + /sbin/sv restart cron + stat_done + else + stat_fail + fi + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac + +exit 0 diff --git a/abs/extra/most/PKGBUILD b/abs/extra/most/PKGBUILD new file mode 100644 index 0000000..b2d8624 --- /dev/null +++ b/abs/extra/most/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 57011 2009-10-31 08:09:42Z allan $ +# Maintainer: juergen +# Contributor: Tom Newsom + +pkgname=most +pkgver=5.0.0a +pkgrel=2 +pkgdesc="A terminal pager similar to 'more' and 'less'" +arch=('i686' 'x86_64') +depends=('slang') +license=('GPL') +url="ftp://space.mit.edu/pub/davis/most/" +source=(ftp://space.mit.edu/pub/davis/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('30f2131b67f61716f6fe1f65205da48b') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc || return 1 + make DESTDIR=$pkgdir install || return 1 +} diff --git a/abs/extra/most/most-debian.patch b/abs/extra/most/most-debian.patch new file mode 100644 index 0000000..4387420 --- /dev/null +++ b/abs/extra/most/most-debian.patch @@ -0,0 +1,1655 @@ +--- most-4.10.2.orig/most.1 ++++ most-4.10.2/most.1 +@@ -134,7 +134,7 @@ + Use this switch when you want to view files + containing 8 bit characters. + .I most +-will display the file 16 bytes per line in hexidecimal notation. ++will display the file 16 bytes per line in hexadecimal notation. + A typical line looks like: + .IP + .Ds +@@ -185,12 +185,13 @@ + This option is meaningful only when used with the + .B \-v + option. ++.TP + .BI + lineno + Start up at + .IR lineno . + .TP +-.B +c +-Make search case sensitive. ++.B -c ++Make searches case sensitive. + By default, they are not. + .TP + .B +d +@@ -482,7 +483,7 @@ + descriptors that represent the file name and line number, + respectively. For example, if JED is your editor, then set + .B MOST_EDITOR +-to 'jed %s -g %d'. ++to 'jed %s -g %d'. This will only work where the %s preceeds the %d. + .TP + .B MOST_HELP + This variable may be used to specify an alternate help file. +@@ -496,7 +497,7 @@ + .I most.rc + on other systems. + .SH CONFIGURATION FILE SYNTAX +-When most starts up, it tries to read a system confiuration file and ++When most starts up, it tries to read a system configuration file and + then a personal configuration file. These files may be used to + specify keybindings and colors. + .PP +--- most-4.10.2.orig/src/buffer.c ++++ most-4.10.2/src/buffer.c +@@ -44,10 +44,10 @@ + + Most_Buffer_Type *Most_Buf; + +-int Most_Num_Lines; ++long long Most_Num_Lines; + +-unsigned int Most_C_Offset; +-int Most_C_Line; ++unsigned long long Most_C_Offset; ++long long Most_C_Line; + + static unsigned char *beg_of_line1(void) + { +@@ -61,24 +61,29 @@ + { + if (*pos == '\n') + { +- pos--; +- while ((pos > Most_Beg) +- && (*pos != '\n')) ++ pos--; /* Skip back the new-line. */ ++ /* This block is UTF-8 safe, because it only scans the ++ buffer for a new-line, and doesn't count ++ characters. */ ++ while ((pos > Most_Beg) && (*pos != '\n')) + pos--; + +- if (*pos != '\n') return pos; ++ if (*pos != '\n') return Most_Beg; ++ /* from here on *pos == '\n' */ + if (pos + 1 != cpos) + return pos + 1; + } + } +- else pos--; ++ else ++ pos = SLutf8_bskip_char(Most_Beg, pos); + + if (*pos != '\n') + { +- while ((pos > Most_Beg) +- && (*pos != '\n')) ++ /* This block is UTF-8 safe. See comment above. */ ++ while ((pos > Most_Beg) && (*pos != '\n')) + pos--; + if (*pos != '\n') return Most_Beg; ++ /* from here on *pos == '\n' */ + return pos + 1; + } + +@@ -93,55 +98,6 @@ + return pos; + } + +- +-static unsigned char *forward_columns (unsigned char *b, unsigned char *e, unsigned int num_cols) +-{ +- unsigned int col = 0; +- +- while ((b < e) +- && (col < num_cols)) +- { +- unsigned char ch = *b++; +- if (((ch >= ' ') && (ch < 0x7F)) +- || (ch >= SLsmg_Display_Eight_Bit)) +- { +- col++; +- continue; +- } +- +- if ((ch == '\b') || (ch == '\t') || (ch == '\r')) +- switch (ch) +- { +- case '\b': +- if (Most_V_Opt == 0) +- { +- if (col > 0) col--; +- } +- else col += 2; +- break; +- +- case '\r': +- if (Most_V_Opt == 0) +- col = 0; +- else +- col += 2; +- break; +- +- case '\t': +- if (Most_T_Opt == 0) +- col = Most_Tab_Width * (col/Most_Tab_Width + 1); +- else +- col += 2; +- break; +- } +- else if (ch & 0x80) +- col += 3; +- else +- col += 2; +- } +- return b; +-} +- + /* does not move point */ + static unsigned char *end_of_line1(void) + { +@@ -164,6 +120,9 @@ + + if (*pos != '\n') + { ++ /* This block is UTF-8 safe, because it only scans the buffer ++ for a new-line, and doesn't count characters. */ ++ + n = pmax - pos; + n2 = n % 8; + pmax = pos + (n - 8); +@@ -215,7 +174,7 @@ + ncols = SLtt_Screen_Cols-1; + while (1) + { +- unsigned char *next_b = forward_columns (b, e, ncols); ++ unsigned char *next_b = most_forward_columns (b, e, ncols, 1); + if ((next_b == e) || (next_b == b)) + break; + +@@ -237,11 +196,12 @@ + return e; + + if (b == NULL) b = most_beg_of_line (); +- b = forward_columns (b, e, SLtt_Screen_Cols-1); ++ b = most_forward_columns (b, e, SLtt_Screen_Cols-1, 1); + + /* Do not wrap the line if the last character falls on the last column + * of the display. + */ ++ /* FIXME potential bug if dealing with multi-byte char. */ + if ((b + 1 <= e) + && (b + 1 < Most_Eob) + && (b[1] == '\n')) +@@ -250,10 +210,10 @@ + return b; + } + +-int most_forward_line(int save) ++long long most_forward_line(long long save) + { +- int m; +- register int n = save; ++ long long m; ++ register long long n = save; + unsigned char *p; + unsigned char *pmax; + +@@ -346,14 +306,14 @@ + } + + /* Count lines in the region. A half line counts as 1 */ +-int most_count_lines(unsigned char *beg, unsigned char *end) ++long long most_count_lines(unsigned char *beg, unsigned char *end) + { +- int save_line, n; ++ long long save_line, n; + unsigned char *save_beg, *save_eob; +- unsigned int save_pos; ++ unsigned long long save_pos; + int dn = 1000; + +- if (Most_B_Opt) return(1 + (int)(end - beg) / 16); ++ if (Most_B_Opt) return(1 + (long long)(end - beg) / 16); + + save_line = Most_C_Line; save_beg = Most_Beg; save_eob = Most_Eob; + save_pos = Most_C_Offset; +@@ -371,9 +331,9 @@ + return(n); + } + +-void most_goto_line(int line) ++void most_goto_line(long long line) + { +- int dif_c, dif_b,dif_t; ++ long long dif_c, dif_b,dif_t; + + if (line < 1) line = 1; + most_read_to_line(line); +@@ -420,7 +380,7 @@ + } + + /* return line the point is on without the final '\n's */ +-int most_extract_line(unsigned char **beg, unsigned char **end) ++long long most_extract_line(unsigned char **beg, unsigned char **end) + { + *beg = most_beg_of_line(); + *end = end_of_line (*beg); +@@ -428,12 +388,12 @@ + return 0; + } + +-int most_what_line(unsigned char *pos) ++long long most_what_line(unsigned char *pos) + { +- unsigned int save_pos; +- int save_line, dir; +- register int dif_c, dif_b,dif_t; +- int ret; ++ unsigned long long save_pos; ++ long long save_line, dir; ++ register long long dif_c, dif_b,dif_t; ++ long long ret; + + if (Most_B_Opt) + { +@@ -517,7 +477,7 @@ + } + + /* given a buffer position, find the line and column */ +-void most_find_row_column(unsigned char *pos, int *r, int *c) ++void most_find_row_column(unsigned char *pos, long long *r, long long *c) + { + unsigned char *beg; + unsigned int save_offset; +@@ -545,7 +505,10 @@ + /* Now we have found the line it is on so.... */ + beg = most_beg_of_line(); + *c = 1; +- while (beg++ < pos) *c = *c + 1; ++ if (Most_UTF8_Mode) ++ while ((beg = SLutf8_skip_char(beg, pos)) < pos) *c = *c + 1; ++ else ++ while (beg++ < pos) *c = *c + 1; + Most_C_Line = save_line; + Most_C_Offset = save_offset; + } +--- most-4.10.2.orig/src/buffer.h ++++ most-4.10.2/src/buffer.h +@@ -23,12 +23,12 @@ + + extern Most_Buffer_Type *Most_Buf; + extern unsigned char *Most_Beg, *Most_Eob; +-extern int Most_Num_Lines; ++extern long long Most_Num_Lines; + + /* Offset of current position from beginning of buffer */ +-extern unsigned int Most_C_Offset; ++extern unsigned long long Most_C_Offset; + +-extern int Most_C_Line; ++extern long long Most_C_Line; + /* + * Current line number. If at the beginning of the buffer, it is 1. If + * we are at the last point of the buffer it is the number of lines. +@@ -37,26 +37,26 @@ + /* This routine does not move the point */ + extern unsigned char *most_beg_of_line(void); + +-extern int most_forward_line(int); ++extern long long most_forward_line(long long); + /* This routine moves the point forward n lines. n can be negative. + It returns the number moved. */ + +-extern void most_goto_line(int); ++extern void most_goto_line(long long); + /* Move the point somewhere on the nth line of the buffer returning + C_POS */ + +-extern int most_what_line(unsigned char *); ++extern long long most_what_line(unsigned char *); + /* return the line number of position 'argument'. Does not move point */ + + /* count the number of lines in the region delimited by beg and end. + Counts lines from beg up to end but does not count end. + Does not move point. */ +-extern int most_count_lines(unsigned char *, unsigned char *); +-extern int most_extract_line(unsigned char **, unsigned char **); ++extern long long most_count_lines(unsigned char *, unsigned char *); ++extern long long most_extract_line(unsigned char **, unsigned char **); + + extern Most_Buffer_Type *most_switch_to_buffer(Most_Buffer_Type *); + extern Most_Buffer_Type *most_create_buffer(char *); +-extern void most_find_row_column(unsigned char *, int *, int *); ++extern void most_find_row_column(unsigned char *, long long *, long long *); + + #endif + +--- most-4.10.2.orig/src/keym.c ++++ most-4.10.2/src/keym.c +@@ -228,7 +228,7 @@ + static void goto_percent_cmd(void) + { + unsigned char *pos; +- int n; ++ long long n; + + if (Most_Digit_Arg != (int *) NULL) n = *Most_Digit_Arg; + else +@@ -282,7 +282,7 @@ + + static void find_next_cmd(void) + { +- int col, line, n = 1; ++ long long col, line, n = 1; + unsigned long ofs; + + if (Most_Digit_Arg != NULL) n = *Most_Digit_Arg; +@@ -309,7 +309,7 @@ + #else + "Search: ", + #endif +- Most_Search_Str, ++ (char *) Most_Search_Str, + MOST_SEARCH_BUF_LEN + ) == -1) return; + Most_Curs_Offset = Most_C_Offset; +@@ -325,7 +325,7 @@ + #else + "Search Backwards: ", + #endif +- Most_Search_Str, ++ (char *) Most_Search_Str, + MOST_SEARCH_BUF_LEN) == -1) return; + find_next_cmd(); + } +--- most-4.10.2.orig/src/line.c ++++ most-4.10.2/src/line.c +@@ -87,8 +87,7 @@ + while (b < end) + { + ch = *b++; +- if (((ch >= ' ') && (ch < 0x7F)) +- || (ch >= SLsmg_Display_Eight_Bit)) ++ if (most_isprint(ch)) + { + *s++ = ch; + continue; +@@ -108,103 +107,156 @@ + + if (end > Most_Eob) end = Most_Eob; + +- sprintf (buf, "0x%08X: ", Most_C_Offset); ++ sprintf (buf, "0x%08llX: ", Most_C_Offset); + ascii_format_line (beg, end, buf + 12); + SLsmg_write_string (buf); + SLsmg_erase_eol (); + } + +-static int most_analyse_line(unsigned char *begg, unsigned char *endd, +- char *out, char *attributes) ++int most_isprint(unsigned char ch) + { +- unsigned char *beg, *end; +- unsigned int min_col, max_col; +- unsigned int i, i_max; ++ /* Can this be directly replaced with isprint? */ ++ return (ch >= ' ' && ch < 0x7F) || ch >= SLsmg_Display_Eight_Bit; ++} ++ ++static void most_analyse_line(unsigned char *beg, unsigned char *end, ++ unsigned char *out, char *attributes) ++{ ++ unsigned char *pout; ++ char* pattributes; ++ ++ /* Holds the number of columns for the current character counting ++ * from the left margin (in contrast to the leftmost visible ++ * column). ++ */ ++ unsigned int col; ++ ++ /* Holds the number of the column up to which to apply the ++ * current/following formatting. Only meaningful when format_rlim > i. ++ */ ++ unsigned int format_rlim; + +- beg = begg; +- end = endd; +- i = i_max = 0; +- min_col = Most_Column - 1; +- max_col = min_col + SLtt_Screen_Cols; ++ beg = most_forward_columns(beg, end, Most_Column - 1, 0); ++ pout = out; ++ pattributes = attributes; ++ col = format_rlim = 0; + + while (beg < end) + { + char attr = ' '; +- unsigned char ch; ++ unsigned char ch = *beg++; + +- if ('\n' == (ch = *beg++)) ++ if ('\n' == ch) + break; + + if ((ch == '\r') && (Most_V_Opt == 0)) + { +- if (i > i_max) i_max = i; +- i = 0; ++ if (col > format_rlim) format_rlim = col; ++ col = 0; + continue; + } + + if ((ch == '\b') && (Most_V_Opt == 0)) + { +- if (i > i_max) i_max = i; +- if (i > 0) +- i--; ++ if (col > format_rlim) format_rlim = col; ++ if (col > 0) ++ { ++ if (Most_UTF8_Mode) ++ { ++ SLwchar_Type wc; ++ pout = SLutf8_bskip_char(out, pout); ++ if (SLutf8_decode(pout, pout + SLUTF8_MAX_MBLEN, &wc, NULL)) ++ { ++ unsigned int char_len = SLwchar_wcwidth(wc); ++ if (char_len > 1) ++ col -= char_len - 1; ++ } ++ } ++ else ++ pout--; ++ pattributes--; ++ col--; ++ } + continue; + } + +- if (i < i_max) /* overstrike */ ++ if (col < format_rlim) /* overstrike */ + { + attr = 'b'; +- if ((i >= min_col) && (i < max_col)) ++ if (col < SLtt_Screen_Cols) + { +- if (out[i-min_col] == '_') ++ if (*pout == '_') + attr = 'u'; + else if (ch == '_') + { + attr = 'u'; +- ch = out[i - min_col]; ++ ch = *pout; + } + } + if (ch == ' ') + { +- i++; ++ col++; + continue; + } + /* drop */ + } +- +- if ((ch >= ' ') && (ch < 0x7F)) +- { +- if ((i >= min_col) && (i < max_col)) ++ ++ if (Most_UTF8_Mode) { ++ unsigned char *prev = --beg; ++ SLwchar_Type wc; ++ unsigned int len; ++ ++ if (SLutf8_decode(beg, end, &wc, NULL)) ++ { ++ unsigned int char_len = SLwchar_wcwidth(wc); ++ if (char_len > 1) ++ col += char_len - 1; ++ } ++ ++ beg = SLutf8_skip_char(beg, end); ++ len = beg - prev; ++ ++ if (len > 1) { ++ /* Non-ASCII char, display it. */ ++ if (col < SLtt_Screen_Cols) + { +- out[i-min_col] = ch; +- attributes[i-min_col] = attr; ++ memcpy(pout, prev, len); ++ pout += len; ++ *pattributes++ = attr; + } +- i++; ++ col++; + continue; +- } +- +- if (ch >= SLsmg_Display_Eight_Bit) ++ } ++ } ++ ++ if (most_isprint(ch)) + { +- if ((i >= min_col) && (i < max_col)) ++ if (col < SLtt_Screen_Cols) + { +- out[i-min_col] = ch; +- attributes[i-min_col] = attr; ++ *pout++ = ch; ++ *pattributes++ = attr; + } +- i++; ++ col++; + continue; + } + + if ((ch == '\t') && (Most_T_Opt == 0) && (Most_Tab_Width)) + { +- +- int nspaces = Most_Tab_Width * (i/Most_Tab_Width + 1) - i; ++ /* Tab expansion must take into consideration the ++ * leftmost visible column. However, variable col holds the ++ * number of columns from the left margin and must be ++ * corrected. ++ */ ++ int vis_col = col + Most_Column - 1; ++ int nspaces = Most_Tab_Width - (vis_col % Most_Tab_Width); + while (nspaces > 0) + { +- if ((i >= min_col) && (i < max_col)) ++ if (col < SLtt_Screen_Cols) + { +- out[i-min_col] = ' '; +- attributes[i-min_col] = attr; ++ *pout++ = ' '; ++ *pattributes++ = attr; + } +- i++; ++ col++; + nspaces--; + } + continue; +@@ -212,36 +264,36 @@ + + if (ch & 0x80) + { +- if ((i >= min_col) && (i < max_col)) ++ if (col < SLtt_Screen_Cols) + { +- out[i-min_col] = '~'; +- attributes[i-min_col] = attr; ++ *pout++ = '~'; ++ *pattributes++ = attr; + } +- i++; ++ col++; + ch &= 0x7F; + /* drop */ + } + +- if ((i >= min_col) && (i < max_col)) ++ if (col < SLtt_Screen_Cols) + { +- out[i-min_col] = '^'; +- attributes[i-min_col] = attr; ++ *pout++ = '^'; ++ *pattributes++ = attr; + } +- i++; ++ col++; + + if (ch == 0x7F) ch = '?'; + else ch += '@'; + +- if ((i >= min_col) && (i < max_col)) ++ if (col < SLtt_Screen_Cols) + { +- out[i-min_col] = ch; +- attributes[i-min_col] = attr; ++ *pout++ = ch; ++ *pattributes++ = attr; + } +- i++; ++ col++; + } + +- if (i < i_max) +- i = i_max; ++ if (col < format_rlim) ++ col = format_rlim; + + /* Now add "..." if selective display. To do that, the next line needs to + * be dealt with to determine whether or not it will be hidden. +@@ -249,7 +301,7 @@ + if (Most_Selective_Display + && (Most_W_Opt == 0) + && (beg < Most_Eob) +- && ((i >= min_col) && (i < max_col))) ++ && (col < SLtt_Screen_Cols)) + { + if (*beg == '\n') beg++; + +@@ -260,37 +312,29 @@ + if ((beg >= Most_Eob) || (*beg == '\n') + || (most_apparant_distance(beg) >= Most_Selective_Display)) + { +- i_max = i + 3; +- while (i < i_max) ++ /* Add an ellipsis, if they fit on the screen. */ ++ int rlimit = col + 3; ++ while (col < rlimit) + { +- if (i < max_col) ++ if (col < SLtt_Screen_Cols) + { +- out[i] = '.'; +- attributes[i] = ' '; ++ *pout++ = '.'; ++ *pattributes++ = ' '; + } +- i++; ++ col++; + } + } + } +- +- i_max = i; + +- if (i < min_col) +- i = min_col; +- else if (i >= max_col) +- i = max_col; +- +- i -= min_col; +- +- out[i] = 0; +- attributes[i] = 0; +- return i_max; ++ *pout = 0; ++ *pattributes = 0; + } + +-static void output_with_attr (unsigned char *out, unsigned char *attr) ++static void output_with_attr (unsigned char *out, char *attr) + { +- unsigned char at, ch, lat; ++ unsigned char at, lat; + unsigned char *p = out; ++ unsigned char *pmax = p + strlen((char *) p); + + if (Most_V_Opt) + { +@@ -299,7 +343,7 @@ + } + + lat = ' '; +- while ((ch = *p) != 0) ++ while (p < pmax) + { + if (lat != *attr) + { +@@ -321,7 +365,7 @@ + else most_tt_normal_video (); + lat = at; + } +- p++; ++ p = SLutf8_skip_char(p, pmax); + attr++; + } + +@@ -340,10 +384,11 @@ + void most_display_line (void) + { + unsigned char *beg, *end; +- unsigned int len; ++#if 0 + unsigned char dollar; ++#endif + static unsigned char *line; +- static unsigned char *attr; ++ static char *attr; + static unsigned int line_len; + + if (Most_B_Opt) +@@ -357,37 +402,43 @@ + if (line_len < (unsigned int)(SLtt_Screen_Cols + 1) * SLUTF8_MAX_MBLEN) + { + SLfree ((char *) line); +- SLfree ((char *) attr); ++ SLfree (attr); + + line_len = (SLtt_Screen_Cols + 1) * SLUTF8_MAX_MBLEN; + + if ((NULL == (line = (unsigned char *) SLmalloc (line_len))) +- || (NULL == (attr = (unsigned char *) SLmalloc (line_len)))) ++ || (NULL == (attr = SLmalloc (line_len)))) + most_exit_error ("Out of memory"); + } + + (void) most_extract_line (&beg, &end); + +- len = most_analyse_line(beg, end, (char *) line, (char *) attr); ++ most_analyse_line(beg, end, line, attr); + ++#if 0 ++ /* Currently the dollar sign is not always being written at the ++ rightmost column when displaying multi-byte characters. */ + dollar = 0; + if (Most_W_Opt) + { +- if ((end < Most_Eob) +- && (*end != '\n')) +- dollar = '\\'; ++ if ((end < Most_Eob) ++ && (*end != '\n')) ++ dollar = '\\'; + } + else if (len > (unsigned int) SLtt_Screen_Cols + (Most_Column - 1)) + dollar = '$'; +- ++ + if (dollar) + { +- line[SLtt_Screen_Cols-1] = dollar; +- attr[SLtt_Screen_Cols-1] = ' '; +- line[SLtt_Screen_Cols] = 0; +- attr[SLtt_Screen_Cols] = 0; ++ unsigned char *pline = ++ most_forward_columns(line, line + line_len, SLtt_Screen_Cols-1, 1); ++ *pline = dollar; ++ *(pline+1) = 0; ++ attr[SLtt_Screen_Cols-1] = ' '; ++ attr[SLtt_Screen_Cols] = 0; + } +- ++#endif ++ + output_with_attr (line, attr); + SLsmg_erase_eol (); + } +@@ -398,21 +449,34 @@ + int most_apparant_distance (unsigned char *pos) + { + int i; +- unsigned char *save_pos, ch; ++ unsigned char *save_pos, *beg, ch; + unsigned int save_offset; + + save_offset = Most_C_Offset; + save_pos = pos; + Most_C_Offset = (unsigned int) (pos - Most_Beg); +- pos = most_beg_of_line(); ++ beg = pos = most_beg_of_line(); + Most_C_Offset = save_offset; + + i = 0; + while (pos < save_pos) + { +- ch = *pos++; +- if (((ch >= ' ') && (ch < 0x7F)) +- || (ch >= SLsmg_Display_Eight_Bit)) ++ ch = *pos; ++ ++ if (Most_UTF8_Mode) { ++ unsigned char *prev = pos; ++ int len; ++ pos = SLutf8_skip_char(pos, save_pos); ++ len = pos - prev; ++ if (len > 1) { ++ i++; ++ continue; ++ } ++ } else { ++ pos++; ++ } ++ ++ if (most_isprint(ch)) + { + i++; + continue; +@@ -420,7 +484,13 @@ + + if (!Most_V_Opt && (ch == '\b')) + { +- if (i > 0) i--; ++ if (i > 0) ++ { ++ if (Most_UTF8_Mode) ++ i -= pos - SLutf8_bskip_char(beg, pos); ++ else ++ i--; ++ } + } + else if (!Most_V_Opt && (ch == '\015')) /* ^M */ + { +@@ -439,3 +509,95 @@ + } + return i; + } ++ ++/* ++ * Returns a pointer to the num_cols'th character after the one ++ * pointed at b. Invisible character runs are not counted toward this ++ * limit, i.e. strings that represent attributes, such as "_\b" for ++ * underlines. ++ * ++ * If multi_column is non-zero, characters spanning more than one ++ * column will add their extra width to the column count. ++ * ++ * If there the end of the buffer is reached, as delimited by argument ++ * e, then e is returned. ++ */ ++unsigned char *most_forward_columns (unsigned char *beg, unsigned char *e, unsigned int num_cols, int multi_column) ++{ ++ unsigned int col = 0; ++ unsigned int prev_width = 1; ++ unsigned char* b = beg; ++ ++ while ((b < e) ++ && ((col < num_cols) ++ || (*b == '\b') ++ || (*b == '\r'))) ++ { ++ unsigned char ch = *b; ++ ++ if (Most_UTF8_Mode) ++ { ++ unsigned char *prev = b; ++ int len; ++ b = SLutf8_skip_char(b, e); ++ len = b - prev; ++ if (len > 1) ++ { ++ if (multi_column) ++ { ++ SLwchar_Type wc; ++ if (SLutf8_decode(prev, e, &wc, NULL)) ++ col += prev_width = SLwchar_wcwidth(wc); ++ } ++ else ++ col++; ++ continue; ++ } ++ } ++ else ++ b++; ++ ++ if (most_isprint(ch)) ++ { ++ col++; ++ prev_width = 1; ++ continue; ++ } ++ ++ if ((ch == '\b') || (ch == '\t') || (ch == '\r')) ++ switch (ch) ++ { ++ case '\b': ++ if (Most_V_Opt == 0) ++ { ++ if (col > 0) col -= prev_width; ++ } ++ else col += 2; ++ break; ++ ++ case '\r': ++ if (Most_V_Opt == 0) ++ col = 0; ++ else ++ col += 2; ++ break; ++ ++ case '\t': ++ if (Most_T_Opt == 0) ++ col = Most_Tab_Width * (col/Most_Tab_Width + 1); ++ else ++ col += 2; /* ^I is two chars long. */ ++ break; ++ } ++ else if (ch & 0x80) ++ col += 3; ++ else ++ col += 2; ++ } ++ ++ /* Last character was too wide. Backstep it. */ ++ if (col > num_cols) ++ b = SLutf8_bskip_char(beg, b); ++ ++ return b; ++} +--- most-4.10.2.orig/src/line.h ++++ most-4.10.2/src/line.h +@@ -7,5 +7,7 @@ + + extern void most_display_line(void); + extern int most_apparant_distance(unsigned char *); ++extern int most_isprint(unsigned char); ++extern unsigned char *most_forward_columns (unsigned char *, unsigned char *, unsigned int, int); + #endif + +--- most-4.10.2.orig/src/most.c ++++ most-4.10.2/src/most.c +@@ -125,7 +125,7 @@ + ch = *(++str); + if ( ch == '/') + { +- strcpy (Most_Search_Str,++str); ++ strcpy ((char *) Most_Search_Str,++str); + return; + } + +@@ -329,7 +329,8 @@ + + static void do_most (char *file, int start) + { +- int piped, row, col; ++ int piped; ++ long long row, col; + + most_get_cdir(Most_C_Dir); + +@@ -347,7 +348,7 @@ + Most_Curs_Offset = Most_C_Offset; + + if (*Most_Search_Str +- && ((row = most_search (Most_Beg + Most_C_Offset, 1, &col)) > 0)) ++ && ((row = most_search (Most_Beg + Most_C_Offset, 1LL, &col)) > 0)) + most_goto_line(row); + else + { +@@ -455,13 +456,7 @@ + + SLtt_get_terminfo(); + #if SLANG_VERSION >= 20000 +-#if 0 +- Most_UTF8_Mode = SLutf8_enable (1); +- if (Most_UTF8_Mode) +- { +- fprintf (stderr, "UTF-8 Mode is in effect\n"); +- } +-#endif ++ Most_UTF8_Mode = SLutf8_enable (-1); + #endif + SLtt_Ignore_Beep = 1; + if (No_Colors) +--- most-4.10.2.orig/src/most.h ++++ most-4.10.2/src/most.h +@@ -1,4 +1,5 @@ + #include "config.h" ++#define SLANG_REGEXP + extern int Most_S_Opt; + extern int Most_A_Opt; /* automatically choose -b if necessary */ + extern int Most_V_Opt; /* display control chars */ +--- most-4.10.2.orig/src/search.c ++++ most-4.10.2/src/search.c +@@ -20,6 +20,7 @@ + */ + #include "config.h" + ++#include + #include + #include + #include +@@ -31,18 +32,18 @@ + #include "display.h" + #include "search.h" + +-/* Note!!! The regular expression searches may not work. I have not +- * tested them. +- * FIXME!!! +- */ +- + int Most_Case_Sensitive = 0; +-char Most_Search_Str[256]; ++unsigned char Most_Search_Str[256]; + int Most_Search_Dir = 1; + + #include "jdmacros.h" + +-#define UPCASE(ch) ((!Most_Case_Sensitive && (ch <= 'z') && (ch >= 'a')) ? (ch - 32) : ch) ++#if SLANG_VERSION < 20000 ++# define NORM_CHAR(ch) ((!Most_Case_Sensitive) ? toupper(ch) : ch) ++# define UPCASE(ch) NORM_CHAR(ch) ++#else ++# define NORM_CHAR(ch) (ch) ++#endif + + #if defined(HAVE_V8_REGCOMP) || defined(SLANG_REGEXP) + +@@ -78,7 +79,7 @@ + * This function is called by the V8 regcomp to report + * errors in regular expressions. + */ +-static void regerror(char *s) ++static void regerror(const char *s) + { + char string[256]; + +@@ -95,13 +96,17 @@ + * 0 error + * + */ +-static int do_regcomp(unsigned char *key) ++static int do_regcomp(const unsigned char *key) + { + static int old_Most_Case_Sensitive; +- unsigned char UpCaseKey[sizeof(savepattern)]; + # ifndef HAVE_V8_REGCOMP + int posn; /* reg exp error at this offset */ + # endif ++# if SLANG_VERSION < 20000 ++ unsigned char UpCaseKey[sizeof(savepattern)]; ++# else ++ int re_flags = 0; ++# endif + + /* + * Only recompile search string if it has changed +@@ -124,6 +129,7 @@ + + old_Most_Case_Sensitive = Most_Case_Sensitive; + ++# if SLANG_VERSION < 20000 + if ( Most_Case_Sensitive == 0 ) + { + register unsigned char *p; /* ptr to UpCaseKey */ +@@ -141,6 +147,7 @@ + + *p = '\0'; + } ++# endif + + strcpy((char *)savepattern, (char *)key); + +@@ -162,7 +169,12 @@ + # else + if (Regexp != NULL) + SLregexp_free (Regexp); +- if (NULL == (Regexp = SLregexp_compile ((char *)key, Most_Case_Sensitive ? 0 : SLREGEXP_CASELESS))) ++ ++ if (!Most_Case_Sensitive) ++ re_flags |= SLREGEXP_CASELESS; ++ if (Most_UTF8_Mode) ++ re_flags |= SLREGEXP_UTF8; ++ if (NULL == (Regexp = SLregexp_compile ((char *)key, re_flags))) + posn = -1; + else + posn = 0; +@@ -187,7 +199,7 @@ + * Call the appropriate regular expression execute function + */ + +-static unsigned char *do_regexec(unsigned char *string) ++static unsigned char *do_regexec(const unsigned char *string, size_t length) + { + # ifdef HAVE_V8_REGCOMP + if ( regexec(regpattern, (char *)string) ) +@@ -196,40 +208,46 @@ + return( NULL ); + # else + # if SLANG_VERSION < 20000 +- return ( SLang_regexp_match(string, strlen((char *)string), ®data) ); ++ return ( SLang_regexp_match(string, length, ®data) ); + # else +- return (unsigned char *)SLregexp_match (Regexp, (char *)string, strlen ((char *)string)); ++ return (unsigned char *)SLregexp_match (Regexp, (char *)string, length); + # endif + # endif /* HAVE_V8_REGCOMP */ + } + + /* +- * Make a upper case copy of a string. Also changes any "c\b" character +- * strings into just "" so that highlighted and underlined characters +- * can be searched. ++ * Changes any "c\b" character strings into just "" so that ++ * highlighted and underlined characters can be searched. Stores in ++ * length the new size of the string, after the aforementioned ++ * changes. ++ * ++ * If using a version of S-Lang that does not support case ++ * insensitive regular expressions, this function upper cases the ++ * input string, as well. + * + * Reuses malloced memory, so a copy cannot be retained between calls. + */ + +-static unsigned char *StrUpCaseCopy(unsigned char *input) ++static const unsigned char *StrNormCopy(const unsigned char *input, ++ size_t *length) + { + static unsigned char *uppercase; /* ptr to malloced area */ + static size_t bufsize; /* size of malloced area */ +- unsigned char *src; /* ptr to source */ ++ const unsigned char *src; /* ptr to source */ ++ const unsigned char *end; /* ptr to end of source */ + register unsigned char *dest; /* ptr to destination */ + register int idx; /* index into uppercase[] */ +- register unsigned char c; /* source character */ +- size_t length; /* size of string to copy */ + + src = input; +- length = strlen((char *)src) + 1; /* len of line plus terminator */ ++ end = input + *length; + +- if ( length > bufsize ) ++ if ( *length >= bufsize ) + { + if ( uppercase != (unsigned char *)NULL ) + free(uppercase); + +- bufsize = (length > 256 ) ? length : 256; /* 256 byte default */ ++ /* len of line plus terminator */ ++ bufsize = (*length >= 256 ) ? *length + 1 : 256; /* 256 byte default */ + + uppercase = (unsigned char *)malloc(bufsize); + if ( uppercase == (unsigned char *)NULL ) +@@ -242,8 +260,9 @@ + + dest = uppercase; + +- for ( idx = 0 ; (c = *src) != '\0' ; src++ ) ++ for ( idx = 0 ; src < end ; src++ ) + { ++ unsigned char c = *src; + if ( c == '\b' ) /* backspace */ + { + if ( idx-- > 0 ) +@@ -252,54 +271,79 @@ + else + { + if ( idx++ >= 0 ) +- *dest++ = UPCASE(c); ++ *dest++ = NORM_CHAR(c); + } + } + + *dest = '\0'; /* add termination */ + ++ *length = dest - uppercase; + return(uppercase); + } + + /* +- * Given an offset into a copy made by StrUpCaseCopy() and a pointer to the ++ * Given an offset into a copy made by StrNormCopy() and a pointer to the + * original string, returns a pointer into the original string corresponding + * to this offset. + */ + +-static unsigned char *GetOrigPtr(unsigned char *original, int offset) ++static const unsigned char * ++GetOrigPtr(const unsigned char *original, int offset, ++ const unsigned char *end) + { +- register unsigned char *p = original; ++ const unsigned char *p = original; + register int j = offset; + + /* + * Step through, adjusting offset according to backspaces found + */ +- while ( *p != '\0' ) ++ while ( p < end ) + { ++ const unsigned char *next; ++ if (Most_UTF8_Mode) ++ next = SLutf8_skip_char((unsigned char*) p, (unsigned char*) end); ++ else ++ next = p + 1; ++ size_t length_last = next - p; ++ + if ( *p == '\b' ) +- j++; ++ j += length_last; + else +- j--; ++ j -= length_last; + + if ( j < 0 ) + break; + else +- p++; ++ p = next; + } + + return(p); + } + #endif /* HAVE_V8_REGCOMP || SLANG_REGEXP */ + ++/* Returns a pointer to the first occurrence of '\n' in string beg, or ++ * end if no '\n' can be found between inclusive beg and exclusive ++ * end. ++ */ ++static const unsigned char * ++find_eol(const unsigned char *beg, const unsigned char *end) ++{ ++ const unsigned char *p; ++ if ( (p = memchr(beg, '\n', end - beg)) != NULL) ++ return p; ++ else ++ return end; ++} ++ + /* This routine returns the 1 + position of first match of key in str. + key is modified to match the case of str. */ + /* We should try to optimize this routine */ + /* searches from beg up to but not including end */ + +-static unsigned char *forw_search_region(unsigned char *beg, +- unsigned char *end, +- unsigned char *key) ++static const unsigned char * ++forw_search_region(const unsigned char *beg, ++ const unsigned char *end, ++ const unsigned char *key) + { + #if defined(HAVE_V8_REGCOMP) || defined(SLANG_REGEXP) + /* +@@ -307,10 +351,11 @@ + * to be broken into lines. + * + */ +- unsigned char *p; /* temp pointer */ +- unsigned char *linebeg; /* beginning of working line */ +- unsigned char *copy; /* ptr to upper case copy */ ++ const unsigned char *linebeg; /* beginning of working line */ ++ const unsigned char *lineend; /* end of working line */ ++ const unsigned char *norm_line; /* ptr to normalized line */ + unsigned char *match; /* ptr to matching string */ ++ int anchored_re; + + /* + * Compile "key" into an executable regular expression +@@ -318,58 +363,35 @@ + if ( do_regcomp(key) == 0 ) + return(Most_Eob); + +- /* +- * For regular expression searches we need to do a line by line +- * search, so it is necessary to temporarily replace '\n' with '\0' +- * characters. +- */ +- p = beg; +- linebeg = beg; ++ anchored_re = key[0] == '^'; + +- while (linebeg < end) ++ for ( linebeg = beg ; linebeg < end ; linebeg = lineend + 1 ) + { +- while ((p < end) && (*p != '\n')) p++; +- if (p == end) break; +- *p = 0; ++ size_t length; + +- if ( Most_Case_Sensitive == 0 ) /* i.e. case insensitive */ +- { +- copy = StrUpCaseCopy(linebeg); +- if ( copy == (unsigned char *)NULL ) +- return(Most_Eob); +- } ++ lineend = find_eol(linebeg, end); ++ ++ length = lineend - linebeg; ++ if (0 == length) continue; /* Skip empty lines. */ ++ ++ norm_line = StrNormCopy(linebeg, &length); ++ if ( norm_line == NULL ) ++ return(Most_Eob); + + /* + * Quick sanity check for beginning of line archored tests. +- * If 1st char of key is "^", then the character before linebeg (which +- * must be beyond the start of the window), must be a "\n", +- * otherwise do_regexec() isn't called. ++ * If 1st char of key is "^", then the character before ++ * linebeg (which must be within the buffer), must be a "\n". + */ +- if ( +-# if 0 +- ((*key != '^') +- || (linebeg > Most_Win->beg_pos && linebeg[-1] == '\n')) +- && +-#endif +- (match = do_regexec(Most_Case_Sensitive ? linebeg : copy))) ++ if ( !(anchored_re && (linebeg <= Most_Beg || linebeg[-1] != '\n')) ++ && (match = do_regexec(norm_line, length)) ) + { +- *p = '\n'; +- if ( Most_Case_Sensitive == 0 ) +- { +- /* +- * Use offset into "copy" as idx to find point in +- * real line. +- */ +- return( GetOrigPtr(linebeg, match - copy) ); +- } +- else +- { +- return( match ); +- } ++ /* ++ * Use offset into "norm_line" as idx to find point in ++ * real line. ++ */ ++ return( GetOrigPtr(linebeg, match - norm_line, lineend) ); + } +- +- *p++ = '\n'; +- linebeg = p; + } + + return(Most_Eob); +@@ -475,23 +497,18 @@ + * pattern "key". + */ + +-static unsigned char *back_search_region(unsigned char *beg, +- unsigned char *end, +- unsigned char *key) ++static const unsigned char * ++back_search_region(const unsigned char *beg, ++ const unsigned char *end, ++ const unsigned char *key) + { + #if defined(HAVE_V8_REGCOMP) || defined(SLANG_REGEXP) +- register unsigned char *p; +- unsigned char *endp, /* end of line */ +- *lastmatch, /* last match in line */ ++ const unsigned char *p; ++ const unsigned char *endp, /* end of line */ ++ *lastmatch, /* last match in line */ + *endprevline, /* end of line before this one */ + *match; /* ptr to matching string */ +- unsigned char savec; /* last char on line */ +- +- /* +- * Compile "key" into an executable regular expression +- */ +- if ( do_regcomp(key) == 0 ) +- return(Most_Eob); ++ int anchored_re; + + /* + * Starting from the end of the buffer, break the buffer into lines +@@ -501,84 +518,60 @@ + * and isn't that what we want to do in a reverse search. + */ + endp = end; +- lastmatch = Most_Eob; +- while ( 1 ) /* forever loop */ +- { +- if ( (endp < beg) ) +- return(Most_Eob); /* Reach start of buffer, no match */ ++ endprevline = end; ++ match = Most_Eob; + +- /* Find the real end of current line */ +- if ( (p = (unsigned char *)strchr((char *)endp, '\n')) != NULL ) +- endp = p; +- +- savec = *endp; +- *endp = '\0'; /* terminate line with NULL */ ++ /* Find out whether the regexp attempts to match a line boundary. ++ * In this case, only a match on the full line should be attempted. ++ */ ++ anchored_re = key[strlen((const char *) key)-1] == '$'; + ++ while ( endp > beg ) ++ { + /* Find the beginning of line */ + for ( p = endp - 1 ; (p >= beg) && (*p != '\n') ; p-- ) + { + } + ++ if ( p < beg ) ++ break; ++ + endprevline = p; + +- p++; /* point to 1st char after newline */ ++ /* ++ * Quick sanity check for end of line archored tests. If last ++ * char of key is "$", then the character after endp (which ++ * must be within the buffer), must be a "\n". ++ */ ++ if ( anchored_re && endp < Most_Eob && endp[0] != '\n' ) ++ { ++ endp = p; ++ continue; ++ } + + /* + * Keep searching forward in this line till no more matches + */ +- if ( Most_Case_Sensitive == 0 ) /* i.e. case insensitive */ ++ do + { +- unsigned char *copy; /* ptr to upper case copy */ +- unsigned char *savecopy; /* copy of "copy" */ +- +- copy = StrUpCaseCopy(p); +- if ( copy == (unsigned char *)NULL ) +- return(Most_Eob); ++ lastmatch = match; + +- savecopy = copy; +- +- /* +- * Quick sanity check for beginning of line archored tests. +- * Must be at start of line. +- */ +- while ( ((*key != '^') || (copy == savecopy)) +- && (match = do_regexec(copy)) ) +- { +- if ( GetOrigPtr(p, match - savecopy) > end ) +- break; +- lastmatch = match; +- if ( *lastmatch == '\0' ) /* key must be "$" or "^" */ +- break; +- copy = lastmatch + 1; /* character after match */ +- } ++ if (Most_UTF8_Mode) ++ p = SLutf8_skip_char((unsigned char*) p, (unsigned char*) endp); ++ else ++ p++; + +- if ( lastmatch != Most_Eob ) /* found a match */ +- lastmatch = GetOrigPtr(p, lastmatch - savecopy); +- } +- else +- { +- /* +- * Quick sanity check for beginning of line archored tests. +- * Must be at start of buffer or start of line +- */ +- while ( ( (*key != '^') || (p == endprevline + 1) ) +- && (match = do_regexec(p)) ) +- { +- if ( match > end ) +- break; +- lastmatch = match; +- if ( *lastmatch == '\0' ) /* key must be "$" or "^" */ +- break; +- p = lastmatch + 1; /* character after match */ +- } ++ match = forw_search_region(p, endp, key); + } ++ while ( match <= endp ); + +- *endp = savec; + if ( lastmatch != Most_Eob ) /* found a match */ + return(lastmatch); + + endp = endprevline; + } ++ ++ return(Most_Eob); /* Reached start of buffer, no match */ + #else + char ch, char1, work[256]; + unsigned char *pos; +@@ -670,15 +663,15 @@ + #endif /* HAVE_V8_REGCOMP || SLANG_REGEXP */ + } + +-int most_search(unsigned char *from, int repeat, int *col) ++long long most_search(const unsigned char *from, int repeat, long long *col) + { + /* return the line match was found as well as line number, + * search from i on; assume that line_array match the i so we need + * no initial lookup */ + +- int test, save_line, the_col, row, s_len; ++ long long test, save_line, the_col, row, s_len; + char string[300]; +- unsigned char *pos; ++ const unsigned char *pos; + unsigned int save_ofs; + unsigned int found_ofs; + +@@ -687,7 +680,10 @@ + save_line = Most_C_Line; + found_ofs = Most_Eob - Most_Beg; + *col = 0; +- s_len = strlen (Most_Search_Str); ++ if (Most_UTF8_Mode) ++ s_len = SLutf8_strlen (Most_Search_Str, 0); ++ else ++ s_len = strlen ((char *) Most_Search_Str); + pos = from; + + if (*Most_Search_Str) +--- most-4.10.2.orig/src/search.h ++++ most-4.10.2/src/search.h +@@ -6,7 +6,7 @@ + extern int Most_Case_Sensitive; + extern int Most_Search_Dir; + #define MOST_SEARCH_BUF_LEN 256 +-extern char Most_Search_Str[MOST_SEARCH_BUF_LEN]; +-extern int most_search(unsigned char *, int, int *); ++extern unsigned char Most_Search_Str[MOST_SEARCH_BUF_LEN]; ++extern long long most_search(const unsigned char *, int, long long *); + #endif + +--- most-4.10.2.orig/src/window.c ++++ most-4.10.2/src/window.c +@@ -48,10 +48,11 @@ + + Most_Window_Type *Most_Win; + Most_Window_Type *Most_Top_Win; +-int Most_Top_Line; /* row number of top window */ +-int Most_Curs_Row; +-int Most_Curs_Col; +-int Most_Column = 1; ++long long Most_Top_Line; /* row number of top window */ ++long long Most_Curs_Row; ++long long Most_Curs_Col; ++/* The leftmost visible column. */ ++long long Most_Column = 1; + int Most_Restore_Width_To = 0; + char Most_Mini_Buf[256]; + unsigned long Most_Curs_Offset; +@@ -156,7 +157,7 @@ + SLsmg_write_nchars (buf + point, len - point); + if (col < SLtt_Screen_Cols) + break; +- buf++; point--; len--; /* FIXME for UTF-8 */ ++ buf++; point--; len--; + } + SLsmg_erase_eol (); + SLsmg_gotorc (SLtt_Screen_Rows - 1, col); +@@ -227,6 +228,8 @@ + { + SLang_RLine_Info_Type *rli; + unsigned int flags = SL_RLINE_BLINK_MATCH; ++ if (Most_UTF8_Mode) ++ flags |= SL_RLINE_UTF8_MODE; + + if (NULL == (rli = SLrline_open (SLtt_Screen_Cols, flags))) + return NULL; +@@ -258,7 +261,7 @@ + + /* do not use default. The up arrow can always get it back. */ + if ((what != NULL) +- && (*what) && (what != Most_Search_Str)) ++ && (*what) && (what != (char *) Most_Search_Str)) + { + if (-1 == SLrline_set_line (Most_RLI, what)) + return -1; +@@ -593,7 +596,8 @@ + unsigned int num_chars; + unsigned int field_width, info_len; + unsigned char *eob; +- int r, x; ++ int r; ++ long long x; + + eob = Most_Eob; + #if MOST_HAS_MMAP +@@ -601,20 +605,20 @@ + eob = Most_Beg + Most_Buf->mmap_size; + #endif + +- if (eob == Most_Beg) x = 100; ++ if (eob == Most_Beg) x = 100LL; + else + { +- x = Most_C_Offset * 100; ++ x = Most_C_Offset * 100LL; + x = x / (eob - Most_Beg); + } + + if (Most_C_Line + (Most_Win->bot - Most_Win->top + 1) >= Most_Num_Lines) +- x = 100; ++ x = 100LL; + + /* for files with end of file above the bottom row (due to window manipulations) */ +- if (x > 100) x = 100; ++ if (x > 100LL) x = 100LL; + +- sprintf (info, "(%d,%d) %d%%", Most_C_Line, Most_Column, x); ++ sprintf (info, "(%lld,%lld) %d%%", Most_C_Line, Most_Column, (int)x); + + r = Most_Win->bot + 1; + most_goto_rc (r,1); +--- most-4.10.2.orig/src/window.h ++++ most-4.10.2/src/window.h +@@ -5,11 +5,11 @@ + typedef struct _Most_Window_Type + { + unsigned long top_offset; /* offset of top line of window from bob */ +- int beg_line; /* line number of top */ +- int curs_line; /* line number of curs pos */ +- int curs_col; /* column number of curs pos */ ++ long long beg_line; /* line number of top */ ++ long long curs_line; /* line number of curs pos */ ++ long long curs_col; /* column number of curs pos */ + unsigned long curs_offset; /* pos of cursor from bob*/ +- int col; /* column offset */ ++ long long col; /* column offset */ + int n_lines; /* number of lines of buffer (mode dependent) */ + int top; /* screen location of top */ + int bot; /* screen location of bot */ +@@ -29,9 +29,9 @@ + extern Most_Window_Type *Most_Win; + extern Most_Window_Type *Most_Top_Win; + extern unsigned long Most_Curs_Offset; +-extern int Most_Column; +-extern int Most_Curs_Row; +-extern int Most_Curs_Col; ++extern long long Most_Column; ++extern long long Most_Curs_Row; ++extern long long Most_Curs_Col; + #define MOST_MINI_BUF_LEN 256 + extern char Most_Mini_Buf[MOST_MINI_BUF_LEN]; + extern int Most_Selective_Display; diff --git a/abs/extra/mpeg_stat/PKGBUILD b/abs/extra/mpeg_stat/PKGBUILD new file mode 100644 index 0000000..37be249 --- /dev/null +++ b/abs/extra/mpeg_stat/PKGBUILD @@ -0,0 +1,19 @@ +# Contributor: Nick B +pkgname=mpeg_stat +pkgver=2.2b +pkgrel=2 +pkgdesc="A Berkely MPEG Tools bitstream analysis tool." +arch=('i686' 'x86_64') +url="http://bmrc.berkeley.edu/ftp/pub/multimedia/mpeg/" +license=('custom') +depends=('ffmpeg') +source=(http://www.sfr-fresh.com/unix/misc/old/${pkgname}-${pkgver}-src.tar.gz) + +build() { + +cd $startdir/src/mpeg_stat +make || return 1 +install -m755 -D $startdir/src/mpeg_stat/mpeg_stat $startdir/pkg/usr/bin/mpeg_stat +install -m644 -D $startdir/src/mpeg_stat/COPYRIGHT $startdir/pkg/usr/share/licenses/mpeg_stat/COPYRIGHT +} + diff --git a/abs/extra/mpgtx/PKGBUILD b/abs/extra/mpgtx/PKGBUILD new file mode 100644 index 0000000..1181564 --- /dev/null +++ b/abs/extra/mpgtx/PKGBUILD @@ -0,0 +1,16 @@ +pkgname="mpgtx" +pkgver="1.3.1" +pkgrel=1 +arch=('i686') +pkgdesc="mpgtx is a commandline MPEG audio/video/system file toolbox." +url="http://mpgtx.sourceforge.net/" +source=(http://downloads.sourceforge.net/project/mpgtx/mpgtx/$pkgver/mpgtx-$pkgver.tar.gz) +md5sums=('d628060aa04ad3b40a175bf35f5167cf') + +build() { + cd $startdir/src/$pkgname-$pkgver + ./configure --prefix=/usr + make || return 1 + make INSTALLDIR=$startdir/pkg/usr/bin MANDIR=$startdir/pkg/usr/man/man1 MANDIRDE=$startdir/usr/man/de/man1 install +} + diff --git a/abs/extra/mupen64plus-svn/PKGBUILD b/abs/extra/mupen64plus-svn/PKGBUILD new file mode 100644 index 0000000..5df794d --- /dev/null +++ b/abs/extra/mupen64plus-svn/PKGBUILD @@ -0,0 +1,71 @@ +#!!! Due to a limitation in pacman's SVN package handling, +# this package requires out-of-the-ordinary building. pacman checks +# the SVN repo for new revisions before scanning the PKGBUILD. +#!!! So, when you run makepkg, if it asks you for a password for 'mupen64', +# give it 'Dyson5632-kart' without the quotes. If it asks for a password +# for _your_ username, hit Enter to make it ask for a new username, tell it +# 'mupen64' without the quotes, and then give it the password above. When +# it asks you to save the password unencrypted, you can say yes, because +# it's just a read-only access login :P Once you do that, you shouldn't +# need to do the above anymore. + +# Maintainer: Devin Cofer +# Contributor: Rudy Matela +# Contributor: Allan McRae +# Contributor: Zephyr + +pkgname=mupen64plus-svn +pkgver=1416 +pkgrel=1 +pkgdesc="Nintendo64 emulator, SVN version" +arch=('i686' 'x86_64') +url="http://code.google.com/p/mupen64plus/" +license=('GPL2') + +makedepends=('subversion' 'pkgconfig' 'libsamplerate' 'yasm' 'mesa') +depends=('gtk2' 'sdl_ttf') +optdepends=('libsamplerate: Higher quality audio') +conflicts=('mupen64plus') +provides=('mupen64plus') +source=('install.patch' + 'fix-gcc4.4-const-char.patch') +md5sums=('f6a3bc6e59d4f2af9db1b3fce257eb43' + '7bb0182949bf043847ad7ff66097e66f') + +_svnuser=mupen64 +_svnpass=Dyson5632-kart +_svntrunk=svn://$_svnuser:$_svnpass@fascination.homelinux.net:7684/mupen64plus/trunk +_svnmod=mupen64plus + +build() { + if [ -d $_svnmod/.svn ]; then + (cd $_svnmod &&\ + svn up --config-dir . -r $pkgver \ + --non-interactive --username $_svnuser --password $_svnpass) + else + svn co $_svntrunk --config-dir . -r $pkgver $_svnmod \ + --non-interactive --username $_svnuser --password $_svnpass + fi + msg "SVN checkout done or server timeout" + + cp -r $_svnmod $_svnmod-build + patch -d $_svnmod-build < install.patch || return 1 +# patch -p0 -d $_svnmod-build < fix-gcc4.4-const-char.patch || return 1 + cd $_svnmod-build + + make PREFIX="/usr" LIRC=1 all || return 1 + make PREFIX="$pkgdir/usr" install || return 1 + + ##### Qt 4 GUI build ##### + #==> Currently broken + #make PREFIX="/usr" GUI=QT4 all || return 1 + #install -m755 mupen64plus "$pkgdir/usr/bin/mupen64plus-qt" + # + #cd "$pkgdir/usr/share/applications" + #cp mupen64plus.desktop mupen64plus-qt.desktop + #sed -i "s#Name=Mupen64Plus#Name=Mupen64Plus (Qt)#" mupen64plus-qt.desktop || return 1 + #sed -i "s#Exec=mupen64plus#Exec=mupen64plus-qt#" mupen64plus-qt.desktop || return 1 + ##### End Qt 4 GUI build ##### + + rm -r "$srcdir/$_svnmod-build" +} diff --git a/abs/extra/mupen64plus-svn/fix-gcc4.4-const-char.patch b/abs/extra/mupen64plus-svn/fix-gcc4.4-const-char.patch new file mode 100644 index 0000000..fd1495d --- /dev/null +++ b/abs/extra/mupen64plus-svn/fix-gcc4.4-const-char.patch @@ -0,0 +1,22 @@ +--- glide64/Combine.old.cpp 2009-06-19 17:59:20.191723065 -0400 ++++ glide64/Combine.cpp 2009-06-19 18:43:46.955453868 -0400 +@@ -11873,7 +11873,7 @@ + LOG ("InitCombine() "); + memset(&cmb, 0, sizeof(cmb)); + const char *extensions = grGetString (GR_EXTENSION); +- if (char * extstr = strstr(extensions, "COMBINE")) { ++ if (const char * extstr = strstr(extensions, "COMBINE")) { + if (!strncmp(extstr, "COMBINE", 7)) { + LOG ("extensions "); + cmb.grColorCombineExt = (GRCOLORCOMBINEEXT) grGetProcAddress("grColorCombineExt"); +--- glide64/Main.old.cpp 2009-06-19 18:47:04.238930057 -0400 ++++ glide64/Main.cpp 2009-06-19 18:47:18.018772876 -0400 +@@ -784,7 +784,7 @@ + printf("bebefore2\n"); + if (settings.fb_hires) + { +- if (char * extstr = strstr(extensions, "TEXTUREBUFFER")) ++ if (const char * extstr = strstr(extensions, "TEXTUREBUFFER")) + { + if (!strncmp(extstr, "TEXTUREBUFFER", 13)) + { diff --git a/abs/extra/mupen64plus-svn/install.patch b/abs/extra/mupen64plus-svn/install.patch new file mode 100644 index 0000000..5e41460 --- /dev/null +++ b/abs/extra/mupen64plus-svn/install.patch @@ -0,0 +1,13 @@ +Index: install.sh +=================================================================== +--- install.sh (revision 1295) ++++ install.sh (working copy) +@@ -90,7 +90,7 @@ + if [ -f mupen64plus.desktop ] + then + $INSTALL -d -v "${APPLICATIONSDIR}" +- $INSTALL -m 0644 mupen64plus.desktop "${APPLICATIONSDIR}" ++ $INSTALL -m 0644 mupen64plus.desktop "${APPLICATIONSDIR}/mupen64plus.desktop" + fi + if [ "x$(ls plugins/)" != "x" ] + then diff --git a/abs/extra/mutt/PKGBUILD b/abs/extra/mutt/PKGBUILD new file mode 100644 index 0000000..c481eec --- /dev/null +++ b/abs/extra/mutt/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 50055 2009-08-19 01:49:30Z thayer $ +# Maintainer: tobias [tobias [at] archlinux.org] +pkgname=mutt +pkgver=1.5.20 +pkgrel=2 +pkgdesc="A small but very powerful text-based mail client" +arch=(i686 x86_64) +license=('GPL') +url="http://www.mutt.org/" +depends=('slang' 'openssl>=0.9.8e' 'gdbm' 'mime-types' 'zlib' 'libsasl' 'gpgme') +makedepends=('gnupg') +install=${pkgname}.install +source=(ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz + mutt-unmailbox.patch) +url="http://www.mutt.org/" +md5sums=('027cdd9959203de0c3c64149a7ee351c' + 'fa8e03a49a2fa7b294dc8237d928cdb7') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # patch a segfault bug in 1.5.20 -- remove for next release + patch -p1 < ${srcdir}/mutt-unmailbox.patch || return 1 + #patch -Np1 -i ../mutt-unmailbox.patch || exit 1 + + ./configure --prefix=/usr --sysconfdir=/etc \ + --enable-pop --enable-imap --enable-smtp \ + --with-sasl --with-ssl=/usr --without-idn \ + --enable-hcache --enable-pgp --enable-inodesort \ + --enable-compressed --with-regex \ + --enable-gpgme --with-slang=/usr + make || return 1 + make DESTDIR=${pkgdir} install + rm -f ${pkgdir}/usr/bin/{flea,muttbug} + rm -f ${pkgdir}/usr/share/man/man1/{flea,muttbug}.1 + rm -f ${pkgdir}/etc/mime.types* + install -Dm644 contrib/gpg.rc ${pkgdir}/etc/Muttrc.gpg.dist +} + diff --git a/abs/extra/mutt/mutt-unmailbox.patch b/abs/extra/mutt/mutt-unmailbox.patch new file mode 100644 index 0000000..cbb3210 --- /dev/null +++ b/abs/extra/mutt/mutt-unmailbox.patch @@ -0,0 +1,10 @@ +--- a/buffy.c 2009-08-10 08:23:12.731846990 -0400 ++++ b/buffy.c 2009-08-10 08:23:50.541878087 -0400 +@@ -236,7 +236,6 @@ + { + if(*tmp) + { +- FREE (&((*tmp)->path)); + tmp1=(*tmp)->next; + FREE (tmp); /* __FREE_CHECKED__ */ + *tmp=tmp1; diff --git a/abs/extra/mutt/mutt.install b/abs/extra/mutt/mutt.install new file mode 100644 index 0000000..98ece96 --- /dev/null +++ b/abs/extra/mutt/mutt.install @@ -0,0 +1,15 @@ +# arg 1: the new package version +post_install() { + cat << EOM + +--> to support gpg, please use the following line in your ~/.muttrc + +source /etc/Muttrc.gpg.dist + +EOM +} + +post_upgrade() { + post_install $1 +} + diff --git a/abs/extra/myt2xvid3/PKGBUILD b/abs/extra/myt2xvid3/PKGBUILD index 9d88ce9..abd7cb5 100755 --- a/abs/extra/myt2xvid3/PKGBUILD +++ b/abs/extra/myt2xvid3/PKGBUILD @@ -1,6 +1,6 @@ pkgname=myt2xvid3 pkgver=0.1 -pkgrel=7 +pkgrel=9 arch=("i686") pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" url="http://www.knoppmythwiki.org/index.php?page=XvidEncoding" diff --git a/abs/extra/myth2ipod/PKGBUILD b/abs/extra/myth2ipod/PKGBUILD index 1942f2b..2c7540b 100755 --- a/abs/extra/myth2ipod/PKGBUILD +++ b/abs/extra/myth2ipod/PKGBUILD @@ -1,6 +1,6 @@ pkgname=myth2ipod pkgver=0.2 -pkgrel=28 +pkgrel=29 arch=("i686") pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" url="myth2ipod.com" diff --git a/abs/extra/myth2ipod/myth2ipod b/abs/extra/myth2ipod/myth2ipod index 268a522..baf749e 100755 --- a/abs/extra/myth2ipod/myth2ipod +++ b/abs/extra/myth2ipod/myth2ipod @@ -248,7 +248,7 @@ sub PrepSQLRead{ '/usr/share/mythtv/mysql.txt', '/etc/mythtv/mysql.txt', '/usr/local/etc/mythtv/mysql.txt', - "$ENV{HOME}/.mythtv/mysql.txt", + '$ENV{HOME}/.mythtv/mysql.txt', 'mysql.txt' ); foreach my $file (@mysql) { diff --git a/abs/extra/mythappletrailers/PKGBUILD b/abs/extra/mythappletrailers/PKGBUILD index 9c12971..2f36a4d 100644 --- a/abs/extra/mythappletrailers/PKGBUILD +++ b/abs/extra/mythappletrailers/PKGBUILD @@ -3,7 +3,7 @@ pkgname=mythappletrailers pkgver=0.04.3 -pkgrel=35 +pkgrel=41 pkgdesc="Unofficial Add-on for MythTV to get Apple.com Movie Trailers." arch=('i686' 'x86_64') license=('GPL2') @@ -28,3 +28,8 @@ build() { cp trailers $startdir/pkg/etc/cron.daily/ install -m755 $srcdir/fix_aple_url.sh $pkgdir/usr/bin } +md5sums=('336e68953d0e1e8a0c7a4990f8d43a2b' + 'c7da92600afe2a3b1f564764500315a0' + '5fdd4aa17b9c1e77b272437ae42a1827' + 'ece3c5f8a605b6e2270c6f7671705631' + 'a2349f844e47fd95a672739177ca44ff') diff --git a/abs/extra/mythappletrailers/appletrailer.xml b/abs/extra/mythappletrailers/appletrailer.xml index dc0c938..9aa19f5 100644 --- a/abs/extra/mythappletrailers/appletrailer.xml +++ b/abs/extra/mythappletrailers/appletrailer.xml @@ -1,722 +1,602 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/abs/extra/mythappletrailers/loading.sh b/abs/extra/mythappletrailers/loading.sh index d1ef680..e4e85fc 100755 --- a/abs/extra/mythappletrailers/loading.sh +++ b/abs/extra/mythappletrailers/loading.sh @@ -1,2 +1,12 @@ #!/bin/bash -echo -e "Loading . . . " | osd_cat -p middle -s 5 -f"-adobe-courier-bold-*-*-*-34-*-*-*-*-*" -d 10 -A centre + +. /etc/osd_cat.cfg || { + color=yellow + outline=2 + outlinecolour=black + shadow=0 + shadowcolour=black + font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*" +} + +echo -e "Loading . . . " | osd_cat --pos=middle --align=center --delay=10 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font diff --git a/abs/extra/mythappletrailers/mythappletrailers.install b/abs/extra/mythappletrailers/mythappletrailers.install index 0f6d8fa..96f6717 100644 --- a/abs/extra/mythappletrailers/mythappletrailers.install +++ b/abs/extra/mythappletrailers/mythappletrailers.install @@ -1,7 +1,7 @@ # arg 1: the new package version post_install() { - ln -s /home/mythtv/appletrailer.xml /usr/share/mythtv/appletrailer.xml - mv /usr/share/mythtv/is.xml /tmp + ln -s /home/mythtv/appletrailer.xml /usr/share/mythtv/themes/defaultmenu/appletrailer.xml + mv /usr/share/mythtv/themes/defaultmenu/is.xml /tmp grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp echo "" >> /tmp/is.xml.tmp echo "