diff options
136 files changed, 0 insertions, 10215 deletions
diff --git a/community-testing/clipgrab/PKGBUILD b/community-testing/clipgrab/PKGBUILD deleted file mode 100644 index df3c57383..000000000 --- a/community-testing/clipgrab/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Contributor: thacrazze <thacrazze|googlemail|com> -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> -pkgname=clipgrab -pkgver=3.1.0.2 -pkgrel=2 -pkgdesc='A video downloader and converter for YouTube, Veoh, DailyMotion, MyVideo, ...' -arch=('i686' 'x86_64') -url='http://clipgrab.de/' -license=('GPL') -depends=('qt' 'qtwebkit') -optdepends=('ffmpeg: for some encodings') -source=(http://clipgrab.de/download/${pkgname}-${pkgver}.tar.bz2 ${pkgname}.png ${pkgname}.desktop) -md5sums=('1250e1fb29cd88b7ce1a37d937de0146' - 'ef030502ae0922e632742f47283313f4' - '9a141791f6952917c441050c3dac81ce') - -build() { - cd $srcdir/$pkgname-$pkgver - qmake && make -} -package() { - cd $srcdir/$pkgname-$pkgver - install -Dm755 ${pkgname} $pkgdir/usr/bin/${pkgname} - install -Dm644 $srcdir/${pkgname}.png \ - $pkgdir/usr/share/pixmaps/${pkgname}.png - install -Dm644 $srcdir/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop -} diff --git a/community-testing/clipgrab/clipgrab.desktop b/community-testing/clipgrab/clipgrab.desktop deleted file mode 100644 index dad31cfdd..000000000 --- a/community-testing/clipgrab/clipgrab.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=ClipGrab -GenericName=Video Downloader -GenericName[de]=Video-Downloader -Comment=Download videos and convert it -Comment[de]=Videos herunterladen und konvertieren -Icon=/usr/share/pixmaps/clipgrab.png -Exec=clipgrab -TryExec=clipgrab -Terminal=false -Categories=Qt;AudioVideo;Audio;Video; diff --git a/community-testing/clipgrab/clipgrab.png b/community-testing/clipgrab/clipgrab.png Binary files differdeleted file mode 100644 index 2573fed20..000000000 --- a/community-testing/clipgrab/clipgrab.png +++ /dev/null diff --git a/community/acetoneiso2/PKGBUILD b/community/acetoneiso2/PKGBUILD deleted file mode 100644 index f86f0421c..000000000 --- a/community/acetoneiso2/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 58519 2011-11-13 15:33:17Z andrea $ -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Wes Brewer <brewerw@gmail.com> - -pkgname=acetoneiso2 -pkgver=2.3 -pkgrel=2 -pkgdesc="An all in one ISO tool (bin mdf nrg img daa dmg cdi b5i bwi pdi iso)" -arch=('i686' 'x86_64') -url="http://www.acetoneteam.org" -license=('GPL3') -depends=('qt' 'fuseiso' 'cdrdao' 'cdrkit' 'dvd+rw-tools' 'gnupg2' 'pinentry' 'mplayer' 'phonon') -optdepends=("p7zip: for ISO compress/decompress support") -conflicts=('acetoneiso') -install=${pkgname}.install -source=(http://downloads.sourceforge.net/acetoneiso/AcetoneISO/AcetoneISO%202.3/acetoneiso_${pkgver}.tar.gz) -md5sums=('225f7af687016690ff28b9771a1ce179') - -build() { - cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso - - qmake - # needed for phonon - sed -i 's|-I/usr/include/QtCore|-I/usr/include/QtCore -I/usr/include/KDE|' Makefile - make -} - -package() { - cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso - - make INSTALL_ROOT="${pkgdir}" install -} diff --git a/community/acetoneiso2/acetoneiso2.install b/community/acetoneiso2/acetoneiso2.install deleted file mode 100644 index 1a3984e24..000000000 --- a/community/acetoneiso2/acetoneiso2.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { -cat << EOF - --> - --> Please remember to add 'fuse' to your MODULES array in /etc/rc.conf - --> -EOF -} - -post_upgrade() { - post_install $* -} diff --git a/community/gphpedit/doc-fix.patch b/community/gphpedit/doc-fix.patch deleted file mode 100644 index 42dae5f72..000000000 --- a/community/gphpedit/doc-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gphpedit-0.9.91/src/tab.c.orig 2008-07-08 00:21:04.000000000 +0200 -+++ gphpedit-0.9.91/src/tab.c 2008-07-08 00:20:50.000000000 +0200 -@@ -562,6 +562,17 @@ - if (long_filename) - return long_filename; - -+ // For ArchLinux - KISS ;) -+ long_filename = tab_help_try_filename("/usr/share/doc/php/html/function.", command, ".html"); -+ if (long_filename) -+ return long_filename; -+ long_filename = tab_help_try_filename("/usr/share/doc/php/html/ref.", command, ".html"); -+ if (long_filename) -+ return long_filename; -+ long_filename = tab_help_try_filename("/usr/share/doc/php/html/", command, NULL); -+ if (long_filename) -+ return long_filename; -+ - // For Gentoo, as much as I love it - it's twatty to put docs in a version specific folder like this! - long_filename = tab_help_try_filename("/usr/doc/php-docs-200403/html/function.", command, ".html"); - if (long_filename) diff --git a/community/gpsman/PKGBUILD b/community/gpsman/PKGBUILD deleted file mode 100644 index 329822ed9..000000000 --- a/community/gpsman/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 11972 2010-02-24 02:57:47Z dgriffiths $ -# Maintainer: dibblethewrecker dibblethewrecker.at.jiwe.dot.org - -pkgname=gpsman -pkgver=6.4 -pkgrel=4 -pkgdesc="GPS Manager is a graphical GPS data manager for preparing, inspectiing and editing GPS data" -arch=('i686' 'x86_64') -url="http://www.ncc.up.pt/gpsman" -license=('GPL') -depends=('tcl' 'tk') -optdepends=('gpsmanshp: shapefile support') -install=gpsman.install -source=(http://www.ncc.up.pt/gpsman/gpsmanhtml/${pkgname}-${pkgver}.tgz - 'gpsman.desktop') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - mkdir -p ${pkgdir}/usr/{bin,share/${pkgname}} - - # set path to program files - sed -i "s|set SRCDIR gmsrc|set SRCDIR /usr/share/gpsman|g" ./gpsman.tcl - install -m755 gpsman.tcl ${pkgdir}/usr/bin/gpsman.tcl - - # install a gpsman launcher - install -m755 util/gpsman.sh ${pkgdir}/usr/bin/gpsman || return 1 - - #install program files - cp -r gmsrc/* ${pkgdir}/usr/share/gpsman/ || return 1 - chmod 755 ${pkgdir}/usr/share/gpsman/*.tcl - chmod -R 755 ${pkgdir}/usr/share/gpsman/gmicons - - # install some freedesktop.org compatibility - install -D -m644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop -} -md5sums=('3a47f1953e0bad1ea3a79aba0a713f1a' - '0341f110f61e57b316fad7bee483665b') diff --git a/community/gpsman/gpsman.desktop b/community/gpsman/gpsman.desktop deleted file mode 100644 index b0c359bd7..000000000 --- a/community/gpsman/gpsman.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=GPSMan -GenericName= -Comment="Graphical GPS data manager for preparing, inspectiing and editing GPS data" -Exec=/usr/bin/gpsman -Icon= -Terminal=false -MultipleArgs=false -Type=Application -Categories=Application;Science diff --git a/community/gpsman/gpsman.install b/community/gpsman/gpsman.install deleted file mode 100644 index 8b3a5092f..000000000 --- a/community/gpsman/gpsman.install +++ /dev/null @@ -1,39 +0,0 @@ -# This is a default template for a post-install scriptlet. You can -# remove any functions you don't need (and this header). - -# arg 1: the new package version -pre_install() { - /bin/true -} - -# arg 1: the new package version -post_install() { - echo - echo " : You should change the path to your gps serial device in" - echo " : /usr/bin/gpsman" - echo - echo " : Config options are stored in /usr/share/gpsman/config.tcl" -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - /bin/true -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - /bin/true -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} - diff --git a/community/gts/PKGBUILD b/community/gts/PKGBUILD deleted file mode 100644 index 3af73a5ed..000000000 --- a/community/gts/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=gts -pkgver=0.7.6 -pkgrel=1 -pkgdesc='GNU Triangulated Surface Library.' -arch=('i686' 'x86_64') -url='http://gts.sourceforge.net/' -license=('LGPL') -depends=('glib2') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('9f710aefd2ed9b3cc1b1216171fc5a8a') -options=('!libtool') - -build() { - cd ${pkgname}-${pkgver} - - ./configure \ - --prefix=/usr - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community/kovpn/traywindow_x86_64.patch b/community/kovpn/traywindow_x86_64.patch deleted file mode 100644 index 8c50d425a..000000000 --- a/community/kovpn/traywindow_x86_64.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/traywindow.cpp.orig 2006-07-23 13:26:21.236380500 +0100 -+++ src/traywindow.cpp 2006-07-23 13:26:38.625467250 +0100 -@@ -107,7 +107,7 @@ - delete mDisconnectMenuItems[ manager->id() ]; - - /* I think (int) manager is unique and static enough to be used as id for the menu */ -- mContextMenu->removeItem( ( int ) manager ); -+ mContextMenu->removeItem( ( long ) manager ); - mManagerMenus.remove( manager->id() ); - mOvpnManagers.remove( manager ); - } -@@ -125,7 +125,7 @@ - - mManagerMenus[ manager->id() ] = new KPopupMenu( mContextMenu ); - /* I think (int) manager is unique and static enough to be used as id for the menu */ -- mContextMenu->insertItem( manager->id() , mManagerMenus[ manager->id() ] , ( int ) manager, 5 ); -+ mContextMenu->insertItem( manager->id() , mManagerMenus[ manager->id() ] , ( long ) manager, 5 ); - - mManagerMenus[ manager->id() ] ->insertTitle( i18n( "Status: Unavailable" ), 0 ); - diff --git a/community/lat/PKGBUILD b/community/lat/PKGBUILD deleted file mode 100755 index 7093e048d..000000000 --- a/community/lat/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 5402 2009-11-08 07:59:58Z ebelanger $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=lat -pkgver=1.2.3 -pkgrel=2 -pkgdesc="LDAP Administration Tool" -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/ldap-at/" -license=("GPL") -depends=('gnome-keyring' 'gtk-sharp-2' 'avahi' 'gnome-sharp' 'rarian') -makedepends=('gettext' 'intltool' 'pkgconfig') -install=$pkgname.install -source=(http://downloads.sourceforge.net/ldap-at/lat-$pkgver.tar.gz) -md5sums=('0725508d180720d260a70c5b39d387ba') -sha1sums=('52e2de528d2fa35519b2d67cd2937d4d524001de') - -build() { - export MONO_SHARED_DIR="$srcdir/.wabi" - mkdir -p $MONO_SHARED_DIR - cd "$srcdir/lat-$pkgver" - find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \; - if [ -f omf.make ]; then - sed -i -e 's/-scrollkeeper-update.*//' omf.make - fi - - ./configure --prefix=/usr --enable-avahi=yes || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 - - rm -rf $MONO_SHARED_DIR -} diff --git a/community/lat/lat.install b/community/lat/lat.install deleted file mode 100644 index 70bbdd964..000000000 --- a/community/lat/lat.install +++ /dev/null @@ -1,26 +0,0 @@ -pkgname=lat - -post_install() { - scrolls=(`pacman -Ql $pkgname | grep 'share/omf/.*\.omf$' | awk '{ print $2 }'`) - - for scroll in "${scrolls[@]}" ; do - scrollkeeper-install -q -p var/lib/scrollkeeper "$scroll" - done -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - scrolls=(`pacman -Ql $pkgname | grep 'share/omf/.*\.omf$' | awk '{ print $2 }'`) - - for scroll in "${scrolls[@]}" ; do - scrollkeeper-uninstall -q -p var/lib/scrollkeeper "$scroll" - done -} - diff --git a/community/linuxtv-dvb-apps/linuxtv-dvb-apps.install b/community/linuxtv-dvb-apps/linuxtv-dvb-apps.install deleted file mode 100644 index a260be22b..000000000 --- a/community/linuxtv-dvb-apps/linuxtv-dvb-apps.install +++ /dev/null @@ -1,8 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - echo ">>> Some initial-tuning-data files have been installed under" - echo ">>> /usr/share/dvb-utils/scan/" - echo ">>> you can use them to generate your channel.conf file" -} - diff --git a/community/pidgin-fonomobutton/PKGBUILD b/community/pidgin-fonomobutton/PKGBUILD deleted file mode 100644 index ec1bbda62..000000000 --- a/community/pidgin-fonomobutton/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 5894 2009-11-22 13:10:00Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=pidgin-fonomobutton -pkgver=0.1.6 -pkgrel=1 -pkgdesc="Adds a video-chat button to the the conversation window" -arch=('i686' 'x86_64') -url="http://www.fonomo.com/software/pidgin.html" -license=('GPL') -depends=('pidgin') -install=pidgin-fonomobutton.install -source=(ftp://ftp.grokthis.net/pub/fonomo/${pkgname}-${pkgver}.tar.bz2 - pidgin-fonomobutton-0.1.6-const.patch) -md5sums=('020673634143b2e5a3c3ea6e76c4cdce' - '33c266437cd6f707e8f02eda3b485406') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/pidgin-fonomobutton-0.1.6-const.patch || return 1 - make all || return 1 - install -Dm755 fonomobutton.so "${pkgdir}/usr/lib/pidgin/fonomobutton.so" - install -Dm644 camera-fonomo.png "${pkgdir}/usr/share/icons/hicolor/22x22/devices/camera-fonomo.png" -} diff --git a/community/pidgin-fonomobutton/pidgin-fonomobutton-0.1.6-const.patch b/community/pidgin-fonomobutton/pidgin-fonomobutton-0.1.6-const.patch deleted file mode 100644 index e57648840..000000000 --- a/community/pidgin-fonomobutton/pidgin-fonomobutton-0.1.6-const.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/fonomobutton.c 2008-10-20 01:06:40.000000000 -0700 -+++ b/fonomobutton.c 2009-11-22 10:40:48.000000000 -0800 -@@ -88,7 +88,7 @@ - { - GtkWidget *button, *image, *sep; - GtkIconInfo *icoinfo; -- gchar *iconames[]={"camera-web", "camera-fonomo"}; -+ const gchar *iconames[]={"camera-web", "camera-fonomo"}; - - button = gtk_button_new(); - gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); diff --git a/community/pidgin-fonomobutton/pidgin-fonomobutton.install b/community/pidgin-fonomobutton/pidgin-fonomobutton.install deleted file mode 100644 index 21b79d2d4..000000000 --- a/community/pidgin-fonomobutton/pidgin-fonomobutton.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community/qemu-launcher/PKGBUILD b/community/qemu-launcher/PKGBUILD deleted file mode 100644 index 26f64a630..000000000 --- a/community/qemu-launcher/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: cs-cam <me@camdaniel.com> - -pkgname=qemu-launcher -pkgver=1.7.4 -pkgrel=2 -pkgdesc="GNOME/Gtk front-end for the Qemu x86 PC emulator" -url="http://gna.org/projects/qemulaunch" -license=('GPL') -arch=('i686' 'x86_64') -source=(http://download.gna.org/qemulaunch/1.7.x/${pkgname}_$pkgver.tar.gz) -depends=('qemu' 'gtk2-perl' 'glade-perl' 'perl-locale-gettext' 'xdg-utils') -makedepends=('libxml2') -install=qemu-launcher.install -md5sums=('bd71fd543bd2723c7ea54de81f7ccabf') - -build() { - cd $startdir/src/$pkgname-$pkgver - make PREFIX=/usr DESTDIR=$startdir/pkg install - ln -s qemu-launcher-32x32.xpm $startdir/pkg/usr/share/pixmaps/qemu-launcher.xpm -} diff --git a/community/qemu-launcher/qemu-launcher.install b/community/qemu-launcher/qemu-launcher.install deleted file mode 100644 index c5571196e..000000000 --- a/community/qemu-launcher/qemu-launcher.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_upgrade() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} diff --git a/community/unetbootin/PKGBUILD b/community/unetbootin/PKGBUILD deleted file mode 100644 index 8f10db3a5..000000000 --- a/community/unetbootin/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 56275 2011-10-04 15:12:06Z arodseth $ -# Contributor: Det <nimetonmaili at gmail a-dot com> -# Contributor: Godane aka Christopher Rogers <slaxemulator@gmail.com> -pkgname=unetbootin -pkgver=555 -pkgrel=1 -pkgdesc="Lets you create bootable Live USB drives" -url="http://unetbootin.sourceforge.net/" -license=('GPL') -arch=('x86_64' 'i686') -depends=('syslinux' 'p7zip' 'qt' 'mtools') -optdepends=('gksu: for graphically requesting the root password' - 'kdebase-runtime: for graphically requesting the root password') -install=${pkgname}.install -source=(http://downloads.sourceforge.net/project/${pkgname}/UNetbootin/${pkgver}/${pkgname}-source-${pkgver}.tar.gz) -sha1sums=('52adee7c2bf05834d59231e6a06ff8522203f4de') - -build() { - lupdate ${pkgname}.pro - lrelease ${pkgname}.pro - qmake - make -} - -package() { - install -Dm755 ${pkgname} "${pkgdir}/usr/bin/${pkgname}" - mkdir -p "${pkgdir}/usr/share/${pkgname}" - install -m644 ${pkgname}_*.qm "${pkgdir}/usr/share/${pkgname}/" - install -Dm644 ${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop" - for i in 16x16 22x22 24x24 32x32 48x48 256x256; do - install -D ${pkgname}_${i/x*/}.png "${pkgdir}/usr/share/icons/hicolor/${i}/apps/${pkgname}.png" - done -} diff --git a/community/unetbootin/unetbootin.install b/community/unetbootin/unetbootin.install deleted file mode 100644 index a09dc920d..000000000 --- a/community/unetbootin/unetbootin.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/core/isdn4k-utils/PKGBUILD b/core/isdn4k-utils/PKGBUILD deleted file mode 100644 index 4bb291d7f..000000000 --- a/core/isdn4k-utils/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 142790 2011-11-15 08:59:08Z tpowa $ -# Contributor: Dennis "Gyroplast" Herbrich <dennis@archlinux.org> -# Maintainer: dorphell <dorphell@archlinux.org> - -pkgname=isdn4k-utils -pkgver=3.2p1 -pkgrel=7 -pkgdesc="User space administration programs and tools for ISDN" -arch=('i686' 'x86_64') -url="http://www.isdn4linux.de/" -license=('GPL') -depends=('ncurses') -backup=(etc/isdn/{callerid.conf,isdn.conf,rate.conf,isdnlog.isdnctrl0.options}) -options=('!makeflags') -source=(ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/${pkgname}.v${pkgver}.tar.bz2 - isdn4k-utils-3.2p1-build.patch - config) -md5sums=('d347afa462e46eccfd1284aebae227b6' - '7f056ddac093c77d8be4e076d0e9421c' - '3429894039f33c114fef5ef9f866920e') - -build() { - cd $srcdir/$pkgname - patch -Np1 -i $srcdir/isdn4k-utils-3.2p1-build.patch - cp $srcdir/config ./.config - make subconfig - make -} - -package() { - cd $srcdir/$pkgname - install -dm755 $pkgdir/sbin - make DESTDIR=$pkgdir install -} diff --git a/core/isdn4k-utils/config b/core/isdn4k-utils/config deleted file mode 100644 index fe0810209..000000000 --- a/core/isdn4k-utils/config +++ /dev/null @@ -1,100 +0,0 @@ -# -# Automatically generated by make menuconfig: don't edit -# - -# -# Code maturity level options -# -# CONFIG_EXPERIMENTAL is not set - -# -# General configuration -# -# CONFIG_BUILDX11 is not set -CONFIG_KERNELDIR='/usr/src/linux' -CONFIG_BINDIR='/usr/bin' -CONFIG_SBINDIR='/sbin' -CONFIG_MANDIR='/usr/share/man' -CONFIG_RUNDIR='/var/run' -CONFIG_LOCKDIR='/var/lock' -CONFIG_LOCKFILE='LCK..' -CONFIG_I4LCONFDIR='/etc/isdn' -CONFIG_CONFFILE='isdn.conf' -CONFIG_CALLERIDFILE='callerid.conf' -CONFIG_USERCONFFILE='~/.isdn' -CONFIG_COUNTRYCODE='49' -CONFIG_AREACODE='' -CONFIG_COUNTRY_PREFIX='+' -CONFIG_AREA_PREFIX='0' -CONFIG_DATADIR='/usr/lib/isdn' - -# -# Runtime configuration tools -# -CONFIG_ISDNCTRL=y -CONFIG_ISDNCTRL_CONF=y -# CONFIG_ISDNCTRL_TIMRU is not set -# CONFIG_IPROFD is not set -# CONFIG_DIVERTCTRL is not set - -# -# Card configuration tools -# -CONFIG_HISAXCTRL=y -CONFIG_ICNCTRL=y -# CONFIG_ICNCTRL_DEBUG is not set -CONFIG_PCBITCTL=y -# CONFIG_AVMCAPICTRL is not set -# CONFIG_EICONCTRL is not set - -# -# Tools for monitoring activity -# -CONFIG_IMON=y -CONFIG_IMONTTY=y -CONFIG_ISDNLOG=y - -# -# Options for isdnlog package -# -CONFIG_ISDNLOG_SERV_PORT=20011 -CONFIG_ISDNLOG_USERFILE='isdnlog.users' -CONFIG_ISDNLOG_CHARGEFILE='charge.dat' -CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log' -CONFIG_ISDNLOG_RELOADCMD='reload' -CONFIG_ISDNLOG_STOPCMD='stop' -CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot' -CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog' -CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf' -# CONFIG_ISDNLOG_POSTGRES is not set -# CONFIG_ISDNLOG_MYSQLDB is not set -# CONFIG_ISDNLOG_ORACLE is not set -CONFIG_ISDN_LOG_DE=y -CONFIG_ISDN_LOG_CC_DE=y -CONFIG_ISDN_LOG_DEST_DE=y -CONFIG_ISDN_LOG_DEST_AT=y -CONFIG_ISDN_LOG_DEST_NL=y -CONFIG_ISDN_LOG_DEST_CH=y -CONFIG_IPPPSTATS=y -# CONFIG_XISDNLOAD is not set -# CONFIG_XMONISDN is not set - -# -# Applications -# -# CONFIG_VBOX is not set -CONFIG_IPPPD=y - -# -# Options for ipppd -# -# CONFIG_IPPPD_MSCHAP is not set -# CONFIG_IPPPD_RADIUS is not set -# CONFIG_RADIUS_WTMP_LOGGING is not set -RADIUS_CLIENT_CONFIG_FILE='' - -# -# Documentation -# -CONFIG_GENMAN=y -# CONFIG_FAQ is not set diff --git a/core/isdn4k-utils/isdn4k-utils-3.2p1-build.patch b/core/isdn4k-utils/isdn4k-utils-3.2p1-build.patch deleted file mode 100644 index 63239fcad..000000000 --- a/core/isdn4k-utils/isdn4k-utils-3.2p1-build.patch +++ /dev/null @@ -1,2028 +0,0 @@ -diff -Naur isdn4k-utils-orig//eicon/eiconctrl.c isdn4k-utils/eicon/eiconctrl.c ---- isdn4k-utils-orig//eicon/eiconctrl.c 2001-06-22 02:34:45.000000000 +1000 -+++ isdn4k-utils/eicon/eiconctrl.c 2010-12-04 20:44:11.093338893 +1000 -@@ -1970,7 +1970,7 @@ - val = strtol(p, &q, 16); - p = q; - val = strtol(p, &q, 16); -- (unsigned short) *buffer = (unsigned short) val; -+ *buffer = (unsigned short) val; - pos = 2; - while ((p != q) && (*q != 0)) { - p = q; -diff -Naur isdn4k-utils-orig//hisax/hisaxctrl.c isdn4k-utils/hisax/hisaxctrl.c ---- isdn4k-utils-orig//hisax/hisaxctrl.c 2000-06-30 19:37:38.000000000 +1000 -+++ isdn4k-utils/hisax/hisaxctrl.c 2010-12-04 20:44:11.093338893 +1000 -@@ -43,7 +43,8 @@ - fprintf(stderr, "cannot open file %s\n", fname); - exit(-1); - } -- p = (int *) buffer = (unsigned char *) malloc(MAX_SIZE+4); -+ buffer = (unsigned char *) malloc(MAX_SIZE+4); -+ p = (int *) buffer; - if (!buffer) { - fprintf(stderr, "cannot get %d byte memory\n", MAX_SIZE+4); - exit(-1); -diff -Naur isdn4k-utils-orig//hisax/Makefile.in isdn4k-utils/hisax/Makefile.in ---- isdn4k-utils-orig//hisax/Makefile.in 2002-07-20 05:03:51.000000000 +1000 -+++ isdn4k-utils/hisax/Makefile.in 2010-12-04 20:44:03.726672225 +1000 -@@ -30,7 +30,7 @@ - #.SUFFIXES: - #.SUFFIXES: .c .o - --%.8: %.man -+%.8: %.man.in - cp $< $@ - - all: $(PROGRAMS) $(MANPAGES) -diff -Naur isdn4k-utils-orig//ipppd/main.c isdn4k-utils/ipppd/main.c ---- isdn4k-utils-orig//ipppd/main.c 2002-07-18 10:06:21.000000000 +1000 -+++ isdn4k-utils/ipppd/main.c 2010-12-04 20:44:11.093338893 +1000 -@@ -1041,9 +1041,14 @@ - static char line[256]; /* line to be logged accumulated here */ - static char *linep; - -+#ifdef __STDC__ -+static void pr_log(void *arg, char *fmt, ...); -+#else /* __STDC__ */ -+static void pr_log(arg, fmt, va_alist); -+#endif -+ - void log_packet(u_char *p,int len,char *prefix,int linkunit) - { -- static void pr_log __P((void *, char *, ...)); - - int i, n; - u_short proto; -diff -Naur isdn4k-utils-orig//ipppd/options.c isdn4k-utils/ipppd/options.c ---- isdn4k-utils-orig//ipppd/options.c 2002-07-06 10:34:08.000000000 +1000 -+++ isdn4k-utils/ipppd/options.c 2010-12-04 20:43:57.890005560 +1000 -@@ -479,26 +479,24 @@ - #define IMPLEMENTATION "" - #endif - --static char *usage_string = "\ --ipppd version %s patch level %d%s\n\ --Usage: %s [ options ], where options are:\n\ --\t<device> Communicate over the named device\n\ -+static char *usage_string = "ipppd version %s patch level %d%s\n" -+"Usage: %s [ options ], where options are:\n" -+"\t<device> Communicate over the named device\n" - #ifdef INCLUDE_OBSOLETE_FEATURES --\tcrtscts Use hardware RTS/CTS flow control\n\ --\t<speed> Set the baud rate to <speed>\n\ --\tmodem Use modem control lines\n\ -+"\tcrtscts Use hardware RTS/CTS flow control\n" -+"\t<speed> Set the baud rate to <speed>\n" -+"\tmodem Use modem control lines\n" - #endif --\t<loc>:<rem> Set the local and/or remote interface IP\n\ --\t\taddresses. (you also may use the option 'useifip' to get IPs).\n\ --\tasyncmap <n> Set the desired async map to hex <n>\n\ --\tauth Require authentication from peer\n\ --\tconnect <p> Invoke shell command <p> to set up the serial line\n\ --\tdefaultroute Add default route through interface\n\ --\tfile <f> Take options from file <f>\n\ --\tmru <n> Set MRU value to <n> for negotiation\n\ --\tnetmask <n> Set interface netmask to <n>\n\ --See ipppd(8) for more options.\n\ --"; -+"\t<loc>:<rem> Set the local and/or remote interface IP\n" -+"\t\t\taddresses. (you also may use the option 'useifip' to get IPs).\n" -+"\tasyncmap <n> Set the desired async map to hex <n>\n" -+"\tauth Require authentication from peer\n" -+"\tconnect <p> Invoke shell command <p> to set up the serial line\n" -+"\tdefaultroute Add default route through interface\n" -+"\tfile <f> Take options from file <f>\n" -+"\tmru <n> Set MRU value to <n> for negotiation\n" -+"\tnetmask <n> Set interface netmask to <n>\n" -+"See ipppd(8) for more options.\n"; - - static char *current_option; /* the name of the option being parsed */ - -diff -Naur isdn4k-utils-orig//isdnlog/isdnlog/isdnlog.h isdn4k-utils/isdnlog/isdnlog/isdnlog.h ---- isdn4k-utils-orig//isdnlog/isdnlog/isdnlog.h 2001-06-22 02:34:56.000000000 +1000 -+++ isdn4k-utils/isdnlog/isdnlog/isdnlog.h 2010-12-04 20:44:03.780005559 +1000 -@@ -460,7 +460,7 @@ - - _EXTERN void dotrace(void); - _EXTERN int morectrl(int card); --_EXTERN void moreinfo(void); -+extern void moreinfo(void); - _EXTERN void morekbd(void); - _EXTERN void processcint(void); - _EXTERN void processflow(void); -diff -Naur isdn4k-utils-orig//isdnlog/isdnlog/processor.c isdn4k-utils/isdnlog/isdnlog/processor.c ---- isdn4k-utils-orig//isdnlog/isdnlog/processor.c 2002-04-02 04:06:10.000000000 +1000 -+++ isdn4k-utils/isdnlog/isdnlog/processor.c 2010-12-04 20:44:03.783338893 +1000 -@@ -5293,7 +5293,7 @@ - tei = BROADCAST; /* Wenn nach einer tei-Zeile keine hex:-Zeile kommt, tei ungueltig machen! */ - - if ((type == SETUP) && !replay) { /* fetch additional info from "/dev/isdninfo" */ -- static void moreinfo(); /* soviel zu Objektorientiertem Denken ;-) */ -+ /*static void moreinfo(); */ /* soviel zu Objektorientiertem Denken ;-) */ - moreinfo(); - } /* if */ - -diff -Naur isdn4k-utils-orig//isdnlog/Makefile.in isdn4k-utils/isdnlog/Makefile.in ---- isdn4k-utils-orig//isdnlog/Makefile.in 2002-07-20 05:03:55.000000000 +1000 -+++ isdn4k-utils/isdnlog/Makefile.in 2010-12-04 20:44:03.730005560 +1000 -@@ -1842,9 +1842,6 @@ - $(INSTALL_DATA) $$f $(DESTDIR)$(DATADIR); \ - echo Installing $(DESTDIR)$(DATADIR)/$$f; \ - done -- @(grep isdnlog $(SERVICEFILE) >/dev/null) || \ -- (echo "";echo "";echo "Add a line to the file $(SERVICEFILE)" ;echo "";echo ""; \ -- echo "isdnlog $(SERV_PORT)/tcp isdnlog" >> $(SERVICEFILE)) - - install-strip: - $(MAKE) INSTALL_BIN='$(INSTALL_BIN) -s' \ -diff -Naur isdn4k-utils-orig//isdnlog/tools/cdb/cdbmake.c isdn4k-utils/isdnlog/tools/cdb/cdbmake.c ---- isdn4k-utils-orig//isdnlog/tools/cdb/cdbmake.c 2002-02-22 21:10:25.000000000 +1000 -+++ isdn4k-utils/isdnlog/tools/cdb/cdbmake.c 2010-12-04 20:44:03.786672226 +1000 -@@ -3,8 +3,6 @@ - #include "freecdbmake.h" - #include <unistd.h> - --extern char *malloc(); -- - void diesys(why) char *why; { perror(why); exit(111); } - - void writeerror() { diesys("cdbmake: fatal: unable to write"); } -diff -Naur isdn4k-utils-orig//isdnlog/tools/isdnrate.c isdn4k-utils/isdnlog/tools/isdnrate.c ---- isdn4k-utils-orig//isdnlog/tools/isdnrate.c 2001-06-22 02:34:56.000000000 +1000 -+++ isdn4k-utils/isdnlog/tools/isdnrate.c 2010-12-04 20:44:11.096672226 +1000 -@@ -304,7 +304,7 @@ - - static void print_header(void); - --static char *myname, *myshortname; -+char *myname, *myshortname; - static char options[] = "ab:d:f:h:l:op:st:v::x:CD::G:HLNP:O:S:TUVX::Z"; - static char usage[] = "%s: usage: %s [ -%s ] Destination ...\n"; - -@@ -313,7 +313,7 @@ - static int usestat = 0; - static int duration = LCR_DURATION; - static time_t start; --static int day, month, year, hour, min, sec; -+int day, month, year, hour, min, sec; - static char ignore[MAXPROVIDER]; - static char *fromarea = 0; - static char wanted_day; -diff -Naur isdn4k-utils-orig//isdnlog/tools/isdnrate.c.orig isdn4k-utils/isdnlog/tools/isdnrate.c.orig ---- isdn4k-utils-orig//isdnlog/tools/isdnrate.c.orig 1970-01-01 10:00:00.000000000 +1000 -+++ isdn4k-utils/isdnlog/tools/isdnrate.c.orig 2001-06-22 02:34:56.000000000 +1000 -@@ -0,0 +1,1806 @@ -+/* $Id: isdnrate.c,v 1.38 2001/03/01 14:59:16 paul Exp $ -+ -+ * ISDN accounting for isdn4linux. (rate evaluation) -+ * -+ * Copyright 1995 .. 2000 by Andreas Kool (akool@isdn4linux.de) -+ * -+ * 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, 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. -+ * -+ * $Log: isdnrate.c,v $ -+ * Revision 1.38 2001/03/01 14:59:16 paul -+ * Various patches to fix errors when using the newest glibc, -+ * replaced use of insecure tempnam() function -+ * and to remove warnings etc. -+ * -+ * Revision 1.37 2000/07/17 16:34:23 akool -+ * isdnlog-4.32 -+ * - added new Prefixes 0160 (D1) and 0162 (D2) to "country-de.dat" -+ * - corrected all german mobil phone numbers (many thank's to -+ * Tobias Becker <i4l-projects@talypso.de> for the tool "fix_rates.pl") -+ * - isdnlog/tools/rate.c ... New R:-tag -+ * - isdnlog/tools/isdnrate.c ... print warnings from getRate if verbose -+ * - isdnlog/tools/rate-files.man ... New R:-tag -+ * - isdnlog/tools/NEWS ... New R:-tag -+ * - isdnlog/README ... New R:-tag -+ * - isdnlog/samples/rtest.dat ... example rate-file for testing R: -+ * -+ * Revision 1.36 2000/03/09 18:50:03 akool -+ * isdnlog-4.16 -+ * - isdnlog/samples/isdn.conf.no ... changed VBN -+ * - isdnlog/isdnlog/isdnlog.c .. ciInterval -+ * - isdnlog/isdnlog/processor.c .. ciInterval -+ * - isdnlog/tools/tools.h .. ciInterval, abclcr conf option -+ * - isdnlog/tools/isdnconf.c .. ciInterval, abclcr conf option -+ * - isdnlog/tools/isdnrate.c .. removed a warning -+ * - isdnlog/NEWS ... updated -+ * - isdnlog/README ... updated -+ * - isdnlog/isdnlog/isdnlog.8.in ... updated -+ * - isdnlog/isdnlog/isdnlog.5.in ... updated -+ * - isdnlog/samples/provider ... NEW -+ * -+ * ==> Please run a make clean, and be sure to read isdnlog/NEWS for changes -+ * ==> and new features. -+ * -+ * Revision 1.35 2000/03/06 07:03:21 akool -+ * isdnlog-4.15 -+ * - isdnlog/tools/tools.h ... moved one_call, sum_calls to isdnrep.h -+ * ==> DO A 'make clean' PLEASE -+ * - isdnlog/tools/telnum.c ... fixed a small typo -+ * - isdnlog/isdnrep/rep_main.c ... incl. dest.h -+ * - isdnlog/isdnrep/isdnrep.c ... fixed %l, %L -+ * - isdnlog/isdnrep/isdnrep.h ... struct one_call, sum_calls are now here -+ * -+ * Support for Norway added. Many thanks to Tore Ferner <torfer@pvv.org> -+ * - isdnlog/rate-no.dat ... NEW -+ * - isdnlog/holiday-no.dat ... NEW -+ * - isdnlog/samples/isdn.conf.no ... NEW -+ * - isdnlog/samples/rate.conf.no ... NEW -+ * -+ * Revision 1.34 2000/02/28 19:53:56 akool -+ * isdnlog-4.14 -+ * - Patch from Roland Rosenfeld <roland@spinnaker.de> fix for isdnrep -+ * - isdnlog/tools/rate.c ... epnum -+ * - isdnlog/tools/rate-at.c ... new rates -+ * - isdnlog/rate-at.dat -+ * - isdnlog/tools/rate-files.man ... %.3f -+ * - doc/Configure.help ... unknown cc -+ * - isdnlog/configure.in ... unknown cc -+ * - isdnlog/.Config.in ... unknown cc -+ * - isdnlog/Makefile.in ... unknown cc -+ * - isdnlog/tools/dest/Makefile.in ... LANG => DEST_LANG -+ * - isdnlog/samples/rate.conf.pl ... NEW -+ * - isdnlog/samples/isdn.conf.pl ... NEW -+ * - isdnlog/rate-pl.dat ... NEW -+ * - isdnlog/tools/isdnrate.c ... fixed -P pid_dir, restarts on HUP now -+ * - isdnlog/tools/isdnrate.man ... SIGHUP documented -+ * -+ * Revision 1.33 2000/02/12 16:40:24 akool -+ * isdnlog-4.11 -+ * - isdnlog/Makefile.in ... sep install-targets, installs samples, no isdnconf -+ * - isdnlog/samples/rate.conf.{lu,nl} ... NEW -+ * - isdnlog/samples/isdn.conf.lu ... chg provider -+ * - isdnlog/samples/stop ... chg \d,\d => \d.\d -+ * - isdnlog/samples/isdnlog.isdnctrl0.options ... NEW -+ * - isdnlog/samples/isdnlog.users ... NEW -+ * - isdnlog/country-de.dat ... _DEMF again -+ * - isdnlog/isdnlog/processor.c ... LCR -+ * - isdnlog/tools/isdnrate.c ... fmt of s -+ * -+ * Old config is not installed anymore, to acomplish this do -+ * -+ * make install-old-conf -+ * make install -+ * -+ * A running isdnlog is now HUP-ed not KILL-ed -+ * -+ * Revision 1.32 2000/02/03 18:24:51 akool -+ * isdnlog-4.08 -+ * isdnlog/tools/rate.c ... LCR patch again -+ * isdnlog/tools/isdnrate.c ... LCR patch again -+ * isdnbill enhanced/fixed -+ * DTAG AktivPlus fixed -+ * -+ * Revision 1.31 1999/12/31 13:57:20 akool -+ * isdnlog-4.00 (Millenium-Edition) -+ * - Oracle support added by Jan Bolt (Jan.Bolt@t-online.de) -+ * - resolved *any* warnings against rate-de.dat -+ * - Many new rates -+ * - CREDITS file added -+ * -+ * Revision 1.30 1999/12/24 14:17:05 akool -+ * isdnlog-3.81 -+ * - isdnlog/tools/NEWS -+ * - isdnlog/tools/telrate/info.html.in ... bugfix -+ * - isdnlog/tools/telrate/telrate.cgi.in ... new Service query -+ * - isdnlog/tools/telrate/Makefile.in ... moved tmp below telrate -+ * - isdnlog/samples/rate.conf.at ... fixed -+ * - isdnlog/tools/rate-at.c ... some changes -+ * - isdnlog/rate-at.dat ... ditto -+ * - isdnlog/tools/Makefile ... added path to pp_rate -+ * - isdnlog/tools/rate.{c,h} ... getServiceNames, Date-Range in T:-Tag -+ * - isdnlog/tools/isdnrate.c ... fixed sorting of services, -X52 rets service names -+ * - isdnlog/tools/rate-files.man ... Date-Range in T:-Tag, moved from doc -+ * - isdnlog/tools/isdnrate.man ... moved from doc -+ * - doc/Makefile.in ... moved man's from doc to tools -+ * - isdnlog/Makefile.in ... man's, install isdn.conf.5 -+ * - isdnlog/configure{,.in} ... sed, awk for man's -+ * - isdnlog/tools/zone/Makefile.in ... dataclean -+ * - isdnlog/tools/dest/Makefile.in ... dataclean -+ * - isdnlog/isdnlog/isdnlog.8.in ... upd -+ * - isdnlog/isdnlog/isdn.conf.5.in ... upd -+ * -+ * Revision 1.29 1999/12/17 22:51:55 akool -+ * isdnlog-3.79 -+ * - isdnlog/isdnrep/isdnrep.{c,h} ... error -handling, print_msg -+ * - isdnlog/isdnrep/rep_main.c -+ * - isdnlog/isdnrep/isdnrep.1.in -+ * - isdnlog/tools/rate.c ... dupl entry in rate.conf -+ * - isdnlog/tools/NEWS -+ * - isdnlog/tools/isdnrate.c -+ * - isdnlog/tools/dest/configure{,.in} -+ * - isdnlog/tools/zone/configure{,.in} -+ * -+ * Revision 1.28 1999/12/16 23:08:28 akool -+ * isdnlog-3.78 -+ * - isdnlog/tools/isdnrate.c ... new sOcket option -+ * - isdnlog/tools/NEWS ... new sOcket option -+ * - doc/isdnrate.man ... ditto -+ * - isdnlog/tools/telrate/config.in ... ditto -+ * - isdnlog/tools/telrate/telrate.cgi.in ... ditto -+ * - isdnlog/tools/telrate/README-telrate ditto -+ * -+ * Revision 1.27 1999/12/02 19:28:02 akool -+ * isdnlog-3.73 -+ * - isdnlog/tools/telrate/telrate.cgi.in faster -+ * - doc/isdnrate.man ... -P -+ * - isdnlog/tools/isdnrate.c ... -P -+ * - isdnlog/tools/NEWS ... -P -+ * - isdnlog/tools/rate-at.c ... 194040 -+ * - isdnlog/rate-at.dat -+ * - isdnlog/tools/rate.c ... SIGSEGV -+ * -+ * Revision 1.26 1999/12/01 21:47:25 akool -+ * isdnlog-3.72 -+ * - new rates for 01051 -+ * - next version of isdnbill -+ * -+ * - isdnlog/tools/telnum.c ... cleanup -+ * - isdnlog/tools/isdnrate.c ... -s Service -+ * - isdnlog/tools/rate.{c,h} ... -s -+ * - isdnlog/tools/NEWS ... -s -+ * - doc/isdnrate.man .. updated -o, -s -+ * - doc/rate-files.man ... updated -+ * - isdnlog/tools/dest/README.makedest ... updt. -+ * - isdnlog/isdnlog/isdnlog.8.in .. updt. -+ * -+ * Telrate -+ * - isdnlog/tools/telrate/README-telrate -+ * - isdnlog/tools/telrate/config.in NEW -+ * - isdnlog/tools/telrate/configure NEW -+ * - isdnlog/tools/telrate/Makefile.in NEW -+ * - isdnlog/tools/telrate/index.html.in was index.html -+ * - isdnlog/tools/telrate/info.html.in was info.html -+ * - isdnlog/tools/telrate/telrate.cgi.in was telrate.cgi -+ * - isdnlog/tools/telrate/leo.sample NEW sample config -+ * - isdnlog/tools/telrate/alex.sample NEW sample config -+ * -+ * Revision 1.25 1999/11/08 21:09:41 akool -+ * isdnlog-3.65 -+ * - added "B:" Tag to "rate-xx.dat" -+ * -+ * Revision 1.24 1999/11/07 13:29:28 akool -+ * isdnlog-3.64 -+ * - new "Sonderrufnummern" handling -+ * -+ * Revision 1.22 1999/10/26 18:17:14 akool -+ * isdnlog-3.62 -+ * - many new rates -+ * - next try to fix "Sonderrufnummern" -+ * -+ * isdnlog-3.58 -+ * - big cleanup ( > 1.3 Mb removed!) -+ * - v0.02 of destination support - better, but not perfect -+ * (does't work with gcc-2.7.2.3 yet - use egcs!) -+ * -+ * Revision 1.21 1999/10/25 18:30:03 akool -+ * isdnlog-3.57 -+ * WARNING: Experimental version! -+ * Please use isdnlog-3.56 for production systems! -+ * -+ * Revision 1.20 1999/09/19 14:16:27 akool -+ * isdnlog-3.53 -+ * -+ * Revision 1.19 1999/09/16 20:27:21 akool -+ * isdnlog-3.52 -+ * -+ * Revision 1.18 1999/09/13 09:09:44 akool -+ * isdnlog-3.51 -+ * - changed getProvider() to not return NULL on unknown providers -+ * many thanks to Matthias Eder <mateder@netway.at> -+ * - corrected zone-processing when doing a internal -> world call -+ * -+ * Revision 1.17 1999/09/09 11:21:05 akool -+ * isdnlog-3.49 -+ * -+ * Revision 1.16 1999/08/04 23:06:52 akool -+ * Better codeall for .at -+ * -+ * Revision 1.15 1999/07/31 09:25:36 akool -+ * getRate() speedup -+ * -+ * Revision 1.14 1999/07/26 16:28:41 akool -+ * getRate() speedup from Leo -+ * -+ * Revision 1.13 1999/07/25 15:57:46 akool -+ * isdnlog-3.43 -+ * added "telnum" module -+ * -+ * Revision 1.12 1999/07/24 08:45:17 akool -+ * isdnlog-3.42 -+ * rate-de.dat 1.02-Germany [18-Jul-1999 10:44:21] -+ * better Support for Ackermann Euracom -+ * WEB-Interface for isdnrate -+ * many small fixes -+ * -+ * Revision 1.11 1999/07/15 16:42:04 akool -+ * small enhancement's and fixes -+ * -+ * Revision 1.10 1999/07/07 19:44:07 akool -+ * patches from Michael and Leo -+ * -+ * Revision 1.9 1999/07/04 20:47:05 akool -+ * rate-de.dat V:1.02-Germany [04-Jul-1999 22:56:37] -+ * -+ * Revision 1.8 1999/07/03 10:24:14 akool -+ * fixed Makefile -+ * -+ * Revision 1.7 1999/07/02 19:18:00 akool -+ * rate-de.dat V:1.02-Germany [02-Jul-1999 21:27:20] -+ * -+ * Revision 1.6 1999/07/02 18:20:50 akool -+ * rate-de.dat V:1.02-Germany [02-Jul-1999 20:29:21] -+ * country-de.dat V:1.02-Germany [02-Jul-1999 19:13:54] -+ * -+ * Revision 1.5 1999/07/01 20:40:07 akool -+ * isdnrate optimized -+ * -+ * Revision 1.4 1999/06/30 20:53:28 akool -+ * added "-t" option to "isdnrate" -+ * -+ * Revision 1.3 1999/06/30 17:17:37 akool -+ * isdnlog Version 3.39 -+ * -+ * Revision 1.2 1999/06/29 20:11:25 akool -+ * now compiles with ndbm -+ * (many thanks to Nima <nima_ghasseminejad@public.uni-hamburg.de>) -+ * -+ * Revision 1.1 1999/06/28 19:16:33 akool -+ * isdnlog Version 3.38 -+ * - new utility "isdnrate" started -+ * -+ */ -+ -+#include "isdnlog.h" -+#include "tools/zone.h" -+#include <unistd.h> -+#include "dest.h" -+ -+#define WIDTH 19 -+#define _MAXLAST 20 /* the real max */ -+#define MAXLAST ((best>=_MAXLAST||best<=2)?5:best) -+ -+ -+static void print_header(void); -+ -+static char *myname, *myshortname; -+static char options[] = "ab:d:f:h:l:op:st:v::x:CD::G:HLNP:O:S:TUVX::Z"; -+static char usage[] = "%s: usage: %s [ -%s ] Destination ...\n"; -+ -+static int header = 0, best = MAXPROVIDER, table = 0, explain = 0; -+int verbose = 0; -+static int usestat = 0; -+static int duration = LCR_DURATION; -+static time_t start; -+static int day, month, year, hour, min, sec; -+static char ignore[MAXPROVIDER]; -+static char *fromarea = 0; -+static char wanted_day; -+static int list = 0; -+static char *comment; -+static char **providers = 0; /* incl these */ -+static int n_providers = 0; -+static int business = 0; -+static char **xproviders = 0; /* excl these */ -+static int nx_providers = 0; -+static int xbusiness = 0; -+static int all = 0; -+static int booked = 0; -+static int service = 0; -+ -+#define SOCKNAME "/tmp/isdnrate" -+static int is_daemon = 0; -+static int is_client = 0; -+static int we_are_daemon = 0; -+static int takt = 99999; -+static char sortby; -+static int need_dest; -+static int h_param = 0; -+static int lcr = 0; -+static TELNUM srcnum, destnum; -+static char *pid_dir = 0; -+static char *pid_file = 0; -+static char *socket_file = 0; -+static char **hup_argv; /* args to restart with */ -+ -+typedef struct { -+ int prefix; -+ double rate; -+ char *name; -+ char *explain; -+} SORT; -+ -+typedef struct { -+ int weight; -+ int index; -+} SORT2; -+ -+static SORT sort[MAXPROVIDER]; -+ -+#undef MAXPROVIDER -+#define MAXPROVIDER getNProvider() -+ -+#undef BUFSIZ /* sorry but 8192 is too much for me */ -+#define BUFSIZ 256 -+ -+int print_msg(int Level, const char *fmt,...) -+{ -+ auto va_list ap; -+ auto char String[BUFSIZ * 3]; -+ -+ if ((Level > PRT_ERR && !verbose) || (Level > PRT_WARN && verbose < 2)) -+ return (1); -+ -+ va_start(ap, fmt); -+ (void) vsnprintf(String, BUFSIZ * 3, fmt, ap); -+ va_end(ap); -+ -+ fprintf(stderr, "%s", String); -+ -+ return (0); -+} /* print_msg */ -+ -+ -+static void init() -+{ -+ auto char *version, **message; -+ -+ if (readconfig(myshortname) < 0) -+ exit(1); -+ -+ if (verbose) -+ message = &version; -+ else -+ message = NULL; -+ -+ initHoliday(holifile, message); -+ -+ if (verbose && *version) -+ print_msg(PRT_V, "%s\n", version); -+ initDest(destfile, message); -+ if (verbose && *version) -+ print_msg(PRT_V, "%s\n", version); -+ -+ initRate(rateconf, ratefile, zonefile, message); -+ -+ if (verbose && *version) -+ print_msg(PRT_V, "%s\n", version); -+ -+} /* init */ -+ -+#if 0 -+static void deinit(void) -+{ -+ exitRate(); -+ exitDest(); -+ exitHoliday(); -+} -+#endif -+ -+/* calc a day/time W | E | H */ -+static void get_day(char d) -+{ -+ struct tm *tm; -+ bitfield mask; -+ int what = 0; -+ -+ tm = localtime(&start); /* now */ -+ switch (d) { -+ case 'W': /* we need a normal weekday, so we take -+ today and inc. day if today is -+ holiday */ -+ what = WORKDAY; -+ if (!h_param) -+ hour = 10; -+ break; -+ case 'N': -+ what = WORKDAY; -+ if (!h_param) -+ hour = 23; -+ break; -+ case 'E': -+ what = SUNDAY; -+ if (!h_param) -+ hour = 10; -+ break; -+ } -+ mask = 1 << what; -+ while (isDay(tm, mask, 0) != what) { -+ tm->tm_mday++; -+ } -+ min = sec = 0; -+ day = tm->tm_mday; -+ month = tm->tm_mon + 1; -+ year = tm->tm_year + 1900; -+} -+ -+static void post_init() -+{ -+ -+ clearNum(&srcnum); -+ if (fromarea) { -+ Strncpy(srcnum.area, fromarea, TN_MAX_AREA_LEN); -+ free(fromarea); -+ fromarea = 0; -+ } -+ initNum(&srcnum); -+ -+ if (wanted_day) -+ get_day(wanted_day); -+} /* post_init */ -+ -+static int opts(int argc, char *argv[]) -+{ -+ register int c; -+ register char *p; -+ int x; -+ -+ h_param = 0; -+ -+ optind = 0; /* make it repeatable */ -+ need_dest = 1; -+ while ((c = getopt(argc, argv, options)) != EOF) { -+ switch (c) { -+ case 'a': /* all rates old/newer */ -+ all++; -+ break; -+ case 'b': -+ best = strtol(optarg, NIL, 0); -+ break; -+ -+/* case 'c': country */ -+ break; -+ -+ case 'd': -+ for (p = optarg; *p && isspace(*p); p++) ; -+ if (isdigit(*p)) { -+ wanted_day = '\0'; -+ day = atoi(optarg); -+ if ((p = strchr(optarg, '.'))) { -+ month = atoi(p + 1); -+ if ((p = strchr(p + 1, '.'))) { -+ year = atoi(p + 1); -+ if (year < 50) -+ year += 2000; -+ else if (year < 100) -+ year += 1900; -+ } -+ } -+ } /* isdigit */ -+ else { -+ wanted_day = *p; -+ } -+ break; -+ -+ case 'f': -+ if (optarg) { /* from */ -+ for (p = optarg; (isspace(*p) || *p == '0') && *p; p++) ; -+ fromarea = strdup(p); -+ } -+ break; -+ -+ case 'h': -+ hour = atoi(optarg); -+ h_param++; -+ sec = 0; -+ if ((p = strchr(optarg + 1, ':'))) { -+ min = atoi(p + 1); -+ if ((p = strchr(p + 1, ':'))) -+ sec = atoi(p + 1); -+ } -+ else -+ min = 0; -+ break; -+ -+ case 'l': -+ duration = strtol(optarg, NIL, 0); /* l wie lt */ -+ break; -+ -+ case 'o': /* booked only */ -+ booked++; -+ break; -+ -+ case 's': /* service */ -+ service++; -+ break; -+ -+ case 't': -+ x = strtol(optarg, NIL, 0); -+ if (x > 0) -+ takt = x; -+ break; -+ -+ case 'x': /* eXclude Poviders */ -+ { -+ char *arg = strdup(optarg); -+ -+ p = strtok(arg, ","); -+ while (p) { -+ if (*p == 'B') { /* Business Provider */ -+ xbusiness = 1; -+ p = strtok(0, ","); -+ continue; -+ } -+ xproviders = realloc(xproviders, (nx_providers + 1) * sizeof(char *)); -+ -+ xproviders[nx_providers] = strdup(p); -+ p = strtok(0, ","); -+ nx_providers++; -+ } -+ free(arg); -+ } -+ break; -+ -+ case 'p': /* Providers ... */ -+ { -+ char *arg = strdup(optarg); -+ -+ p = strtok(arg, ","); -+ while (p) { -+ if (*p == 'B') { /* Business Provider */ -+ business = 1; -+ p = strtok(0, ","); -+ continue; -+ } -+ providers = realloc(providers, (n_providers + 1) * sizeof(char *)); -+ -+ providers[n_providers] = strdup(p); -+ p = strtok(0, ","); -+ n_providers++; -+ } -+ free(arg); -+ } -+ break; -+ -+ case 'v': -+ verbose++; -+ if (optarg && (x = atoi(optarg))) -+ verbose = x; -+ break; -+/* Uppercase options are for output format */ -+ -+ case 'C': -+ is_client = 1; -+ break; -+ -+ case 'D': -+ is_daemon = 1; -+ need_dest = 0; -+ if (optarg) { -+ x = atoi(optarg); -+ is_daemon = x; -+ if (we_are_daemon && x == 3) { -+ kill(getppid(), SIGTERM); -+ exit(EXIT_SUCCESS); -+ } -+ } -+ break; -+ -+ case 'G': -+ explain = atoi(optarg); -+ break; -+ case 'H': -+ header++; -+ break; -+ case 'L': -+ list++; -+ explain = 9; -+ break; -+ case 'N': -+ explain = 55; -+ break; -+ case 'P': -+ pid_dir = strdup(optarg); -+ break; -+ case 'O': -+ free(socket_file); -+ socket_file = strdup(optarg); -+ break; -+ case 'S': -+ sortby = *optarg; -+ break; -+ case 'T': -+ table++; -+ break; -+/* Fixme: check/warn illegal kombinations of options */ -+ case 'U': -+ usestat++; -+ break; -+ -+ case 'V': -+ print_version(myshortname); -+ exit(0); -+ -+ case 'X': -+ if (explain == 0) { -+ explain++; -+ if (optarg && isdigit(*optarg) && (x = atoi(optarg))) { -+ explain = x; -+ if (x == 50 || x == 51 || x == 52) -+ need_dest = 0; -+ } -+ else if (optarg) { -+ comment = strdup(optarg); -+ explain = 8; -+ need_dest = 0; -+ } -+ break; -+ } -+ /* fallthrough */ -+ case '?': -+ print_msg(PRT_A, usage, myshortname, myshortname, options); -+ break; -+ -+ case 'Z': -+ lcr++; -+ break; -+ } /* switch */ -+ } /* while */ -+ if (is_client && is_daemon != 3 && is_daemon) { -+ is_daemon = 0; -+ print_msg(PRT_V, "Conflicting options, -D disabled\n"); -+ } -+ if (list && table) { -+ table = 0; -+ print_msg(PRT_V, "Conflicting options, -T disabled\n"); -+ } -+ if (usestat && !table) -+ print_msg(PRT_V, "Conflicting options, -U ignored\n"); -+ if ((list || table) && explain >= 10) { -+ list = table = 0; -+ print_msg(PRT_V, "Conflicting options, -T, -L disabled\n"); -+ } -+ if (best < 1) { -+ best = MAXPROVIDER; -+ print_msg(PRT_V, "Illegal options, -b ignored\n"); -+ } -+ if ((explain == 50 || explain == 51 || explain == 52) && header) { -+ print_msg(PRT_V, "Conflicting options, -H ignored\n"); -+ } -+ if (explain >= 10 && service) { -+ print_msg(PRT_V, "Conflicting options, -s ignored\n"); -+ service = 0; -+ } -+ if (argc > optind) -+ return (optind); -+ else -+ return (0); -+} /* opts */ -+ -+ -+static int (*compare_func) (const void *s1, const void *s2); -+static int compare(const void *s1, const void *s2) -+{ -+ return (((SORT *) s1)->rate > ((SORT *) s2)->rate); -+} /* compare */ -+static int compare_vbn(const void *s1, const void *s2) -+{ -+ return (((SORT *) s1)->prefix > ((SORT *) s2)->prefix); -+} -+static int compare_name(const void *s1, const void *s2) -+{ -+ return strcasecmp(((SORT *) s1)->name, ((SORT *) s2)->name); -+} -+ -+static int compare2(const void *s1, const void *s2) -+{ -+ return (((SORT2 *) s1)->weight < ((SORT2 *) s2)->weight); -+} /* compare2 */ -+ -+char *short_explainRate(RATE * Rate) -+{ -+ -+ static char buffer[BUFSIZ]; -+ char *p = buffer; -+ -+ if (service && Rate->dst[1] && *Rate->dst[1]) -+ p += sprintf(p, "%s, ", Rate->dst[1]); -+ -+ if (Rate->Zone && *Rate->Zone) -+ p += sprintf(p, "%s", Rate->Zone); -+ else -+ p += sprintf(p, "Zone %d", Rate->zone); -+ -+ if (!Rate->domestic && Rate->Country && *Rate->Country) -+ p += sprintf(p, " (%s)", Rate->Country); -+ -+ if (Rate->Day && *Rate->Day) -+ p += sprintf(p, ", %s", Rate->Day); -+ -+ if (Rate->Hour && *Rate->Hour) -+ p += sprintf(p, ", %s", Rate->Hour); -+ -+ return buffer; -+} -+ -+static char *printrate(RATE * Rate) -+{ -+ static char message[BUFSIZ]; -+ -+ if (Rate->Basic > 0) -+ sprintf(message, "%s + %s/%.1fs = %s + %s/Min (%s)", -+ printRate(Rate->Basic), -+ printRate(Rate->Price), -+ Rate->Duration, -+ printRate(Rate->Basic), -+ printRate(60 * Rate->Price / Rate->Duration), -+ short_explainRate(Rate)); -+ else -+ sprintf(message, "%s/%.1fs = %s/Min (%s)", -+ printRate(Rate->Price), -+ Rate->Duration, -+ printRate(60 * Rate->Price / Rate->Duration), -+ short_explainRate(Rate)); -+ -+ return (message); -+} /* printrate */ -+ -+ -+static void buildtime() -+{ -+ auto struct tm tm; -+ -+ tm.tm_sec = sec; -+ tm.tm_min = min; -+ tm.tm_hour = hour; -+ tm.tm_mday = day; -+ tm.tm_mon = month - 1; -+ tm.tm_year = year - 1900; /* ja, ja, ich weiá ;-) */ -+ tm.tm_isdst = -1; -+ -+ start = mktime(&tm); -+} /* buildtime */ -+ -+ -+static void splittime() -+{ -+ auto struct tm *tm; -+ -+ tm = localtime(&start); -+ sec = tm->tm_sec; -+ min = tm->tm_min; -+ hour = tm->tm_hour; -+ day = tm->tm_mday; -+ month = tm->tm_mon + 1; -+ year = tm->tm_year + 1900; -+} /* splittime */ -+ -+static char *Provider(int prefix) -+{ -+ register char *p, *p1; -+ register int l; -+ static char s[BUFSIZ]; -+ char prov[TN_MAX_PROVIDER_LEN]; -+ -+ if (prefix == UNKNOWN) -+ return ("?"); -+ -+ p = getProvider(prefix); -+ -+ l = max(WIDTH, strlen(p)) - strlen(p); -+ -+ p1 = prefix2provider_variant(prefix, prov); -+ -+ l += (8 - strlen(p1)); -+ -+ sprintf(s, "%s:%s%*s", p1, p, l, ""); -+ -+ return (s); -+} /* Provider */ -+ -+static char *takt_str(RATE * Rate) -+{ -+ static char s[BUFSIZ]; -+ -+ if (floor(Rate->Rhythm[0]) == Rate->Rhythm[0]) -+ sprintf(s, "%.0f/", Rate->Rhythm[0]); -+ else -+ sprintf(s, "%.3f/", Rate->Rhythm[0]); -+ if (floor(Rate->Rhythm[1]) == Rate->Rhythm[1]) -+ sprintf(s + strlen(s), "%.0f", Rate->Rhythm[1]); -+ else -+ sprintf(s + strlen(s), "%.3f", Rate->Rhythm[1]); -+ return s; -+} -+ -+static inline char *P_EMPTY(char *s) -+{ -+ char *p = s; -+ -+ return p ? p : ""; -+} -+ -+#define DEL ';' -+static int compute(char *num) -+{ -+ register int i, n = 0; -+ register int low = 0, high = MAXPROVIDER - 1; -+ auto RATE Rate; -+ auto char s[BUFSIZ]; -+ struct tm *tm; -+ char prov[TN_MAX_PROVIDER_LEN]; -+ int first = 1; -+ static char BUSINESS[] = "Business"; /* in C:GT:Tag */ -+ -+ if (destnum.nprovider != UNKNOWN) { -+ low = high = destnum.nprovider; -+ } /* if */ -+ compare_func = compare; -+ switch (sortby) { -+ case 'v': -+ compare_func = compare_vbn; -+ break; -+ case 'n': -+ compare_func = compare_name; -+ break; -+ } -+ -+ buildtime(); -+ if (explain == 98 || explain == 97) { /* Minutenpreis fuer -+ diese Woche */ -+ tm = localtime(&start); -+ tm->tm_hour = 0; -+ tm->tm_min = 1; -+ tm->tm_sec = 0; -+ start = mktime(tm); -+ if (explain == 98) { -+ while (tm->tm_wday) { /* find last monday */ -+ start -= (60 * 60 * 24); -+ tm = localtime(&start); -+ } /* while */ -+ start += (60 * 60 * 24); -+ } -+ } -+ if (service) { -+ num = getServiceNum(num); -+ if (!num || !*num) { -+ return 0; -+ } -+ } -+ do { -+ for (i = low; i <= high; i++) { -+ int found, p; -+ char *t; -+ -+ if (ignore[i]) /* Fixme: */ -+ continue; -+ if (booked && !isProviderBooked(i)) -+ continue; -+ if (!all && !isProviderValid(i, start)) -+ continue; -+ t = getProvider(i); -+ if (!t || t[strlen(t) - 1] == '?') /* UNKNOWN Provider */ -+ continue; -+ -+ t = getComment(i, "GT"); /* get Geb. Text comment */ -+ if (business) { /* only business wanted */ -+ if (t == 0) -+ continue; -+ else if (strstr(t, BUSINESS) == 0) -+ continue; -+ } -+ if (xbusiness) { /* no business wanted */ -+ if (t && strstr(t, BUSINESS) > 0) -+ continue; -+ } -+ found = 0; -+ if (n_providers) { -+ for (p = 0; p < n_providers; p++) -+ if (pnum2prefix_variant(providers[p], start) == i) { -+ found = 1; -+ break; -+ } -+ if (!found) -+ continue; -+ } -+ if (nx_providers) { -+ for (p = 0; p < nx_providers; p++) -+ if (pnum2prefix_variant(xproviders[p], start) == i) { -+ found = 1; -+ break; -+ } -+ if (found) -+ continue; -+ } -+ clearRate(&Rate); -+ Rate.src[0] = srcnum.country; -+ Rate.src[1] = srcnum.area; -+ Rate.src[2] = ""; -+ -+ destnum.nprovider = i; -+ Strncpy(destnum.provider, getProvider(i), TN_MAX_PROVIDER_LEN); -+ if (normalizeNumber(num, &destnum, TN_ALL) == UNKNOWN) { -+ continue; -+ } -+ -+ Rate.dst[0] = destnum.country; -+ Rate.dst[1] = destnum.area; -+ Rate.dst[2] = destnum.msn; -+ /* Rate.Service = "Internet by call"; */ -+ -+ Rate.prefix = i; -+ -+ Rate.start = start; -+ Rate.now = start + duration - 1; -+ if (explain == 99) { -+ int j; -+ double oldCharge = -1.0; -+ -+ if (first && header) -+ print_header(); -+ first = 0; -+ printf("@ %s\n", prefix2provider_variant(Rate.prefix, prov)); -+ Rate.now = start + 1; -+ for (j = 1; j < duration; j++) { -+ if (!getRate(&Rate, NULL) && (Rate.Price != 99.99)) { -+ if (Rate.Charge != oldCharge || j == duration - 1) { -+ printf("%d %.4f\n", j, Rate.Charge); -+ oldCharge = Rate.Charge; -+ } -+ } -+ else -+ break; -+ Rate.now++; -+ } -+ if (Rate.Duration <= takt) -+ printf("@----- %s %s\n", currency, Rate.Provider); -+ } -+ if (explain == 98 || explain == 97) { /* Minutenpreis fuer -+ diese Woche/Tag */ -+ int j; -+ -+ if (first && header) -+ print_header(); -+ first = 0; -+ printf("@ %s\n", prefix2provider_variant(Rate.prefix, prov)); -+ for (j = 0; j < (explain == 98 ? 7 * 24 : 24); j++) { -+ if (!getRate(&Rate, NULL) && (Rate.Price != 99.99)) { -+ printf("%d %.4f\n", j, Rate.Charge); -+ } -+ else -+ break; -+ Rate.now += 3600; -+ Rate.start += 3600; -+ } -+ if (Rate.Duration <= takt) -+ printf("@----- %s %s\n", currency, Rate.Provider); -+ } -+ else if (explain == 50 || explain == 51) { -+ int fi = 1; -+ -+ while (getZoneRate(&Rate, explain - 50, fi) == 0) { -+ double cpm = Rate.Duration > 0 ? 60 * Rate.Price / Rate.Duration : 99.99; -+ -+ if (Rate.Price == 0) -+ cpm = Rate.Basic; -+ -+ fi = 0; -+ if (Rate.Price != 99.99) -+ printf("%s%c%s%c%s%c%.2f%c%.2f%c%s\n", prefix2provider(Rate.prefix, prov), DEL, -+ Rate.Provider, DEL, currency, DEL, Rate.Charge, DEL, cpm, DEL, -+ P_EMPTY(Rate.Country)); -+ free(Rate.Country); -+ } -+ } -+ else { -+ /* kludge to suppress "impossible" Rates */ -+ char **message, *msg; -+ if(verbose) -+ message = &msg; -+ else -+ message = NULL; -+ if (!getRate(&Rate, message) && (Rate.Price != 99.99)) { -+ if (!(Rate.Duration <= takt)) -+ continue; -+ sort[n].prefix = Rate.prefix; -+ sort[n].rate = Rate.Charge; -+ sort[n].name = Rate.Provider; -+ switch (explain) { -+ case 1: -+ if (service) -+ sprintf(s, " (%s, %s)", P_EMPTY(Rate.dst[1]), Rate.Zone); -+ else -+ sprintf(s, " (%s)", Rate.Zone); -+ sort[n].explain = strdup(s); -+ break; -+ case 2: -+ sprintf(s, " (%s)", printrate(&Rate)); -+ sort[n].explain = strdup(s); -+ break; -+ case 8: -+ sort[n].explain = strdup(P_EMPTY(getComment(i, comment))); -+ break; -+ case 9: /* used by list */ -+ { -+ double cpm = Rate.Duration > 0 ? 60 * Rate.Price / Rate.Duration : 99.99; -+ -+ if (Rate.Price == 0) -+ cpm = Rate.Basic; -+ -+ sprintf(s, "%s%c" -+ "%s%c%s%c%s%c%s%c" -+ "%s%c" -+ "%.3f%c%.4f%c%.4f%c%.2f%c%.3f%c" -+ "%s%c%.2f", -+ prefix2provider_variant(Rate.prefix, prov), DEL, -+ Rate.Provider, DEL, P_EMPTY(Rate.Zone), DEL, P_EMPTY(Rate.Day), DEL, P_EMPTY(Rate.Hour), DEL, -+ currency, DEL, /* Fixme: global or per -+ Provider?? wg. EURO */ -+ Rate.Charge, DEL, Rate.Basic, DEL, Rate.Price, DEL, Rate.Duration, DEL, cpm, DEL, -+ takt_str(&Rate), DEL, Rate.Sales); -+ sort[n].explain = strdup(s); -+ } -+ break; -+ default: -+ sort[n].explain = strdup(""); -+ break; -+ } -+ -+ n++; -+ } /* if */ -+ else if(verbose && *msg) -+ print_msg(PRT_V, "%s\n", msg); -+ -+ } /* else 99 */ -+ } /* for i */ -+ if (service) -+ num = getServiceNum(0); /* get next service num */ -+ else -+ num = 0; -+ } while (num && *num); -+ if (explain < 10) { -+ qsort((void *) sort, n, sizeof(SORT), compare_func); -+ if (lcr && n) { -+ RATE Cheap; -+ int res = getLeastCost(&Rate, &Cheap, booked, -1); -+ -+ if (res != UNKNOWN) { -+ sort[n].prefix = Cheap.prefix; -+ sort[n].rate = Cheap.Charge; -+ sort[n].name = Cheap.Provider; -+ sprintf(s, "(Cheapest: %s %s %s %s)", Cheap.dst[0], Cheap.dst[1], Cheap.dst[2], P_EMPTY(Cheap.Zone)); -+ sort[n].explain = strdup(s); -+ n++; -+ } /* res */ -+ } /* lcr */ -+ } /* explain */ -+ return (n); -+} /* compute */ -+ -+static void print_header(void) -+{ -+ printf("Eine %d Sekunden lange Verbindung von %s nach %s kostet am %s\n", -+ duration, formatNumber("%F", &srcnum), formatNumber("%F", &destnum), -+ ctime(&start)); -+} -+ -+static void printList(int n) -+{ -+ int i; -+ -+ if (header) -+ print_header(); -+ if (n > best) -+ n = best; -+ -+ for (i = 0; i < n; i++) -+ printf("%s\n", sort[i].explain); -+} -+ -+static void result(int n) -+{ -+ -+ register int i; -+ -+ if (header) -+ print_header(); -+ -+ if (n > best) -+ n = best; -+ for (i = 0; i < n; i++) -+ printf("%s %s %8.3f %s\n", -+ Provider(sort[i].prefix), currency, sort[i].rate, sort[i].explain); -+} /* result */ -+ -+ -+static void purge(int n) -+{ -+ register int i; -+ -+ for (i = 0; i < n; i++) -+ if (sort[i].explain) -+ free(sort[i].explain); -+} /* purge */ -+ -+/* -+ Werktag -+ Wochenende -+ Ortszone -+ Regionalzone -+ Fernzone -+ Handy -+ Internet -+ 0..23 Uhr -+ */ -+ -+#define STARTHOUR 8 -+ -+static void printTable(char *num) -+{ -+ register int n, d, i, h, lasthour; -+ auto struct tm *tm; -+ auto SORT last[_MAXLAST]; -+ auto int used[MAXPROVIDER]; -+ auto int hours[MAXPROVIDER]; -+ auto int weight[MAXPROVIDER]; -+ auto int useds = 0, maxhour; -+ auto SORT2 wsort[MAXPROVIDER]; -+ static int firsttime = 1; -+ int first; -+ int prefix; -+ -+ memset(used, 0, sizeof(used)); -+ memset(hours, 0, sizeof(hours)); -+ memset(weight, 0, sizeof(weight)); -+ -+ for (d = 0; d < 3; d++) { /* Werktag, Samstag, Sonntag */ -+ last[0].prefix = UNKNOWN; -+ lasthour = UNKNOWN; -+ -+ buildtime(); -+ tm = localtime(&start); -+ -+ if (!d) { /* first time */ -+ while (tm->tm_wday != 5) { /* find next Friday */ -+ start += (60 * 60 * 24); -+ tm = localtime(&start); -+ } /* while */ -+ } -+ else /* erst Samstag, dann */ -+ start += (60 * 60 * 24); /* Sonntag */ -+ -+ splittime(); -+ buildtime(); -+ -+ hour = STARTHOUR; -+ min = 0; -+ -+ first = 1; -+ -+ while (1) { -+ destnum.nprovider = UNKNOWN; -+ if (provider2prefix(num, &prefix)) /* set provider if it is in number */ -+ normalizeNumber(num, &destnum, TN_PROVIDER); -+ n = compute(num); -+ -+ if (header && first && d == 0 && firsttime) -+ print_header(); -+ -+ if (header && first) { -+ switch (d) { -+ case 0 : printf("\nWerktag:\n"); break; -+ case 1 : printf("\nSamstag:\n"); break; -+ case 2 : printf("\nSonntag:\n"); break; -+ } /* switch */ -+ -+ first = 0; -+ } /* if */ -+ -+ if (last[0].prefix == UNKNOWN) { -+ for (i = 0; i < min(n, MAXLAST); i++) { -+ if (sort[i].prefix) { -+ last[i].prefix = sort[i].prefix; -+ last[i].rate = sort[i].rate; -+ last[i].explain = strdup(sort[i].explain); -+ } /* if */ -+ } /* for */ -+ } /* if */ -+ -+ if (lasthour == UNKNOWN) -+ lasthour = hour; -+ -+ if (sort[0].prefix != last[0].prefix) { -+ for (i = 0; i < min(n, MAXLAST); i++) { -+ -+ if (!i) -+ printf(" %02d:00 .. %02d:59 %s = %s %s%s\n", -+ lasthour, hour - 1, Provider(last[i].prefix), -+ currency, -+ double2str(last[i].rate, 5, 3, DEB), -+ last[i].explain); -+ else -+ printf(" %s = %s %s%s\n", -+ Provider(last[i].prefix), -+ currency, -+ double2str(last[i].rate, 5, 3, DEB), -+ last[i].explain); -+ } /* for */ -+ -+ used[last[0].prefix]++; -+ -+ if (lasthour >= hour) -+ h = ((24 - lasthour) + hour); -+ else -+ h = hour - lasthour; -+ -+ hours[last[0].prefix] += h; -+ -+ if ((lasthour > 8) && (lasthour < 21)) -+ h *= 2; -+ -+ weight[last[0].prefix] += h * (d ? 1 : 5); -+ -+ for (i = 0; i < min(n, MAXLAST); i++) { -+ last[i].prefix = sort[i].prefix; -+ last[i].rate = sort[i].rate; -+ last[i].explain = strdup(sort[i].explain); -+ } /* for */ -+ -+ lasthour = hour; -+ } /* if */ -+ -+ purge(n); -+ -+ hour++; -+ -+ if (hour == 24) -+ hour = 0; -+ else if (hour == STARTHOUR) -+ break; -+ } /* while */ -+ -+ for (i = 0; i < min(n, MAXLAST); i++) { -+ -+ if (!i) { -+ if ((lasthour == STARTHOUR) && (hour == STARTHOUR)) -+ printf(" immer %s = %s %s%s\n", -+ Provider(last[i].prefix), -+ currency, -+ double2str(last[i].rate, 5, 3, DEB), -+ last[i].explain); -+ else -+ printf(" %02d:00 .. %02d:59 %s = %s %s%s\n", -+ lasthour, hour - 1, Provider(last[i].prefix), -+ currency, -+ double2str(last[i].rate, 5, 3, DEB), -+ last[i].explain); -+ } -+ else -+ printf(" %s = %s %s%s\n", -+ Provider(last[i].prefix), -+ currency, -+ double2str(last[i].rate, 5, 3, DEB), -+ last[i].explain); -+ } /* for */ -+ -+ used[last[0].prefix]++; -+ -+ if (lasthour >= hour) -+ h = ((24 - lasthour) + hour); -+ else -+ h = hour - lasthour; -+ -+ hours[last[0].prefix] += h; -+ -+ if ((lasthour > 8) && (lasthour < 21)) -+ h *= 2; -+ -+ weight[last[0].prefix] += h * (d ? 1 : 5); -+ -+ } /* for */ -+ -+ if (usestat) { -+ printf("\nProvider(s) used:\n"); -+ -+ maxhour = 9999999; -+ useds = 0; -+ -+ for (i = 0; i < MAXPROVIDER; i++) -+ if (used[i]) { -+ printf("%s %d times, %d hours, weight = %d\n", -+ Provider(i), used[i], hours[i], weight[i]); -+ -+ wsort[useds].weight = weight[i]; -+ wsort[useds].index = i; -+ -+ useds++; -+ -+ if (hours[i] < maxhour) -+ maxhour = hours[i]; -+ } /* if */ -+ -+ if ((best < MAXPROVIDER) && (best < useds)) { -+ printf("Retrying with only %d provider(s), eliminating %d provider(s)\n", best, useds - best); -+ -+ qsort((void *) wsort, useds, sizeof(SORT2), compare2); -+ -+ for (i = 0; i < useds; i++) { -+ printf("%s %d times, %d hours, weight = %d\n", -+ Provider(wsort[i].index), used[wsort[i].index], hours[wsort[i].index], weight[wsort[i].index]); -+ -+ if (i == best - 1) -+ printf("\n"); -+ -+ if (i >= best - 1) -+ ignore[wsort[i].index]++; -+ } /* for */ -+ -+ if (firsttime) -+ printTable(num); -+ -+ firsttime = 0; -+ -+ } /* if */ -+ } /* if */ -+} /* printTable */ -+ -+ -+static void clean_up() -+{ -+ if (providers) -+ free(providers); -+ providers = 0; -+ fromarea = 0; -+ table = list = header = explain = 0; -+ usestat = 0; -+ duration = LCR_DURATION; -+ wanted_day = '\0'; -+ takt = 99999; -+ if (comment) -+ free(comment); -+ comment = 0; -+ sortby = 0; -+ need_dest = 1; -+} -+ -+static char * sub_sp(char *p) -+{ -+ char *o = p; -+ int allupper=1; -+ for (; *p; p++) -+ if(!isupper(*p) && *p != '_' && !isdigit(*p)) { /* e.g. _DEMD1 */ -+ allupper = 0; -+ break; -+ } -+ if (!allupper) -+ for (p = o; *p; p++) -+ if(*p == '_') -+ *p = ' '; -+ return o; -+} -+static void doit(int i, int argc, char *argv[]) -+{ -+ int n; -+ int prefix; -+ char *num; -+ -+ post_init(); -+ memset(ignore, 0, sizeof(ignore)); -+ if (!need_dest && i == 0) { -+ i = 0; -+ argc = 1; -+ argv[0] = "2345"; -+ } -+ while (i < argc) { -+ num = sub_sp(argv[i]); -+ if (explain == 55) { -+ if (n_providers) { -+ destnum.nprovider = pnum2prefix_variant(providers[0], 0); -+ Strncpy(destnum.provider, getProvider(destnum.nprovider), TN_MAX_PROVIDER_LEN); -+ normalizeNumber(num, &destnum, TN_NO_PROVIDER); -+ } -+ else -+ normalizeNumber(num, &destnum, TN_ALL); -+ printf("%s => %s \n", num, formatNumber("%l - %p", &destnum)); -+ i++; -+ continue; -+ } -+ else if (explain == 52) { // enum Servce names -+ -+ int first = 1; -+ char *p; -+ -+ do { -+ p = getServiceNames(first); -+ if (p) -+ printf("%s\n", p); -+ first = 0; -+ } -+ while (p); -+ return; -+ } -+ destnum.nprovider = UNKNOWN; -+ if (provider2prefix(num, &prefix)) /* set provider if it is in -+ number */ -+ normalizeNumber(num, &destnum, TN_PROVIDER); -+ if (table) -+ printTable(num); -+ else { -+ n = compute(num); -+ if (list) -+ printList(n); -+ else if (explain < 10) -+ result(n); -+ purge(n); -+ } -+ i++; -+ } /* while */ -+ clean_up(); -+} -+ -+static void err(char *s) -+{ -+ print_msg(PRT_A, "%s - '%s'\n", s, strerror(errno)); -+ if (is_daemon == 2) -+ kill(getppid(), SIGTERM); -+ exit(2); -+} -+ -+static int handle_client(int fd) -+{ -+ char buffer[BUFSIZ]; -+ int argc, n, i; -+ char **argv; -+ char *p; -+ -+ if ((n = read(fd, buffer, BUFSIZ)) < 0) -+ err("Read"); -+ if (n) { -+ argv = calloc(sizeof(char *), 20); -+ -+ buffer[n] = '\0'; -+ if (verbose) -+ fprintf(stderr, "got '%s'\n", buffer); -+ argc = 0; -+ argv[argc++] = strdup(myname); -+ p = strtok(buffer, "\t\n "); -+ while (p) { -+ argv[argc++] = strdup(p); -+ p = strtok(0, "\t\n "); -+ if (argc >= 20) -+ break; -+ } -+ time(&start); /* set time of call */ -+ splittime(); /* date time my be overridden by opts */ -+ we_are_daemon = 1; -+ if ((i = opts(argc, argv)) || need_dest == 0) { -+ if (shutdown(fd, 0) < 0) /* no read any more */ -+ err("shutdown"); -+ if (dup2(fd, STDOUT_FILENO) < 0) /* stdout to sock */ -+ err("dup"); -+ doit(i, argc, argv); -+ fflush(stdout); -+ fclose(stdout); -+ } -+ for (i = 0; i < argc; i++) -+ free(argv[i]); -+ free(argv); -+ } -+ return n == 0 ? -1 : 0; -+} -+ -+void catch_sig(int sig) -+{ -+ print_msg(PRT_A, "Signal %d\n", sig); -+ unlink(socket_file); -+ if (pid_dir) -+ unlink(pid_file); -+ err("Sig"); -+} -+ -+static void del_sock(void) -+{ -+ if (getppid() > 0) { -+ unlink(socket_file); -+ if (pid_dir) -+ unlink(pid_file); -+ } -+} -+ -+static volatile sig_atomic_t stopped = 0; -+static volatile sig_atomic_t reinit = 0; -+ -+static void catch_term(int sig) -+{ -+ stopped = 1; -+} -+ -+static void catch_hup(int sig) -+{ -+ print_msg(PRT_A, "Signal %d restarting %s\n", sig, myname); -+ del_sock(); -+ execvp(myname, hup_argv); -+ print_msg(PRT_A, "- failed\n"); -+} -+ -+static void do_reinit(void) -+{ -+ /* deinit(), init() doesn't */ -+ reinit=0; -+} -+ -+/* thank's to Jochen Erwied for this: */ -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) \ -+ -+#endif -+ -+static void setup_daemon() -+{ -+ int sock; -+ struct sockaddr_un sa; -+ struct sockaddr_in client; -+ fd_set active_fd_set, read_fd_set; -+ char *sock_name = socket_file; -+ socklen_t size; -+ struct stat stat_buf; -+ int i; -+ pid_t pid; -+ char pidname[] = "isdnrate.pid"; -+ FILE *fp; -+ -+ if (verbose) -+ fprintf(stderr, "Setup sockets\n"); -+ signal(SIGTERM, catch_term); -+ signal(SIGINT, catch_sig); -+ signal(SIGHUP, catch_hup); -+ -+ if (is_daemon == 2) { /* go background */ -+ -+ fprintf(stderr, "Going background\n"); -+ verbose = 0; -+ pid = fork(); -+ if (pid < 0) -+ err("Going bg failed"); -+ else if (pid > 0) { -+ exit(EXIT_SUCCESS); -+ } -+ } -+ if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) -+ err("Can't open socket"); -+ sa.sun_family = AF_UNIX; -+ strcpy(sa.sun_path, sock_name); -+ size = offsetof(struct sockaddr_un, sun_path) + strlen(sa.sun_path) + 1; -+ -+ if (bind(sock, (struct sockaddr *) &sa, size) < 0) -+ err("Can't bind sock"); -+ -+ stat(sock_name, &stat_buf); -+ chmod(sock_name, stat_buf.st_mode | S_IWOTH | S_IWGRP); -+/* should better have perm wwwrun.nogroup */ -+ -+ if (listen(sock, SOMAXCONN) < 0) -+ err("Can't listen"); -+ if (pid_dir) { -+ pid_file = malloc(strlen(pid_dir) + strlen(pidname) + 2); -+ strcpy(pid_file, pid_dir); -+ if (pid_file[strlen(pid_file) - 1] != '/') -+ strcat(pid_file, "/"); -+ strcat(pid_file, pidname); -+ if ((fp = fopen(pid_file, "w")) == 0) -+ fprintf(stderr, "Can't write %s\n", pid_file); -+ else { -+ fprintf(fp, "%d\n", getpid()); -+ fclose(fp); -+ } -+ } -+ atexit(del_sock); -+ FD_ZERO(&active_fd_set); -+ FD_SET(sock, &active_fd_set); -+ while (!stopped) { -+ if (reinit) -+ do_reinit(); -+ read_fd_set = active_fd_set; -+ if (TEMP_FAILURE_RETRY(select(FD_SETSIZE, &read_fd_set, 0, 0, 0)) < 0) -+ err("select"); -+ for (i = 0; i < FD_SETSIZE; i++) -+ if (FD_ISSET(i, &read_fd_set)) { -+ if (i == sock) { /* request on orig */ -+ int new; -+ -+ size = sizeof(client); -+ if ((new = accept(sock, (struct sockaddr *) &client, &size)) < 0) -+ err("accept"); -+ if (verbose) -+ fprintf(stderr, "Accepted %d\n", new); -+ FD_SET(new, &active_fd_set); -+ } -+ else { /* already connected */ -+ pid_t pid; -+ int status; -+ -+ if (verbose) -+ fprintf(stderr, "Handle client %d\n", i); -+ pid = fork(); -+ if (pid == 0) { -+ handle_client(i); -+ _exit(EXIT_SUCCESS); -+ } -+ else if (pid < 0) -+ err("fork"); -+ else { -+ if (waitpid(pid, &status, 0) != pid) -+ err("waitpid"); -+ close(i); -+ FD_CLR(i, &active_fd_set); -+ } -+ } /* if i */ -+ } /* if ISSET */ -+ } /* while */ -+ del_sock(); -+ exit(EXIT_SUCCESS); -+} -+ -+static int connect_2_daemon(int argc, char *argv[]) -+{ -+ int sock; -+ struct sockaddr_un sa; -+ char *sock_name = socket_file; -+ size_t size; -+ int i, c, len; -+ char *p, *q, buffer[BUFSIZ]; -+ -+ if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) -+ err("Can't open socket"); -+ sa.sun_family = AF_UNIX; -+ strcpy(sa.sun_path, sock_name); -+ size = offsetof(struct sockaddr_un, sun_path) + strlen(sa.sun_path) + 1; -+ -+ if (connect(sock, (struct sockaddr *) &sa, size) < 0) -+ err("Can't connect sock"); -+ p = buffer; -+ optind = 0; /* reinit */ -+ len = 0; -+ while ((c = getopt(argc, argv, options)) != EOF && len < BUFSIZ - 10) { -+ switch (c) { -+ case '?': -+ case 'C': -+ break; -+ case 'D': -+ if (optarg && atoi(optarg) == 3) ; /* goon, kill a running -+ daemon */ -+ else -+ break; -+ default: -+ *p++ = '-'; -+ *p++ = c; -+ len += 3; -+ if (optarg) -+ for (q = optarg; *q && len < BUFSIZ - 10; len++) -+ *p++ = *q++; -+ *p++ = ' '; -+ break; -+ } -+ } -+ for (i = optind; i < argc; i++) { -+ for (q = argv[i]; *q && len < BUFSIZ - 10; len++) -+ *p++ = *q++; -+ *p++ = ' '; -+ len++; -+ } -+ *--p = '\x0'; -+ i = write(sock, buffer, strlen(buffer) + 1); -+ if (i < 0) -+ err("Write sock"); -+ while ((i = read(sock, buffer, BUFSIZ)) > 0) -+ write(1, buffer, i); -+ close(sock); -+ return EXIT_SUCCESS; -+} -+ -+ -+int main(int argc, char *argv[], char *envp[]) -+{ -+ register int i; -+ sigset_t unblock_set; -+ -+ myname = argv[0]; -+ myshortname = basename(myname); -+ -+ time(&start); -+ splittime(); -+ socket_file = strdup(SOCKNAME); -+ /* borrowed from isdnlog.c, thanks */ -+ hup_argv = argv; -+ sigemptyset(&unblock_set); -+ sigaddset(&unblock_set, SIGHUP); -+ sigprocmask(SIG_UNBLOCK, &unblock_set, NULL); -+ -+ if ((i = opts(argc, argv)) || need_dest == 0) { -+ if (is_client) -+ exit(connect_2_daemon(argc, argv)); -+ else -+ init(); -+ if (is_daemon) { -+ clean_up(); -+ setup_daemon(); -+ } -+ else -+ doit(i, argc, argv); -+ } -+ else { -+ print_msg(PRT_A, usage, myshortname, myshortname, options); -+ print_msg(PRT_A, "\n"); -+ print_msg(PRT_A, "\t-a \tall=show old and newer rates (default actual only)\n", MAXPROVIDER); -+ print_msg(PRT_A, "\t-b best\tshow only the first <best> provider(s) (default %d)\n", MAXPROVIDER); -+ print_msg(PRT_A, "\t-d d[.m[.y]] | {W|N|E}\tstart date of call (default now)\n"); -+ print_msg(PRT_A, "\t-f areacode\tyou are calling from <areacode>\n"); -+ print_msg(PRT_A, "\t-h h[:m[:s]]\tstart time of call (default now)\n"); -+ print_msg(PRT_A, "\t-l duration\tduration of call in seconds (default %d seconds)\n", LCR_DURATION); -+ print_msg(PRT_A, "\t-o \t show only booked providers\n"); -+ print_msg(PRT_A, "\t-p prov|B[,prov...]\t show only these providers\n"); -+ print_msg(PRT_A, "\t-s \t consider 'Destination' as a service name\n"); -+ print_msg(PRT_A, "\t-t takt\t\tshow providers if chargeduration<=takt\n"); -+ print_msg(PRT_A, "\t-v [level]\tverbose\n"); -+ print_msg(PRT_A, "\t-x prov|B[,prov...]\t exclude these providers\n"); -+ -+ print_msg(PRT_A, "\tOutput and run options\n"); -+ print_msg(PRT_A, "\t-C\trun as client, connecting to a running daemon\n"); -+ print_msg(PRT_A, "\t-CD3\tkill a running daemon\n"); -+ print_msg(PRT_A, "\t-D\trun as daemon\n"); -+ print_msg(PRT_A, "\t-D2\trun as daemon & go background\n"); -+ print_msg(PRT_A, "\t-G which\tshow raw data\n"); -+ print_msg(PRT_A, "\t-H\tshow a header\n"); -+ print_msg(PRT_A, "\t-L\tshow a detailed list\n"); -+ print_msg(PRT_A, "\t-O sOcket-path\twrite socket to this file (def:tmp/isdnrate)\n"); -+ print_msg(PRT_A, "\t-P pid-dir\twrite own PID to pid-dir/isdnrate.pid\n"); -+ print_msg(PRT_A, "\t-N\tparse the given telefon numbers\n"); -+ print_msg(PRT_A, "\t-S[v|n]\tsort by v=VBN, n=Name, default=Charge\n"); -+ print_msg(PRT_A, "\t-T\tshow a table of day/night week/weekend\n"); -+ print_msg(PRT_A, "\t-U\tshow usage stats for table\n"); -+ print_msg(PRT_A, "\t-V\tshow version info\n"); -+ print_msg(PRT_A, "\t-X\texplain each rate\n"); -+ print_msg(PRT_A, "\t-X2\texplain more\n"); -+ print_msg(PRT_A, "\t-X comment\tprint <comment> from C:tag\n"); -+ print_msg(PRT_A, "\t-Z show entry from getLeastCost\n"); -+ print_msg(PRT_A, "\n\te.g.\t%s -b5 -f30 -TH -t1 Zaire\n", myshortname); -+ } /* else */ -+/* deinit(); Fixme: this SIGSEGVs in exitHoliday */ -+ return (0); -+} /* isdnrate */ -diff -Naur isdn4k-utils-orig//isdnlog/tools/rate.c isdn4k-utils/isdnlog/tools/rate.c ---- isdn4k-utils-orig//isdnlog/tools/rate.c 2002-07-06 09:22:33.000000000 +1000 -+++ isdn4k-utils/isdnlog/tools/rate.c 2010-12-04 20:44:03.786672226 +1000 -@@ -1773,6 +1773,7 @@ - number=realloc(number, numbers*sizeof(int)); - number[numbers-1]=i; - skip: -+ ; - } - - while (isblank(*s)) s++; -@@ -2344,6 +2345,7 @@ - } - return UNKNOWN; - done: -+ ; - } - } - } -diff -Naur isdn4k-utils-orig//lib/libtools.c isdn4k-utils/lib/libtools.c ---- isdn4k-utils-orig//lib/libtools.c 1999-11-04 02:13:36.000000000 +1000 -+++ isdn4k-utils/lib/libtools.c 2010-12-04 20:44:03.786672226 +1000 -@@ -711,6 +711,7 @@ - case 'r': _mode |= R_OK; - break; - default : -+ ; - } - } - -diff -Naur isdn4k-utils-orig//Makefile isdn4k-utils/Makefile ---- isdn4k-utils-orig//Makefile 2002-07-20 05:03:49.000000000 +1000 -+++ isdn4k-utils/Makefile 2010-12-04 20:43:57.890005560 +1000 -@@ -132,12 +132,6 @@ - - install: rootperm - set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done -- @if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \ -- then \ -- /bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \ -- else \ -- sh scripts/makedev.sh $(DESTDIR) ; \ -- fi - - uninstall: rootperm - set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done diff --git a/extra/nouveau-drm-lts/COPYING b/extra/nouveau-drm-lts/COPYING deleted file mode 100644 index 6e74c337c..000000000 --- a/extra/nouveau-drm-lts/COPYING +++ /dev/null @@ -1,48 +0,0 @@ - Copyright 2005 Adam Jackson. - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation on the rights to use, copy, modify, merge, - publish, distribute, sub license, and/or sell copies of the Software, - and to permit persons to whom the Software is furnished to do so, - subject to the following conditions: - - The above copyright notice and this permission notice (including the - next paragraph) shall be included in all copies or substantial - portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NON-INFRINGEMENT. IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - ------------------------------------------------------------------------- - - Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. - Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. - All Rights Reserved. - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice (including the - next paragraph) shall be included in all copies or substantial - portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS - SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. diff --git a/extra/nouveau-drm-lts/Makefile b/extra/nouveau-drm-lts/Makefile deleted file mode 100644 index 123bc5339..000000000 --- a/extra/nouveau-drm-lts/Makefile +++ /dev/null @@ -1,102 +0,0 @@ -# This Makefile is loosely based on the drm.git/linux-core/Makefile and -# the preliminary work by Christopher James Halse Rogers. -# Edited by Pekka Paalanen <pq@iki.fi> - -# By default, the build is done against the running linux kernel source. -# To build against a different kernel source tree, set LINUXDIR: -# -# make LINUXDIR=/path/to/kernel/source - -# By default, it is assumed the Nouveau kernel tree is found in $PWD/../. -# To use a different path to the Nouveau kernel tree, set NOUVEAUROOTDIR: -# -# make NOUVEAUROOTDIR=/path/to/nouveau/linux-2.6 - - -ifndef LINUXDIR -RUNNING_REL := $(shell uname -r) - -LINUXDIR := $(shell if [ -e /lib/modules/$(RUNNING_REL)/source ]; then \ - echo /lib/modules/$(RUNNING_REL)/source; \ - else echo /lib/modules/$(RUNNING_REL)/build; fi) -endif - -NOUVEAUGITREMOTE ?= origin -NOUVEAUROOTDIR ?= $(CURDIR)/.. -override NOUVEAUROOTDIR := $(abspath $(NOUVEAUROOTDIR)) - -TESTFILE := include/drm/nouveau_drm.h -ifeq ($(wildcard $(NOUVEAUROOTDIR)/$(TESTFILE)),) -$(error $(NOUVEAUROOTDIR) does not look like the right kernel tree, \ - please set NOUVEAUROOTDIR) -endif - -GIT_REVISION := $(shell GIT_DIR=$(NOUVEAUROOTDIR)/.git \ - git describe --always --abbrev=17 2> /dev/null) - -DRMINC := -I$(NOUVEAUROOTDIR)/include/drm -DRMDIR := $(NOUVEAUROOTDIR)/drivers/gpu/drm -DRMCFG := \ - CONFIG_DRM=m \ - CONFIG_DRM_KMS_HELPER=m \ - CONFIG_DRM_TTM=m \ - CONFIG_DRM_NOUVEAU=m \ - CONFIG_DRM_NOUVEAU_KMS=n \ - CONFIG_DRM_NOUVEAU_BACKLIGHT=y \ - CONFIG_DRM_NOUVEAU_DEBUG=y \ - CONFIG_DRM_I2C_CH7006=m \ - CONFIG_DRM_TDFX=n \ - CONFIG_DRM_R128=n \ - CONFIG_DRM_RADEON=n \ - CONFIG_DRM_MGA=n \ - CONFIG_DRM_I810=n \ - CONFIG_DRM_I830=n \ - CONFIG_DRM_I915=n \ - CONFIG_DRM_SIS=n \ - CONFIG_DRM_SAVAGE=n \ - CONFIG_DRM_VIA=n - -EXTRA_CFLAGS := -MYEXTRA_CFLAGS := -MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_BACKLIGHT -MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_DEBUG - -ifneq ($(GIT_REVISION),) -MYEXTRA_CFLAGS += '-DGIT_REVISION=\"$(GIT_REVISION)\"' -endif - -MYPARMS := -C $(LINUXDIR) KCPPFLAGS="$(DRMINC)" SUBDIRS="$(DRMDIR)" $(DRMCFG) - -MYEXTRA_CFLAGS += $(EXTRA_CFLAGS) -ifneq ($(MYEXTRA_CFLAGS),) -MYPARMS += EXTRA_CFLAGS="$(MYEXTRA_CFLAGS)" -endif - -.PHONY: all modules install clean archive FORCE - -all: modules -FORCE: - -modules: - $(MAKE) $(MYPARMS) modules - -install: - $(MAKE) $(MYPARMS) modules_install - -clean: - $(MAKE) $(MYPARMS) clean - -archive: newttm-devel-compat.tar.gz newttm-devel.tar.gz master.tar.gz - -newttm-devel-compat.tar.gz: EXTRAS=nouveau README-nouveau - -%.tar: FORCE - GIT_DIR=$(NOUVEAUROOTDIR)/.git \ - git archive --format=tar --prefix=$*/ $(NOUVEAUGITREMOTE)/$* \ - drivers/gpu/drm include/drm $(EXTRAS) > $@ - -%.tar.gz: %.tar - gzip -9 -c $< > $@ - -# The commit id of the archive can be read with -# $ zcat foo.tar.gz | git get-tar-commit-id diff --git a/extra/nouveau-drm-lts/PKGBUILD b/extra/nouveau-drm-lts/PKGBUILD deleted file mode 100644 index d037a33ea..000000000 --- a/extra/nouveau-drm-lts/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 142808 2011-11-15 14:48:15Z tpowa $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: buddabrod <buddabrod@gmail.com> - -pkgname=nouveau-drm-lts -_snapdate=20100313 -pkgver=0.0.16_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version -_extramodules=extramodules-2.6.32-lts -_kernver="$(cat /lib/modules/${_extramodules}/version)" -pkgrel=7 -pkgdesc="nvidia opensource X driver" -arch=('i686' 'x86_64') -url="http://nouveau.freedesktop.org/" -depends=("kernel26-lts>=2.6.32" "kernel26-lts<2.6.33") -makedepends=("kernel26-lts-headers>=2.6.32" "kernel26-lts-headers<2.6.33") -# http://nouveau.freedesktop.org/wiki/InstallDRM#head-771a47a133fba6a5a70253656e76c61e9bff93bd -optdepends=('nouveau-firmware: needed for very new card (NV50 family and above) to work properly where the OSS replacement does not work well') -#makedepends=('git' 'autoconf' 'pkgconfig') -install=nouveau-drm.install -license=('GPL') -options=('!strip') -source=(ftp://ftp.archlinux.org/other/${pkgname/-lts//}/master-${_snapdate}.tar.gz - # http://people.freedesktop.org/~pq/nouveau-drm/master.tar.gz - # get the Makefile from http://cgit.freedesktop.org/nouveau/linux-2.6/plain/nouveau/Makefile?h=master-compat - Makefile) -md5sums=('ad7ad0fb73d56bcff3d2b54a70c3d511' - 'e7d5df80186d5c736e82b0a7d46216bc') - -build() { - cd ${srcdir}/master - mkdir nouveau - cp $srcdir/Makefile ${srcdir}/master/nouveau/ - cd nouveau - make LINUXDIR=/lib/modules/${_kernver}/build DRM_MODULES="nouveau" -} - -package() { - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm.ko ${pkgdir}/lib/modules/${_extramodules}/updates/drm.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm_kms_helper.ko ${pkgdir}/lib/modules/${_extramodules}/updates/drm_kms_helper.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/${_extramodules}/kernel/drivers/video/nouveau.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/${_extramodules}/updates/ttm.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/${_extramodules}/updates/ch7006.ko - - # install script - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" ${startdir}/nouveau-drm.install - # gzip -9 modules - find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; -} diff --git a/extra/nouveau-drm-lts/dont_check_for_pthread.patch b/extra/nouveau-drm-lts/dont_check_for_pthread.patch deleted file mode 100644 index 050f55767..000000000 --- a/extra/nouveau-drm-lts/dont_check_for_pthread.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac ---- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 -+++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 -@@ -32,10 +32,6 @@ - AC_HEADER_STDC - AC_SYS_LARGEFILE - --PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) --AC_SUBST(PTHREADSTUBS_CFLAGS) --AC_SUBST(PTHREADSTUBS_LIBS) -- - pkgconfigdir=${libdir}/pkgconfig - AC_SUBST(pkgconfigdir) - AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev], -diff -ru libdrm-2.4.0/libdrm/intel/Makefile.am libdrm-2.4.0-nostubs/libdrm/intel/Makefile.am ---- libdrm-2.4.0/libdrm/intel/Makefile.am 2008-10-14 01:39:32.000000000 +0200 -+++ libdrm-2.4.0-nostubs/libdrm/intel/Makefile.am 2008-10-21 10:49:00.000000000 +0200 -@@ -26,13 +26,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir)/libdrm \ - -I$(top_srcdir)/libdrm/intel \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/shared-core - - libdrm_intel_la_LTLIBRARIES = libdrm_intel.la - libdrm_intel_ladir = $(libdir) - libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_intel_la_LIBADD = ../libdrm.la - - libdrm_intel_la_SOURCES = \ - intel_bufmgr.c \ ---- libdrm-2.4.5/libdrm/nouveau/Makefile.am.orig 2009-02-28 19:06:24.000000000 +0000 -+++ libdrm-2.4.5/libdrm/nouveau/Makefile.am 2009-02-28 19:06:33.000000000 +0000 -@@ -2,13 +2,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir)/libdrm \ - -I$(top_srcdir)/libdrm/nouveau \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/shared-core - - libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la - libdrm_nouveau_ladir = $(libdir) - libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_nouveau_la_LIBADD = ../libdrm.la - - libdrm_nouveau_la_SOURCES = \ - nouveau_device.c \ diff --git a/extra/nouveau-drm-lts/nouveau-drm.install b/extra/nouveau-drm-lts/nouveau-drm.install deleted file mode 100644 index 2aa581d47..000000000 --- a/extra/nouveau-drm-lts/nouveau-drm.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-2.6.32-lts' - depmod $(cat /lib/modules/$EXTRAMODULES/version) - echo "if you are running kms in early mode please rebuild your initrd" -} - -post_upgrade() { - post_install $1 - rmmod nouveau || echo 'In order to use the new nouveau module, exit Xserver and unload it manually.' -} - -post_remove() { - EXTRAMODULES='extramodules-2.6.32-lts' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} - diff --git a/extra/transcode/transcode-1.1.5-ffmpeg.patch b/extra/transcode/transcode-1.1.5-ffmpeg.patch deleted file mode 100644 index 86e8272e9..000000000 --- a/extra/transcode/transcode-1.1.5-ffmpeg.patch +++ /dev/null @@ -1,124 +0,0 @@ -Index: transcode-1.1.5/encode/encode_lavc.c -=================================================================== ---- transcode-1.1.5.orig/encode/encode_lavc.c -+++ transcode-1.1.5/encode/encode_lavc.c -@@ -955,8 +955,6 @@ static void tc_lavc_config_defaults(TCLa - /* - * context *transcode* (not libavcodec) defaults - */ -- pd->ff_vcontext.mb_qmin = 2; -- pd->ff_vcontext.mb_qmax = 31; - pd->ff_vcontext.max_qdiff = 3; - pd->ff_vcontext.max_b_frames = 0; - pd->ff_vcontext.me_range = 0; -@@ -1116,8 +1114,6 @@ static int tc_lavc_read_config(TCLavcPri - // handled by transcode core - // { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, - // handled by transcode core -- { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, -- { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, - { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, - { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, - { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, -Index: transcode-1.1.5/export/aud_aux.c -=================================================================== ---- transcode-1.1.5.orig/export/aud_aux.c -+++ transcode-1.1.5/export/aud_aux.c -@@ -347,7 +347,7 @@ static int tc_audio_init_ffmpeg(vob_t *v - //-- set parameters (bitrate, channels and sample-rate) -- - //-------------------------------------------------------- - memset(&mpa_ctx, 0, sizeof(mpa_ctx)); // default all -- mpa_ctx.codec_type = CODEC_TYPE_AUDIO; -+ mpa_ctx.codec_type = AVMEDIA_TYPE_AUDIO; - mpa_ctx.bit_rate = vob->mp3bitrate * 1000; // bitrate dest. - mpa_ctx.channels = vob->dm_chan; // channels - mpa_ctx.sample_rate = vob->a_rate; -Index: transcode-1.1.5/export/export_ffmpeg.c -=================================================================== ---- transcode-1.1.5.orig/export/export_ffmpeg.c -+++ transcode-1.1.5/export/export_ffmpeg.c -@@ -643,8 +643,6 @@ MOD_init - - lavc_venc_context->bit_rate = vob->divxbitrate * 1000; - lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000; -- lavc_venc_context->mb_qmin = lavc_param_mb_qmin; -- lavc_venc_context->mb_qmax = lavc_param_mb_qmax; - lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5); - lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5); - lavc_venc_context->max_qdiff = lavc_param_vqdiff; -Index: transcode-1.1.5/import/decode_lavc.c -=================================================================== ---- transcode-1.1.5.orig/import/decode_lavc.c -+++ transcode-1.1.5/import/decode_lavc.c -@@ -261,8 +261,12 @@ void decode_lavc(decode_t *decode) - - //tc_log_msg(__FILE__, "SIZE: (%d) MP4(%d) blen(%d) BUF(%d) read(%ld)", len, mp4_size, buf_len, READ_BUFFER_SIZE, bytes_read); - do { -- len = avcodec_decode_video(lavc_dec_context, &picture, -- &got_picture, buffer+buf_len, mp4_size-buf_len); -+ AVPacket pkt; -+ av_init_packet( &pkt ); -+ pkt.data = buffer+buf_len; -+ pkt.size = mp4_size-buf_len; -+ len = avcodec_decode_video2(lavc_dec_context, &picture, -+ &got_picture, &pkt); - - if (len < 0) { - tc_log_error(__FILE__, "frame decoding failed"); -Index: transcode-1.1.5/import/probe_ffmpeg.c -=================================================================== ---- transcode-1.1.5.orig/import/probe_ffmpeg.c -+++ transcode-1.1.5/import/probe_ffmpeg.c -@@ -47,7 +47,7 @@ static void translate_info(const AVForma - for (i = 0; i < ctx->nb_streams; i++) { - st = ctx->streams[i]; - -- if (st->codec->codec_type == CODEC_TYPE_VIDEO) { -+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { - info->bitrate = st->codec->bit_rate / 1000; - info->width = st->codec->width; - info->height = st->codec->height; -@@ -65,7 +65,7 @@ static void translate_info(const AVForma - for (i = 0; i < ctx->nb_streams; i++) { - st = ctx->streams[i]; - -- if (st->codec->codec_type == CODEC_TYPE_AUDIO -+ if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO - && j < TC_MAX_AUD_TRACKS) { - info->track[j].format = 0x1; /* known wrong */ - info->track[j].chan = st->codec->channels; -Index: transcode-1.1.5/export/ffmpeg_cfg.c -=================================================================== ---- transcode-1.1.5.orig/export/ffmpeg_cfg.c -+++ transcode-1.1.5/export/ffmpeg_cfg.c -@@ -34,8 +34,6 @@ int lavc_param_vme = 4; - //int lavc_param_vqscale = 0; - //int lavc_param_vqmin = 2; - //int lavc_param_vqmax = 31; --int lavc_param_mb_qmin = 2; --int lavc_param_mb_qmax = 31; - int lavc_param_lmin = 2; - int lavc_param_lmax = 31; - int lavc_param_vqdiff = 3; -@@ -140,8 +138,6 @@ TCConfigEntry lavcopts_conf[]={ - // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - // {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, -- {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, -- {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, - {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, - {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, - {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, -Index: transcode-1.1.5/export/ffmpeg_cfg.h -=================================================================== ---- transcode-1.1.5.orig/export/ffmpeg_cfg.h -+++ transcode-1.1.5/export/ffmpeg_cfg.h -@@ -13,8 +13,6 @@ extern int lavc_param_vme; - //extern int lavc_param_vqscale; - //extern int lavc_param_vqmin; - //extern int lavc_param_vqmax; --extern int lavc_param_mb_qmin; --extern int lavc_param_mb_qmax; - extern int lavc_param_lmin; - extern int lavc_param_lmax; - extern int lavc_param_vqdiff; diff --git a/extra/transcode/transcode-1.1.5-jpeg-7.patch b/extra/transcode/transcode-1.1.5-jpeg-7.patch deleted file mode 100644 index 288932a61..000000000 --- a/extra/transcode/transcode-1.1.5-jpeg-7.patch +++ /dev/null @@ -1,16 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=294488 - -Patch by: Salah Coronya - -Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore. - ---- export/export_jpg.c -+++ export/export_jpg.c -@@ -91,6 +91,7 @@ - - jpeg_set_quality(&encinfo, quality, TRUE); - encinfo.raw_data_in = TRUE; -+ encinfo.do_fancy_downsampling = FALSE; - encinfo.in_color_space = JCS_YCbCr; - - encinfo.comp_info[0].h_samp_factor = 2; diff --git a/extra/transcode/transcode-1.1.5-mpa.patch b/extra/transcode/transcode-1.1.5-mpa.patch deleted file mode 100644 index e7fb0fc1c..000000000 --- a/extra/transcode/transcode-1.1.5-mpa.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- transcode-1.1.5-old/export/aud_aux.c 2010-07-04 12:44:31.867550180 -0500 -+++ transcode-1.1.5/export/aud_aux.c 2010-07-04 13:41:01.253292529 -0500 -@@ -347,6 +347,7 @@ - //-- set parameters (bitrate, channels and sample-rate) -- - //-------------------------------------------------------- - memset(&mpa_ctx, 0, sizeof(mpa_ctx)); // default all -+ mpa_ctx.codec_type = CODEC_TYPE_AUDIO; - mpa_ctx.bit_rate = vob->mp3bitrate * 1000; // bitrate dest. - mpa_ctx.channels = vob->dm_chan; // channels - mpa_ctx.sample_rate = vob->a_rate; diff --git a/extra/valgrind/glibc-patch-version.patch b/extra/valgrind/glibc-patch-version.patch deleted file mode 100644 index 2c6830aef..000000000 --- a/extra/valgrind/glibc-patch-version.patch +++ /dev/null @@ -1,52 +0,0 @@ -Saves having to rebuild valgrind on glibc-x.x.* patch level releases - -diff -Naur valgrind-3.5.0-old//glibc-2.X.supp.in valgrind-3.5.0/glibc-2.X.supp.in ---- valgrind-3.5.0-old//glibc-2.X.supp.in 2009-08-19 23:37:48.000000000 +1000 -+++ valgrind-3.5.0/glibc-2.X.supp.in 2010-05-22 19:43:08.088007038 +1000 -@@ -168,9 +168,9 @@ - Memcheck:Param - socketcall.sendto(msg) - fun:__sendto_nocancel -- obj:/*libc-@GLIBC_VERSION@.so -- obj:/*libc-@GLIBC_VERSION@.so -- obj:/*libc-@GLIBC_VERSION@.so -+ obj:/*libc-@GLIBC_VERSION@*.so -+ obj:/*libc-@GLIBC_VERSION@*.so -+ obj:/*libc-@GLIBC_VERSION@*.so - } - { - glibc24-64bit-padding-1c -@@ -180,7 +180,7 @@ - fun:__nscd_get_map_ref - fun:nscd_get*_r - fun:*nscd* -- obj:/*libc-@GLIBC_VERSION@.so -+ obj:/*libc-@GLIBC_VERSION@*.so - } - - -@@ -199,18 +199,18 @@ - Memcheck:Param - socketcall.sendto(msg) - fun:send -- obj:/*libc-@GLIBC_VERSION@.so -- obj:/*libc-@GLIBC_VERSION@.so -- obj:/*libc-@GLIBC_VERSION@.so -+ obj:/*libc-@GLIBC_VERSION@*.so -+ obj:/*libc-@GLIBC_VERSION@*.so -+ obj:/*libc-@GLIBC_VERSION@*.so - } - { - X11-64bit-padding-4b - Memcheck:Param - socketcall.send(msg) - fun:send -- obj:/*libc-@GLIBC_VERSION@.so -- obj:/*libc-@GLIBC_VERSION@.so -- obj:/*libc-@GLIBC_VERSION@.so -+ obj:/*libc-@GLIBC_VERSION@*.so -+ obj:/*libc-@GLIBC_VERSION@*.so -+ obj:/*libc-@GLIBC_VERSION@*.so - } - - ##----------------------------------------------------------------------## diff --git a/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch b/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch deleted file mode 100644 index 7fd217016..000000000 --- a/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- valgrind/configure.in.jj 2010-10-21 03:14:02.000000000 +0200 -+++ valgrind/configure.in 2010-11-05 17:09:18.674455299 +0100 -@@ -749,6 +759,13 @@ case "${GLIBC_VERSION}" in - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.14) -+ AC_MSG_RESULT(2.14 family) -+ AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - aix5) - AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3) - AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3]) -@@ -762,7 +779,7 @@ case "${GLIBC_VERSION}" in - - *) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14]) - AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) - AC_MSG_ERROR([or Darwin libc]) - ;; ---- valgrind/config.h.in.jj 2010-10-20 22:20:49.000000000 +0200 -+++ valgrind/config.h.in 2010-11-05 17:08:33.863454886 +0100 -@@ -33,6 +33,9 @@ - /* Define to 1 if you're using glibc 2.13.x */ - #undef GLIBC_2_13 - -+/* Define to 1 if you're using glibc 2.14.x */ -+#undef GLIBC_2_14 -+ - /* Define to 1 if you're using glibc 2.2.x */ - #undef GLIBC_2_2 - ---- valgrind/configure.jj 2010-10-21 03:16:18.000000000 +0200 -+++ valgrind/configure 2010-11-05 17:09:39.163455396 +0100 -@@ -6367,6 +6389,18 @@ $as_echo "#define GLIBC_2_13 1" >>confde - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.14) -+ echo "$as_me:$LINENO: result: 2.14 family" >&5 -+echo "${ECHO_T}2.14 family" >&6 -+ -+cat >>confdefs.h <<\_ACEOF -+#define GLIBC_2_14 1 -+_ACEOF -+ -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - aix5) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: AIX 5.1 or 5.2 or 5.3" >&5 - $as_echo "AIX 5.1 or 5.2 or 5.3" >&6; } -@@ -6387,7 +6421,7 @@ $as_echo "#define DARWIN_LIBC 1" >>confd - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 - $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } -- as_fn_error "Valgrind requires glibc version 2.2 - 2.13" "$LINENO" 5 -+ as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5 - as_fn_error "or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" "$LINENO" 5 - as_fn_error "or Darwin libc" "$LINENO" 5 - ;; diff --git a/extra/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch b/extra/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch deleted file mode 100644 index 4b6ba9e35..000000000 --- a/extra/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- m4/optimizations.m4.orig 2005-11-27 01:20:08.000000000 +0100 -+++ m4/optimizations.m4 2005-11-27 01:22:56.000000000 +0100 -@@ -161,10 +161,6 @@ - ;; - - esac -- if test x"$archopt_val" != x; then -- CFLAGS="$sarchopt=$archopt_val $CFLAGS" -- DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS" -- fi - fi - else - dnl we have the Intel compiler diff --git a/extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch b/extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch deleted file mode 100644 index 6817aa989..000000000 --- a/extra/xine-lib/xine-lib-1.1.19-ffmpeg.patch +++ /dev/null @@ -1,380 +0,0 @@ -diff -r 717450d734f7 src/combined/ffmpeg/ff_audio_decoder.c ---- a/src/combined/ffmpeg/ff_audio_decoder.c Mon May 16 15:49:02 2011 +0100 -+++ b/src/combined/ffmpeg/ff_audio_decoder.c Mon May 16 19:46:49 2011 -0400 -@@ -46,6 +46,12 @@ - - #define AUDIOBUFSIZE (64 * 1024) - -+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) -+# define AVAUDIO 3 -+#else -+# define AVAUDIO 2 -+#endif -+ - typedef struct { - audio_decoder_class_t decoder_class; - } ff_audio_class_t; -@@ -255,6 +261,9 @@ - buf->decoder_info[2]); - - } else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) { -+#if AVAUDIO > 2 -+ AVPacket avpkt; -+#endif - - if( !this->decoder_ok ) { - if ( ! this->context || ! this->codec ) { -@@ -286,11 +295,21 @@ - if (!this->output_open) { - if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) { - decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; -+#if AVAUDIO > 2 -+ av_init_packet (&avpkt); -+ avpkt.data = (uint8_t *)&this->buf[0]; -+ avpkt.size = this->size; -+ avpkt.flags = AV_PKT_FLAG_KEY; -+ avcodec_decode_audio3 (this->context, -+ (int16_t *)this->decode_buffer, -+ &decode_buffer_size, &avpkt); -+#else - avcodec_decode_audio2 (this->context, - (int16_t *)this->decode_buffer, - &decode_buffer_size, - &this->buf[0], - this->size); -+#endif - this->audio_bits = this->context->bits_per_sample; - this->audio_sample_rate = this->context->sample_rate; - this->audio_channels = this->context->channels; -@@ -311,12 +330,21 @@ - offset = 0; - while (this->size>0) { - decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; -+#if AVAUDIO > 2 -+ av_init_packet (&avpkt); -+ avpkt.data = (uint8_t *)&this->buf[offset]; -+ avpkt.size = this->size; -+ avpkt.flags = AV_PKT_FLAG_KEY; -+ bytes_consumed = avcodec_decode_audio3 (this->context, -+ (int16_t *)this->decode_buffer, -+ &decode_buffer_size, &avpkt); -+#else - bytes_consumed = avcodec_decode_audio2 (this->context, - (int16_t *)this->decode_buffer, - &decode_buffer_size, - &this->buf[offset], - this->size); -- -+#endif - if (bytes_consumed<0) { - xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, - "ffmpeg_audio_dec: error decompressing audio frame\n"); -diff -r 717450d734f7 src/combined/ffmpeg/ff_video_decoder.c ---- a/src/combined/ffmpeg/ff_video_decoder.c Mon May 16 15:49:02 2011 +0100 -+++ b/src/combined/ffmpeg/ff_video_decoder.c Mon May 16 19:46:49 2011 -0400 -@@ -58,6 +58,14 @@ - - #define ENABLE_DIRECT_RENDERING - -+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) -+# define AVVIDEO 2 -+#else -+# define AVVIDEO 1 -+# define pp_context pp_context_t -+# define pp_mode pp_mode_t -+#endif -+ - /* reordered_opaque appeared in libavcodec 51.68.0 */ - #define AVCODEC_HAS_REORDERED_OPAQUE - #if LIBAVCODEC_VERSION_INT < 0x334400 -@@ -116,8 +124,8 @@ - - int pp_quality; - int pp_flags; -- pp_context_t *pp_context; -- pp_mode_t *pp_mode; -+ pp_context *our_context; -+ pp_mode *our_mode; - - /* mpeg-es parsing */ - mpeg_parser_t *mpeg_parser; -@@ -444,23 +452,23 @@ - this->pp_quality = this->class->pp_quality; - - if(this->pp_available && this->pp_quality) { -- if(!this->pp_context && this->context) -- this->pp_context = pp_get_context(this->context->width, this->context->height, -+ if(!this->our_context && this->context) -+ this->our_context = pp_get_context(this->context->width, this->context->height, - this->pp_flags); -- if(this->pp_mode) -- pp_free_mode(this->pp_mode); -+ if(this->our_mode) -+ pp_free_mode(this->our_mode); - -- this->pp_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a", -+ this->our_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a", - this->pp_quality); - } else { -- if(this->pp_mode) { -- pp_free_mode(this->pp_mode); -- this->pp_mode = NULL; -+ if(this->our_mode) { -+ pp_free_mode(this->our_mode); -+ this->our_mode = NULL; - } - -- if(this->pp_context) { -- pp_free_context(this->pp_context); -- this->pp_context = NULL; -+ if(this->our_context) { -+ pp_free_context(this->our_context); -+ this->our_context = NULL; - } - } - } -@@ -1055,12 +1063,26 @@ - } - - /* skip decoding b frames if too late */ -+#if AVVIDEO > 1 -+ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT; -+#else - this->context->hurry_up = (this->skipframes > 0); -+#endif - - lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size); -+#if AVVIDEO > 1 -+ AVPacket avpkt; -+ av_init_packet(&avpkt); -+ avpkt.data = (uint8_t *)this->mpeg_parser->chunk_buffer; -+ avpkt.size = this->mpeg_parser->buffer_size; -+ avpkt.flags = AV_PKT_FLAG_KEY; -+ len = avcodec_decode_video2 (this->context, this->av_frame, -+ &got_picture, &avpkt); -+#else - len = avcodec_decode_video (this->context, this->av_frame, - &got_picture, this->mpeg_parser->chunk_buffer, - this->mpeg_parser->buffer_size); -+#endif - lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n", - len, got_picture); - len = current - buf->content - offset; -@@ -1112,7 +1134,13 @@ - - } else { - -- if (this->context->hurry_up) { -+ if ( -+#if AVVIDEO > 1 -+ this->context->skip_frame != AVDISCARD_DEFAULT -+#else -+ this->context->hurry_up -+#endif -+ ) { - /* skipped frame, output a bad frame */ - img = this->stream->video_out->get_frame (this->stream->video_out, - this->bih.biWidth, -@@ -1304,13 +1332,25 @@ - got_picture = 0; - } else { - /* skip decoding b frames if too late */ -+#if AVVIDEO > 1 -+ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT; -+#else - this->context->hurry_up = (this->skipframes > 0); -- -+#endif - lprintf("buffer size: %d\n", this->size); -+#if AVVIDEO > 1 -+ AVPacket avpkt; -+ av_init_packet(&avpkt); -+ avpkt.data = (uint8_t *)&chunk_buf[offset]; -+ avpkt.size = this->size; -+ avpkt.flags = AV_PKT_FLAG_KEY; -+ len = avcodec_decode_video2 (this->context, this->av_frame, -+ &got_picture, &avpkt); -+#else - len = avcodec_decode_video (this->context, this->av_frame, - &got_picture, &chunk_buf[offset], - this->size); -- -+#endif - #ifdef AVCODEC_HAS_REORDERED_OPAQUE - /* reset consumed pts value */ - this->context->reordered_opaque = ff_tag_pts(this, 0); -@@ -1432,7 +1472,7 @@ - img->base, img->pitches, - img->width, img->height, - this->av_frame->qscale_table, this->av_frame->qstride, -- this->pp_mode, this->pp_context, -+ this->our_mode, this->our_context, - this->av_frame->pict_type); - - } else if (!this->av_frame->opaque) { -@@ -1676,11 +1716,11 @@ - free(this->buf); - this->buf = NULL; - -- if(this->pp_context) -- pp_free_context(this->pp_context); -+ if(this->our_context) -+ pp_free_context(this->our_context); - -- if(this->pp_mode) -- pp_free_mode(this->pp_mode); -+ if(this->our_mode) -+ pp_free_mode(this->our_mode); - - mpeg_parser_dispose(this->mpeg_parser); - -@@ -1721,8 +1761,8 @@ - this->aspect_ratio = 0; - - this->pp_quality = 0; -- this->pp_context = NULL; -- this->pp_mode = NULL; -+ this->our_context = NULL; -+ this->our_mode = NULL; - - this->mpeg_parser = NULL; - -diff -r 717450d734f7 src/post/planar/pp.c ---- a/src/post/planar/pp.c Mon May 16 15:49:02 2011 +0100 -+++ b/src/post/planar/pp.c Mon May 16 19:46:49 2011 -0400 -@@ -35,6 +35,12 @@ - # include <libpostproc/postprocess.h> - #endif - -+#if LIBPOSTPROC_VERSION_MAJOR < 52 -+# define pp_context pp_context_t -+# define pp_mode pp_mode_t -+# define PP_PARAMETERS_T -+#endif -+ - #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */ - - /* plugin class initialization function */ -@@ -76,14 +82,15 @@ - - /* libpostproc specific stuff */ - int pp_flags; -- pp_context_t *pp_context; -- pp_mode_t *pp_mode; -+ pp_context *our_context; -+ pp_mode *our_mode; - - pthread_mutex_t lock; - }; - - - static int set_parameters (xine_post_t *this_gen, void *param_gen) { -+#ifdef PP_PARAMETERS_T - post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen; - pp_parameters_t *param = (pp_parameters_t *)param_gen; - -@@ -92,17 +99,18 @@ - memcpy( &this->params, param, sizeof(pp_parameters_t) ); - - pthread_mutex_unlock (&this->lock); -- -+#endif - return 1; - } - - static int get_parameters (xine_post_t *this_gen, void *param_gen) { -+#ifdef PP_PARAMETERS_T - post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen; - pp_parameters_t *param = (pp_parameters_t *)param_gen; - - - memcpy( param, &this->params, sizeof(pp_parameters_t) ); -- -+#endif - return 1; - } - -@@ -202,8 +210,8 @@ - if(cpu_caps & MM_ACCEL_X86_3DNOW) - this->pp_flags |= PP_CPU_CAPS_3DNOW; - -- this->pp_mode = NULL; -- this->pp_context = NULL; -+ this->our_mode = NULL; -+ this->our_context = NULL; - - pthread_mutex_init (&this->lock, NULL); - -@@ -248,13 +256,13 @@ - post_plugin_pp_t *this = (post_plugin_pp_t *)this_gen; - - if (_x_post_dispose(this_gen)) { -- if(this->pp_mode) { -- pp_free_mode(this->pp_mode); -- this->pp_mode = NULL; -+ if(this->our_mode) { -+ pp_free_mode(this->our_mode); -+ this->our_mode = NULL; - } -- if(this->pp_context) { -- pp_free_context(this->pp_context); -- this->pp_context = NULL; -+ if(this->our_context) { -+ pp_free_context(this->our_context); -+ this->our_context = NULL; - } - free(this); - } -@@ -304,7 +312,7 @@ - - pthread_mutex_lock (&this->lock); - -- if( !this->pp_context || -+ if( !this->our_context || - this->frame_width != yv12_frame->width || - this->frame_height != yv12_frame->height ) { - -@@ -312,32 +320,32 @@ - this->frame_height = yv12_frame->height; - pp_flags = this->pp_flags; - -- if(this->pp_context) -- pp_free_context(this->pp_context); -+ if(this->our_context) -+ pp_free_context(this->our_context); - -- this->pp_context = pp_get_context(frame->width, frame->height, pp_flags); -+ this->our_context = pp_get_context(frame->width, frame->height, pp_flags); - -- if(this->pp_mode) { -- pp_free_mode(this->pp_mode); -- this->pp_mode = NULL; -+ if(this->our_mode) { -+ pp_free_mode(this->our_mode); -+ this->our_mode = NULL; - } - } - -- if(!this->pp_mode) -- this->pp_mode = pp_get_mode_by_name_and_quality(this->params.mode, -+ if(!this->our_mode) -+ this->our_mode = pp_get_mode_by_name_and_quality(this->params.mode, - this->params.quality); - -- if(this->pp_mode) -+ if(this->our_mode) - pp_postprocess(yv12_frame->base, yv12_frame->pitches, - out_frame->base, out_frame->pitches, - (frame->width+7)&(~7), frame->height, - NULL, 0, -- this->pp_mode, this->pp_context, -+ this->our_mode, this->our_context, - 0 /*this->av_frame->pict_type*/); - - pthread_mutex_unlock (&this->lock); - -- if(this->pp_mode) { -+ if(this->our_mode) { - skip = out_frame->draw(out_frame, stream); - _x_post_frame_copy_up(frame, out_frame); - } else { diff --git a/extra/xine-lib/xine-lib-1.1.19-xvmc.patch b/extra/xine-lib/xine-lib-1.1.19-xvmc.patch deleted file mode 100644 index bef8b0bac..000000000 --- a/extra/xine-lib/xine-lib-1.1.19-xvmc.patch +++ /dev/null @@ -1,17 +0,0 @@ -Quoting ChangeLog of X11's videoproto package: -vldXvMC.h: stop uselessly including XvMClib.h - ---- src/video_out/xxmc.h -+++ src/video_out/xxmc.h -@@ -77,10 +77,10 @@ - #include <X11/extensions/XShm.h> - #include <X11/extensions/Xv.h> - #include <X11/extensions/Xvlib.h> -+#include <X11/extensions/XvMClib.h> - #ifdef HAVE_VLDXVMC - #include <X11/extensions/vldXvMC.h> - #else -- #include <X11/extensions/XvMClib.h> - #include <X11/extensions/XvMC.h> - #endif - diff --git a/staging/kadu/PKGBUILD b/staging/kadu/PKGBUILD deleted file mode 100644 index 9f3f341ab..000000000 --- a/staging/kadu/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 57137 2011-10-22 11:15:09Z bpiotrowski $ -# Maintainer: Mateusz Herych -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> - -pkgname=kadu -pkgver=0.10.1 -pkgrel=2 -pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" -arch=('i686' 'x86_64') -url="http://www.kadu.net/" -license=('GPL') -depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit') -makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') -source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('6211a9a9e02d645268cbf055892601a0') - -build() { - cd $srcdir/kadu-$pkgver - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/kadu-$pkgver - make DESTDIR=$pkgdir install - rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig} - rm -rf $pkgdir/usr/share/kadu/{HISTORY,README} -} diff --git a/testing/aisleriot/PKGBUILD b/testing/aisleriot/PKGBUILD deleted file mode 100644 index 7e0cb0321..000000000 --- a/testing/aisleriot/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 142800 2011-11-15 14:17:38Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -pkgname=aisleriot -pkgver=3.2.2 -pkgrel=1 -pkgdesc="GNOME Solitaire card games" -arch=(i686 x86_64) -license=(GPL) -url="http://www.gnome.org" -groups=('gnome-extra') -depends=(libsm gconf guile libcanberra librsvg hicolor-icon-theme dconf) -makedepends=(gnome-doc-utils intltool itstool) -options=('!emptydirs' '!libtool') -install=aisleriot.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('818e16767f30238a98332fe07e8b905376a71de05feb3de19815652a48fdfcca') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain aisleriot ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/aisleriot/aisleriot.install b/testing/aisleriot/aisleriot.install deleted file mode 100644 index 713506dba..000000000 --- a/testing/aisleriot/aisleriot.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - usr/sbin/gconfpkg --install aisleriot -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall aisleriot -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -f -t usr/share/icons/hicolor -} diff --git a/testing/alex/PKGBUILD b/testing/alex/PKGBUILD deleted file mode 100644 index b11156af0..000000000 --- a/testing/alex/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 128111 2011-06-22 10:56:28Z vesa $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Philip Nilsson <pnilsson@nullref.se> - -pkgname=alex -pkgver=2.3.5 -pkgrel=1.3 -pkgdesc='a lexical analyser generator for Haskell' -arch=('i686' 'x86_64') -url='http://www.haskell.org/alex/' -license=('custom:BSD3') -depends=('gmp') -makedepends=('ghc=7.0.3') -source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") - -build() { - cd $srcdir/$pkgname-$pkgver - runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname - runghc Setup.lhs build -} - -package() { - cd $srcdir/$pkgname-$pkgver - runghc Setup.lhs copy --destdir=$pkgdir - install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3 - - # doc/ contains only license which already installed into proper place - rm -rf $pkgdir/usr/share/doc -} -md5sums=('5e08c688ded0dcff98eaad6fc03a9402') diff --git a/testing/cabal-install/PKGBUILD b/testing/cabal-install/PKGBUILD deleted file mode 100644 index 0529e034c..000000000 --- a/testing/cabal-install/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -pkgname=cabal-install -pkgver=0.10.2 -pkgrel=1.1 -pkgdesc="The command-line interface for Cabal and Hackage." -url="http://hackage.haskell.org/package/cabal-install" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=('ghc=7.0.3' 'haskell-http>=4000.1.1' 'haskell-zlib') -depends=('gmp' zlib) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz) - -build() { - cd $srcdir/cabal-install-$pkgver - runhaskell Setup configure --enable-shared --enable-split-objs --enable-executable-stripping --prefix=/usr - runhaskell Setup build -} - -package() { - cd $srcdir/cabal-install-$pkgver - runhaskell Setup copy --destdir=$pkgdir - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} - -md5sums=('bc906ef0bed79cbb33fdb36b73514281') diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD deleted file mode 100644 index 0e40bfe8e..000000000 --- a/testing/curl/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 142904 2011-11-17 21:30:16Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=curl -pkgver=7.23.1 -pkgrel=1 -pkgdesc="An URL retrival utility and library" -arch=('i686' 'x86_64') -url="http://curl.haxx.se" -license=('MIT') -depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') -makedepends=('perl-libwww') -options=('!libtool') -source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - curlbuild.h) -md5sums=('8e23151f569fb54afef093ac0695077d' - '5d8eb7e2e38be0fb00a043f714f6d49f' - '751bd433ede935c8fae727377625a8ae') - -ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') -case $ptrsize in - 8) _curlbuild=curlbuild-64.h ;; - 4) _curlbuild=curlbuild-32.h ;; - *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" - exit 1 - ;; -esac - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --disable-dependency-tracking \ - --disable-ldap \ - --disable-ldaps \ - --enable-ipv6 \ - --enable-manual \ - --enable-versioned-symbols \ - --enable-threaded-resolver \ - --without-libidn \ - --with-random=/dev/urandom \ - --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - # license - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - - # devel - install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4" - mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" - install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" -} diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h deleted file mode 100644 index b48862696..000000000 --- a/testing/curl/curlbuild.h +++ /dev/null @@ -1,9 +0,0 @@ -#include <bits/wordsize.h> - -#if __WORDSIZE == 32 -#include "curlbuild-32.h" -#elif __WORDSIZE == 64 -#include "curlbuild-64.h" -#else -#error "Unknown word size" -#endif diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD deleted file mode 100644 index e110edd83..000000000 --- a/testing/empathy/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 142759 2011-11-14 21:14:45Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=empathy -pkgver=3.2.2 -pkgrel=1 -pkgdesc="A GNOME instant messaging client using the Telepathy framework." -arch=('i686' 'x86_64') -url="http://live.gnome.org/Empathy" -license=('GPL2') -depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring' -'libcanberra' 'iso-codes' 'networkmanager') -makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto') -optdepends=('telepathy-gabble: XMPP/Jabber support' - 'telepathy-butterfly: MSN support' - 'telepathy-idle: IRC support' - 'telepathy-salut: Link-local XMPP support' - 'telepathy-sofiasip: SIP support' - 'telepathy-haze: libpurple support') -options=('!libtool') -groups=('gnome-extra') -install=empathy.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('d6a391b801f58024ed6f97d9bf4e774b9ab9e1262d79aefb5c1dd95233fd5aa1') - -build() { - cd "$srcdir/$pkgname-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/empathy \ - --disable-static \ - --disable-scrollkeeper \ - --disable-schemas-compile - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/testing/empathy/empathy.install b/testing/empathy/empathy.install deleted file mode 100644 index c3f7abf13..000000000 --- a/testing/empathy/empathy.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - echo "To use Empathy you need to install at least one Telepathy connection manager." -} - -post_upgrade() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/testing/eog/PKGBUILD b/testing/eog/PKGBUILD deleted file mode 100644 index dc1d2fd08..000000000 --- a/testing/eog/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 142770 2011-11-14 21:40:57Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=eog -pkgver=3.2.2 -pkgrel=1 -pkgdesc="Eye of Gnome: An image viewing and cataloging program" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf') -makedepends=('gtk-doc' 'intltool') -install=eog.install -groups=('gnome-extra') -options=('!emptydirs' '!libtool') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('315625babf04293341bd0b3ae26337d11c8696422d5dc4442ad551b25db42530') - -build() { - cd "$srcdir/$pkgname-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - # remove it from Xfce menu that ships its own thingy - echo "NotShowIn=XFCE" >> $pkgdir/usr/share/applications/eog.desktop -} diff --git a/testing/eog/eog.install b/testing/eog/eog.install deleted file mode 100644 index 284b24b18..000000000 --- a/testing/eog/eog.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall eog - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/eventlog/ChangeLog b/testing/eventlog/ChangeLog deleted file mode 100644 index 1c139bdf5..000000000 --- a/testing/eventlog/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -2011-11-02 Andrea Scarpino <andrea@archlinux.org> - - * Sign package - -2011-04-05 Stéphane Gaudreault <stephane@archlinux.org> - - * Rebuild of old package - * Tidy up PKGBUILD - -2010-07-10 Dan McGee <dan@archlinux.org> - - * Updated PKGBUILD to be in line with standard style - * Upstream update - -2009-01-03 Eric Belanger <eric@archlinux.org> - - * eventlog 0.2.9-1 - * Upstream update - * Added ChangeLog diff --git a/testing/eventlog/PKGBUILD b/testing/eventlog/PKGBUILD deleted file mode 100644 index b7d096e79..000000000 --- a/testing/eventlog/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 141891 2011-11-02 20:06:46Z andrea $ -# Maintainer: -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> - -pkgname=eventlog -pkgver=0.2.12 -pkgrel=3 -pkgdesc="API to format and send structured log messages" -arch=('i686' 'x86_64') -url="http://www.balabit.com/support/community/products/" -license=('BSD') -depends=('glibc') -options=('!libtool') -changelog=ChangeLog -source=("http://www.balabit.com/downloads/files/${pkgname}/${pkgver%.*}/${pkgname}_${pkgver}.tar.gz") -sha1sums=('3e35a634e7de029ab9d36995a085bfcb00ed6a4d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING \ - "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/testing/evolution-data-server/PKGBUILD b/testing/evolution-data-server/PKGBUILD deleted file mode 100644 index 1975c38be..000000000 --- a/testing/evolution-data-server/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 142742 2011-11-14 12:31:16Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=evolution-data-server -pkgver=3.2.2 -pkgrel=1 -pkgdesc="Centralized access to appointments and contacts" -arch=('i686' 'x86_64') -depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') -makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala') -options=('!libtool') -url="http://www.gnome.org" -license=('GPL') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2a129b4c9412b8b855ce28bd682e522b3af0309e407f9d900f1d48be649bc76a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --with-openldap=yes \ - --libexecdir=/usr/lib/evolution-data-server \ - --with-krb5=/usr --with-libdb=/usr \ - --enable-vala-bindings - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/evolution-ews/PKGBUILD b/testing/evolution-ews/PKGBUILD deleted file mode 100644 index dfe853955..000000000 --- a/testing/evolution-ews/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 142748 2011-11-14 13:31:05Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=evolution-ews -pkgver=3.2.2 -pkgrel=1 -pkgdesc="MS Exchange integration through Exchange Web Services" -arch=('i686' 'x86_64') -license=('LGPL2.1') -url="http://www.gnome.org" -depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') -makedepends=('intltool' 'evolution') -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f6a557a93e632e19cde1501f6f0540f67e41c193120d7297268662ddc7927439') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/evolution --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/testing/evolution/PKGBUILD b/testing/evolution/PKGBUILD deleted file mode 100644 index 599ce0284..000000000 --- a/testing/evolution/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 142744 2011-11-14 13:03:36Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=evolution -pkgver=3.2.2 -pkgrel=1 -pkgdesc="Manage your email, contacts and schedule" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils' 'networkmanager') -optdepends=('bogofilter: possible junk filter plugin' - 'spamassassin: possible junk filter plugin') -groups=('gnome-extra') -options=('!libtool' '!emptydirs') -install=evolution.install -url=http://www.gnome.org/projects/evolution/ -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('03c68242bbf494dda3bf34f52ec843c282c9bb07f9415a69fe58237c7efbbe7d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib \ - --disable-scrollkeeper \ - --enable-nss=yes \ - --with-openldap=yes \ - --enable-smime=yes \ - --with-krb5=/usr \ - --disable-image-inline - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - make - make -C plugins/tnef-attachments -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - make -C plugins/tnef-attachments DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-3.2 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/evolution/evolution.install b/testing/evolution/evolution.install deleted file mode 100644 index a2c3aaa54..000000000 --- a/testing/evolution/evolution.install +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=evolution - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/testing/gedit/PKGBUILD b/testing/gedit/PKGBUILD deleted file mode 100644 index 76b4571ad..000000000 --- a/testing/gedit/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 142821 2011-11-15 17:49:57Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gedit -pkgver=3.2.3 -pkgrel=1 -pkgdesc="A text editor for GNOME" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf') -makedepends=('gnome-doc-utils' 'intltool') -groups=('gnome-extra') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -install=gedit.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9db009de74874846edadc0f4a7dc0127a4272cff4348a13544c611cc3696b751') - -build() { - cd "$srcdir/$pkgname-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib --disable-scrollkeeper \ - --disable-updater --disable-schemas-compile \ - --enable-python - make -} - -package(){ - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/testing/gedit/gedit.install b/testing/gedit/gedit.install deleted file mode 100644 index 9d88a1341..000000000 --- a/testing/gedit/gedit.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/gedit.schemas ]; then - usr/sbin/gconfpkg --uninstall gedit - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/gnome-keyring/PKGBUILD b/testing/gnome-keyring/PKGBUILD deleted file mode 100644 index 2e1ceae52..000000000 --- a/testing/gnome-keyring/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -#$Id: PKGBUILD 142736 2011-11-14 11:27:00Z ibiru $ -# Maintainer: Jan De Groot <jgc@archlinux.org> - -pkgname=gnome-keyring -pkgver=3.2.2 -pkgrel=1 -pkgdesc="GNOME Password Management daemon" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -depends=('gtk3' 'dconf' 'libgcrypt' 'libcap-ng' 'p11-kit' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'python2') -groups=('gnome') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -install=gnome-keyring.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-keyring \ - --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs \ - --disable-schemas-compile --disable-update-mime - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gnome-keyring/gnome-keyring.install b/testing/gnome-keyring/gnome-keyring.install deleted file mode 100644 index e899ab5a2..000000000 --- a/testing/gnome-keyring/gnome-keyring.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-mime-database /usr/share/mime 1> /dev/null - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-desktop-database -q - setcap cap_ipc_lock=ep /usr/bin/gnome-keyring-daemon -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/gtkhtml4/PKGBUILD b/testing/gtkhtml4/PKGBUILD deleted file mode 100644 index 940cee589..000000000 --- a/testing/gtkhtml4/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 142738 2011-11-14 12:15:43Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gtkhtml4 -_pkgbasename=gtkhtml -pkgver=4.2.2 -pkgrel=1 -pkgdesc="A lightweight HTML renderer/editor widget for GTK3" -arch=(i686 x86_64) -license=('GPL') -depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup') -makedepends=('intltool') -url="http://www.gnome.org" -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('e20bb5d461e9ae9d3a8d4e13d544db1813707810ded7cbde9287485f2394dd2c') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gtkhtml4 \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gucharmap/PKGBUILD b/testing/gucharmap/PKGBUILD deleted file mode 100644 index 76c83e764..000000000 --- a/testing/gucharmap/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 142755 2011-11-14 19:44:44Z ibiru $ -# Maintainer: Jan De Groot <jgc@archlinux.org> - -pkgname=gucharmap -pkgver=3.2.2 -pkgrel=1 -pkgdesc="Gnome Unicode Charmap" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org" -depends=('gconf' 'hicolor-icon-theme') -makedepends=('gtk-doc' 'intltool' 'gobject-introspection') -options=('!libtool' '!emptydirs') -install=gucharmap.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('da1e422d387ff4df8bfb61e8a340483f88b0d23e4309a776848dbeb4093a5a21') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --disable-scrollkeeper --enable-introspection - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gucharmap $pkgdir/etc/gconf/schemas/*.schemas - rm -f $pkgdir/etc/gconf/schemas/*.schemas -} diff --git a/testing/gucharmap/gucharmap.install b/testing/gucharmap/gucharmap.install deleted file mode 100644 index 4de3253f6..000000000 --- a/testing/gucharmap/gucharmap.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=gucharmap - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/testing/happy/PKGBUILD b/testing/happy/PKGBUILD deleted file mode 100644 index d5303e80e..000000000 --- a/testing/happy/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 128129 2011-06-22 11:27:01Z vesa $ -# Maintainer: simo <simo@archlinux.org> -# Contributor: Vesa Kaihlavirta <vegai@iki.fi> - -pkgname=happy -pkgver=1.18.6 -pkgrel=1.2 -pkgdesc="The Parser Generator for Haskell" -url="http://www.haskell.org/happy/" -arch=('i686' 'x86_64') -license=("custom:BSD3") -depends=(gmp) -makedepends=(ghc=7.0.3 haskell-mtl=2.0.1.0) -options=(strip) -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('7d4d1425f5068633cd477a2b2216880d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - runhaskell Setup.lhs configure -O --prefix=/usr - runhaskell Setup.lhs build -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - runhaskell Setup.lhs copy --destdir="${pkgdir}" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - diff --git a/testing/heirloom-mailx/PKGBUILD b/testing/heirloom-mailx/PKGBUILD deleted file mode 100644 index eaa3bdddc..000000000 --- a/testing/heirloom-mailx/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 142042 2011-11-04 20:49:22Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com> -# Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de> - -pkgname=heirloom-mailx -pkgver=12.5 -pkgrel=3 -pkgdesc="A commandline utility for sending and receiving email" -arch=('i686' 'x86_64') -url="http://heirloom.sourceforge.net/mailx.html" -license=('custom') -groups=('base') -depends=('openssl' 'krb5') -optdepends=('smtp-forwarder: for sending mail') -replaces=('mailx' 'mailx-heirloom') -provides=('mailx' 'mailx-heirloom') -conflicts=('mailx' 'mailx-heirloom') -backup=(etc/mail.rc) -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('1998dd6168a68400e533712ae7163c72b6a7c056') -options=('!makeflags') # Does not build with MAKEFLAGS=-jX, X>1 - -# source PKGBUILD && mksource -mksource() { - export CVSROOT=:pserver:anonymous@nail.cvs.sourceforge.net:/cvsroot/nail - D=nail - [ -d "${D}" ] && cvs up "${D}" || cvs co "${D}" - - _dirname=${pkgname}-${pkgver} - mv $D ${_dirname} - tar -cJv --exclude=CVS -f ${_dirname}.tar.xz ${_dirname} - rm -rf ${_dirname} -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i 's|/etc/nail.rc|/etc/mail.rc|g' mailx.1 - - # For Linux and BSD, this should be set. - echo "set bsdcompat" >> nail.rc - - sed -i "s/pg/less/" cmd1.c - - echo PREFIX=/usr \ - MAILRC=/etc/mail.rc \ - SENDMAIL=/usr/sbin/sendmail \ - MAILSPOOL=/var/spool/mail \ - UCBINSTALL=/bin/install > makeflags - - make `cat makeflags` IPv6=-DHAVE_IPv6_FUNCS -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" `cat makeflags` install - - # For compatibility with the old mailx program - ln -sf mailx "${pkgdir}"/usr/bin/mail - ln -sf mailx.1.gz "${pkgdir}"/usr/share/man/man1/mail.1.gz - - install -D -m0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/testing/isdn4k-utils/PKGBUILD b/testing/isdn4k-utils/PKGBUILD deleted file mode 100644 index 59f7943ca..000000000 --- a/testing/isdn4k-utils/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 141935 2011-11-03 10:53:42Z tpowa $ -# Contributor: Dennis "Gyroplast" Herbrich <dennis@archlinux.org> -# Maintainer: dorphell <dorphell@archlinux.org> - -pkgname=isdn4k-utils -pkgver=3.2p1 -pkgrel=7 -pkgdesc="User space administration programs and tools for ISDN" -arch=('i686' 'x86_64') -url="http://www.isdn4linux.de/" -license=('GPL') -depends=('ncurses') -backup=(etc/isdn/{callerid.conf,isdn.conf,rate.conf,isdnlog.isdnctrl0.options}) -options=('!makeflags') -source=(ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/${pkgname}.v${pkgver}.tar.bz2 - isdn4k-utils-3.2p1-build.patch - config) -md5sums=('d347afa462e46eccfd1284aebae227b6' - '7f056ddac093c77d8be4e076d0e9421c' - '3429894039f33c114fef5ef9f866920e') - -build() { - cd $srcdir/$pkgname - patch -Np1 -i $srcdir/isdn4k-utils-3.2p1-build.patch - cp $srcdir/config ./.config - make subconfig - make -} - -package() { - cd $srcdir/$pkgname - install -dm755 $pkgdir/sbin - make DESTDIR=$pkgdir install -} diff --git a/testing/isdn4k-utils/config b/testing/isdn4k-utils/config deleted file mode 100644 index fe0810209..000000000 --- a/testing/isdn4k-utils/config +++ /dev/null @@ -1,100 +0,0 @@ -# -# Automatically generated by make menuconfig: don't edit -# - -# -# Code maturity level options -# -# CONFIG_EXPERIMENTAL is not set - -# -# General configuration -# -# CONFIG_BUILDX11 is not set -CONFIG_KERNELDIR='/usr/src/linux' -CONFIG_BINDIR='/usr/bin' -CONFIG_SBINDIR='/sbin' -CONFIG_MANDIR='/usr/share/man' -CONFIG_RUNDIR='/var/run' -CONFIG_LOCKDIR='/var/lock' -CONFIG_LOCKFILE='LCK..' -CONFIG_I4LCONFDIR='/etc/isdn' -CONFIG_CONFFILE='isdn.conf' -CONFIG_CALLERIDFILE='callerid.conf' -CONFIG_USERCONFFILE='~/.isdn' -CONFIG_COUNTRYCODE='49' -CONFIG_AREACODE='' -CONFIG_COUNTRY_PREFIX='+' -CONFIG_AREA_PREFIX='0' -CONFIG_DATADIR='/usr/lib/isdn' - -# -# Runtime configuration tools -# -CONFIG_ISDNCTRL=y -CONFIG_ISDNCTRL_CONF=y -# CONFIG_ISDNCTRL_TIMRU is not set -# CONFIG_IPROFD is not set -# CONFIG_DIVERTCTRL is not set - -# -# Card configuration tools -# -CONFIG_HISAXCTRL=y -CONFIG_ICNCTRL=y -# CONFIG_ICNCTRL_DEBUG is not set -CONFIG_PCBITCTL=y -# CONFIG_AVMCAPICTRL is not set -# CONFIG_EICONCTRL is not set - -# -# Tools for monitoring activity -# -CONFIG_IMON=y -CONFIG_IMONTTY=y -CONFIG_ISDNLOG=y - -# -# Options for isdnlog package -# -CONFIG_ISDNLOG_SERV_PORT=20011 -CONFIG_ISDNLOG_USERFILE='isdnlog.users' -CONFIG_ISDNLOG_CHARGEFILE='charge.dat' -CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log' -CONFIG_ISDNLOG_RELOADCMD='reload' -CONFIG_ISDNLOG_STOPCMD='stop' -CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot' -CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog' -CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf' -# CONFIG_ISDNLOG_POSTGRES is not set -# CONFIG_ISDNLOG_MYSQLDB is not set -# CONFIG_ISDNLOG_ORACLE is not set -CONFIG_ISDN_LOG_DE=y -CONFIG_ISDN_LOG_CC_DE=y -CONFIG_ISDN_LOG_DEST_DE=y -CONFIG_ISDN_LOG_DEST_AT=y -CONFIG_ISDN_LOG_DEST_NL=y -CONFIG_ISDN_LOG_DEST_CH=y -CONFIG_IPPPSTATS=y -# CONFIG_XISDNLOAD is not set -# CONFIG_XMONISDN is not set - -# -# Applications -# -# CONFIG_VBOX is not set -CONFIG_IPPPD=y - -# -# Options for ipppd -# -# CONFIG_IPPPD_MSCHAP is not set -# CONFIG_IPPPD_RADIUS is not set -# CONFIG_RADIUS_WTMP_LOGGING is not set -RADIUS_CLIENT_CONFIG_FILE='' - -# -# Documentation -# -CONFIG_GENMAN=y -# CONFIG_FAQ is not set diff --git a/testing/isdn4k-utils/isdn4k-utils-3.2p1-build.patch b/testing/isdn4k-utils/isdn4k-utils-3.2p1-build.patch deleted file mode 100644 index 63239fcad..000000000 --- a/testing/isdn4k-utils/isdn4k-utils-3.2p1-build.patch +++ /dev/null @@ -1,2028 +0,0 @@ -diff -Naur isdn4k-utils-orig//eicon/eiconctrl.c isdn4k-utils/eicon/eiconctrl.c ---- isdn4k-utils-orig//eicon/eiconctrl.c 2001-06-22 02:34:45.000000000 +1000 -+++ isdn4k-utils/eicon/eiconctrl.c 2010-12-04 20:44:11.093338893 +1000 -@@ -1970,7 +1970,7 @@ - val = strtol(p, &q, 16); - p = q; - val = strtol(p, &q, 16); -- (unsigned short) *buffer = (unsigned short) val; -+ *buffer = (unsigned short) val; - pos = 2; - while ((p != q) && (*q != 0)) { - p = q; -diff -Naur isdn4k-utils-orig//hisax/hisaxctrl.c isdn4k-utils/hisax/hisaxctrl.c ---- isdn4k-utils-orig//hisax/hisaxctrl.c 2000-06-30 19:37:38.000000000 +1000 -+++ isdn4k-utils/hisax/hisaxctrl.c 2010-12-04 20:44:11.093338893 +1000 -@@ -43,7 +43,8 @@ - fprintf(stderr, "cannot open file %s\n", fname); - exit(-1); - } -- p = (int *) buffer = (unsigned char *) malloc(MAX_SIZE+4); -+ buffer = (unsigned char *) malloc(MAX_SIZE+4); -+ p = (int *) buffer; - if (!buffer) { - fprintf(stderr, "cannot get %d byte memory\n", MAX_SIZE+4); - exit(-1); -diff -Naur isdn4k-utils-orig//hisax/Makefile.in isdn4k-utils/hisax/Makefile.in ---- isdn4k-utils-orig//hisax/Makefile.in 2002-07-20 05:03:51.000000000 +1000 -+++ isdn4k-utils/hisax/Makefile.in 2010-12-04 20:44:03.726672225 +1000 -@@ -30,7 +30,7 @@ - #.SUFFIXES: - #.SUFFIXES: .c .o - --%.8: %.man -+%.8: %.man.in - cp $< $@ - - all: $(PROGRAMS) $(MANPAGES) -diff -Naur isdn4k-utils-orig//ipppd/main.c isdn4k-utils/ipppd/main.c ---- isdn4k-utils-orig//ipppd/main.c 2002-07-18 10:06:21.000000000 +1000 -+++ isdn4k-utils/ipppd/main.c 2010-12-04 20:44:11.093338893 +1000 -@@ -1041,9 +1041,14 @@ - static char line[256]; /* line to be logged accumulated here */ - static char *linep; - -+#ifdef __STDC__ -+static void pr_log(void *arg, char *fmt, ...); -+#else /* __STDC__ */ -+static void pr_log(arg, fmt, va_alist); -+#endif -+ - void log_packet(u_char *p,int len,char *prefix,int linkunit) - { -- static void pr_log __P((void *, char *, ...)); - - int i, n; - u_short proto; -diff -Naur isdn4k-utils-orig//ipppd/options.c isdn4k-utils/ipppd/options.c ---- isdn4k-utils-orig//ipppd/options.c 2002-07-06 10:34:08.000000000 +1000 -+++ isdn4k-utils/ipppd/options.c 2010-12-04 20:43:57.890005560 +1000 -@@ -479,26 +479,24 @@ - #define IMPLEMENTATION "" - #endif - --static char *usage_string = "\ --ipppd version %s patch level %d%s\n\ --Usage: %s [ options ], where options are:\n\ --\t<device> Communicate over the named device\n\ -+static char *usage_string = "ipppd version %s patch level %d%s\n" -+"Usage: %s [ options ], where options are:\n" -+"\t<device> Communicate over the named device\n" - #ifdef INCLUDE_OBSOLETE_FEATURES --\tcrtscts Use hardware RTS/CTS flow control\n\ --\t<speed> Set the baud rate to <speed>\n\ --\tmodem Use modem control lines\n\ -+"\tcrtscts Use hardware RTS/CTS flow control\n" -+"\t<speed> Set the baud rate to <speed>\n" -+"\tmodem Use modem control lines\n" - #endif --\t<loc>:<rem> Set the local and/or remote interface IP\n\ --\t\taddresses. (you also may use the option 'useifip' to get IPs).\n\ --\tasyncmap <n> Set the desired async map to hex <n>\n\ --\tauth Require authentication from peer\n\ --\tconnect <p> Invoke shell command <p> to set up the serial line\n\ --\tdefaultroute Add default route through interface\n\ --\tfile <f> Take options from file <f>\n\ --\tmru <n> Set MRU value to <n> for negotiation\n\ --\tnetmask <n> Set interface netmask to <n>\n\ --See ipppd(8) for more options.\n\ --"; -+"\t<loc>:<rem> Set the local and/or remote interface IP\n" -+"\t\t\taddresses. (you also may use the option 'useifip' to get IPs).\n" -+"\tasyncmap <n> Set the desired async map to hex <n>\n" -+"\tauth Require authentication from peer\n" -+"\tconnect <p> Invoke shell command <p> to set up the serial line\n" -+"\tdefaultroute Add default route through interface\n" -+"\tfile <f> Take options from file <f>\n" -+"\tmru <n> Set MRU value to <n> for negotiation\n" -+"\tnetmask <n> Set interface netmask to <n>\n" -+"See ipppd(8) for more options.\n"; - - static char *current_option; /* the name of the option being parsed */ - -diff -Naur isdn4k-utils-orig//isdnlog/isdnlog/isdnlog.h isdn4k-utils/isdnlog/isdnlog/isdnlog.h ---- isdn4k-utils-orig//isdnlog/isdnlog/isdnlog.h 2001-06-22 02:34:56.000000000 +1000 -+++ isdn4k-utils/isdnlog/isdnlog/isdnlog.h 2010-12-04 20:44:03.780005559 +1000 -@@ -460,7 +460,7 @@ - - _EXTERN void dotrace(void); - _EXTERN int morectrl(int card); --_EXTERN void moreinfo(void); -+extern void moreinfo(void); - _EXTERN void morekbd(void); - _EXTERN void processcint(void); - _EXTERN void processflow(void); -diff -Naur isdn4k-utils-orig//isdnlog/isdnlog/processor.c isdn4k-utils/isdnlog/isdnlog/processor.c ---- isdn4k-utils-orig//isdnlog/isdnlog/processor.c 2002-04-02 04:06:10.000000000 +1000 -+++ isdn4k-utils/isdnlog/isdnlog/processor.c 2010-12-04 20:44:03.783338893 +1000 -@@ -5293,7 +5293,7 @@ - tei = BROADCAST; /* Wenn nach einer tei-Zeile keine hex:-Zeile kommt, tei ungueltig machen! */ - - if ((type == SETUP) && !replay) { /* fetch additional info from "/dev/isdninfo" */ -- static void moreinfo(); /* soviel zu Objektorientiertem Denken ;-) */ -+ /*static void moreinfo(); */ /* soviel zu Objektorientiertem Denken ;-) */ - moreinfo(); - } /* if */ - -diff -Naur isdn4k-utils-orig//isdnlog/Makefile.in isdn4k-utils/isdnlog/Makefile.in ---- isdn4k-utils-orig//isdnlog/Makefile.in 2002-07-20 05:03:55.000000000 +1000 -+++ isdn4k-utils/isdnlog/Makefile.in 2010-12-04 20:44:03.730005560 +1000 -@@ -1842,9 +1842,6 @@ - $(INSTALL_DATA) $$f $(DESTDIR)$(DATADIR); \ - echo Installing $(DESTDIR)$(DATADIR)/$$f; \ - done -- @(grep isdnlog $(SERVICEFILE) >/dev/null) || \ -- (echo "";echo "";echo "Add a line to the file $(SERVICEFILE)" ;echo "";echo ""; \ -- echo "isdnlog $(SERV_PORT)/tcp isdnlog" >> $(SERVICEFILE)) - - install-strip: - $(MAKE) INSTALL_BIN='$(INSTALL_BIN) -s' \ -diff -Naur isdn4k-utils-orig//isdnlog/tools/cdb/cdbmake.c isdn4k-utils/isdnlog/tools/cdb/cdbmake.c ---- isdn4k-utils-orig//isdnlog/tools/cdb/cdbmake.c 2002-02-22 21:10:25.000000000 +1000 -+++ isdn4k-utils/isdnlog/tools/cdb/cdbmake.c 2010-12-04 20:44:03.786672226 +1000 -@@ -3,8 +3,6 @@ - #include "freecdbmake.h" - #include <unistd.h> - --extern char *malloc(); -- - void diesys(why) char *why; { perror(why); exit(111); } - - void writeerror() { diesys("cdbmake: fatal: unable to write"); } -diff -Naur isdn4k-utils-orig//isdnlog/tools/isdnrate.c isdn4k-utils/isdnlog/tools/isdnrate.c ---- isdn4k-utils-orig//isdnlog/tools/isdnrate.c 2001-06-22 02:34:56.000000000 +1000 -+++ isdn4k-utils/isdnlog/tools/isdnrate.c 2010-12-04 20:44:11.096672226 +1000 -@@ -304,7 +304,7 @@ - - static void print_header(void); - --static char *myname, *myshortname; -+char *myname, *myshortname; - static char options[] = "ab:d:f:h:l:op:st:v::x:CD::G:HLNP:O:S:TUVX::Z"; - static char usage[] = "%s: usage: %s [ -%s ] Destination ...\n"; - -@@ -313,7 +313,7 @@ - static int usestat = 0; - static int duration = LCR_DURATION; - static time_t start; --static int day, month, year, hour, min, sec; -+int day, month, year, hour, min, sec; - static char ignore[MAXPROVIDER]; - static char *fromarea = 0; - static char wanted_day; -diff -Naur isdn4k-utils-orig//isdnlog/tools/isdnrate.c.orig isdn4k-utils/isdnlog/tools/isdnrate.c.orig ---- isdn4k-utils-orig//isdnlog/tools/isdnrate.c.orig 1970-01-01 10:00:00.000000000 +1000 -+++ isdn4k-utils/isdnlog/tools/isdnrate.c.orig 2001-06-22 02:34:56.000000000 +1000 -@@ -0,0 +1,1806 @@ -+/* $Id: isdnrate.c,v 1.38 2001/03/01 14:59:16 paul Exp $ -+ -+ * ISDN accounting for isdn4linux. (rate evaluation) -+ * -+ * Copyright 1995 .. 2000 by Andreas Kool (akool@isdn4linux.de) -+ * -+ * 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, 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. -+ * -+ * $Log: isdnrate.c,v $ -+ * Revision 1.38 2001/03/01 14:59:16 paul -+ * Various patches to fix errors when using the newest glibc, -+ * replaced use of insecure tempnam() function -+ * and to remove warnings etc. -+ * -+ * Revision 1.37 2000/07/17 16:34:23 akool -+ * isdnlog-4.32 -+ * - added new Prefixes 0160 (D1) and 0162 (D2) to "country-de.dat" -+ * - corrected all german mobil phone numbers (many thank's to -+ * Tobias Becker <i4l-projects@talypso.de> for the tool "fix_rates.pl") -+ * - isdnlog/tools/rate.c ... New R:-tag -+ * - isdnlog/tools/isdnrate.c ... print warnings from getRate if verbose -+ * - isdnlog/tools/rate-files.man ... New R:-tag -+ * - isdnlog/tools/NEWS ... New R:-tag -+ * - isdnlog/README ... New R:-tag -+ * - isdnlog/samples/rtest.dat ... example rate-file for testing R: -+ * -+ * Revision 1.36 2000/03/09 18:50:03 akool -+ * isdnlog-4.16 -+ * - isdnlog/samples/isdn.conf.no ... changed VBN -+ * - isdnlog/isdnlog/isdnlog.c .. ciInterval -+ * - isdnlog/isdnlog/processor.c .. ciInterval -+ * - isdnlog/tools/tools.h .. ciInterval, abclcr conf option -+ * - isdnlog/tools/isdnconf.c .. ciInterval, abclcr conf option -+ * - isdnlog/tools/isdnrate.c .. removed a warning -+ * - isdnlog/NEWS ... updated -+ * - isdnlog/README ... updated -+ * - isdnlog/isdnlog/isdnlog.8.in ... updated -+ * - isdnlog/isdnlog/isdnlog.5.in ... updated -+ * - isdnlog/samples/provider ... NEW -+ * -+ * ==> Please run a make clean, and be sure to read isdnlog/NEWS for changes -+ * ==> and new features. -+ * -+ * Revision 1.35 2000/03/06 07:03:21 akool -+ * isdnlog-4.15 -+ * - isdnlog/tools/tools.h ... moved one_call, sum_calls to isdnrep.h -+ * ==> DO A 'make clean' PLEASE -+ * - isdnlog/tools/telnum.c ... fixed a small typo -+ * - isdnlog/isdnrep/rep_main.c ... incl. dest.h -+ * - isdnlog/isdnrep/isdnrep.c ... fixed %l, %L -+ * - isdnlog/isdnrep/isdnrep.h ... struct one_call, sum_calls are now here -+ * -+ * Support for Norway added. Many thanks to Tore Ferner <torfer@pvv.org> -+ * - isdnlog/rate-no.dat ... NEW -+ * - isdnlog/holiday-no.dat ... NEW -+ * - isdnlog/samples/isdn.conf.no ... NEW -+ * - isdnlog/samples/rate.conf.no ... NEW -+ * -+ * Revision 1.34 2000/02/28 19:53:56 akool -+ * isdnlog-4.14 -+ * - Patch from Roland Rosenfeld <roland@spinnaker.de> fix for isdnrep -+ * - isdnlog/tools/rate.c ... epnum -+ * - isdnlog/tools/rate-at.c ... new rates -+ * - isdnlog/rate-at.dat -+ * - isdnlog/tools/rate-files.man ... %.3f -+ * - doc/Configure.help ... unknown cc -+ * - isdnlog/configure.in ... unknown cc -+ * - isdnlog/.Config.in ... unknown cc -+ * - isdnlog/Makefile.in ... unknown cc -+ * - isdnlog/tools/dest/Makefile.in ... LANG => DEST_LANG -+ * - isdnlog/samples/rate.conf.pl ... NEW -+ * - isdnlog/samples/isdn.conf.pl ... NEW -+ * - isdnlog/rate-pl.dat ... NEW -+ * - isdnlog/tools/isdnrate.c ... fixed -P pid_dir, restarts on HUP now -+ * - isdnlog/tools/isdnrate.man ... SIGHUP documented -+ * -+ * Revision 1.33 2000/02/12 16:40:24 akool -+ * isdnlog-4.11 -+ * - isdnlog/Makefile.in ... sep install-targets, installs samples, no isdnconf -+ * - isdnlog/samples/rate.conf.{lu,nl} ... NEW -+ * - isdnlog/samples/isdn.conf.lu ... chg provider -+ * - isdnlog/samples/stop ... chg \d,\d => \d.\d -+ * - isdnlog/samples/isdnlog.isdnctrl0.options ... NEW -+ * - isdnlog/samples/isdnlog.users ... NEW -+ * - isdnlog/country-de.dat ... _DEMF again -+ * - isdnlog/isdnlog/processor.c ... LCR -+ * - isdnlog/tools/isdnrate.c ... fmt of s -+ * -+ * Old config is not installed anymore, to acomplish this do -+ * -+ * make install-old-conf -+ * make install -+ * -+ * A running isdnlog is now HUP-ed not KILL-ed -+ * -+ * Revision 1.32 2000/02/03 18:24:51 akool -+ * isdnlog-4.08 -+ * isdnlog/tools/rate.c ... LCR patch again -+ * isdnlog/tools/isdnrate.c ... LCR patch again -+ * isdnbill enhanced/fixed -+ * DTAG AktivPlus fixed -+ * -+ * Revision 1.31 1999/12/31 13:57:20 akool -+ * isdnlog-4.00 (Millenium-Edition) -+ * - Oracle support added by Jan Bolt (Jan.Bolt@t-online.de) -+ * - resolved *any* warnings against rate-de.dat -+ * - Many new rates -+ * - CREDITS file added -+ * -+ * Revision 1.30 1999/12/24 14:17:05 akool -+ * isdnlog-3.81 -+ * - isdnlog/tools/NEWS -+ * - isdnlog/tools/telrate/info.html.in ... bugfix -+ * - isdnlog/tools/telrate/telrate.cgi.in ... new Service query -+ * - isdnlog/tools/telrate/Makefile.in ... moved tmp below telrate -+ * - isdnlog/samples/rate.conf.at ... fixed -+ * - isdnlog/tools/rate-at.c ... some changes -+ * - isdnlog/rate-at.dat ... ditto -+ * - isdnlog/tools/Makefile ... added path to pp_rate -+ * - isdnlog/tools/rate.{c,h} ... getServiceNames, Date-Range in T:-Tag -+ * - isdnlog/tools/isdnrate.c ... fixed sorting of services, -X52 rets service names -+ * - isdnlog/tools/rate-files.man ... Date-Range in T:-Tag, moved from doc -+ * - isdnlog/tools/isdnrate.man ... moved from doc -+ * - doc/Makefile.in ... moved man's from doc to tools -+ * - isdnlog/Makefile.in ... man's, install isdn.conf.5 -+ * - isdnlog/configure{,.in} ... sed, awk for man's -+ * - isdnlog/tools/zone/Makefile.in ... dataclean -+ * - isdnlog/tools/dest/Makefile.in ... dataclean -+ * - isdnlog/isdnlog/isdnlog.8.in ... upd -+ * - isdnlog/isdnlog/isdn.conf.5.in ... upd -+ * -+ * Revision 1.29 1999/12/17 22:51:55 akool -+ * isdnlog-3.79 -+ * - isdnlog/isdnrep/isdnrep.{c,h} ... error -handling, print_msg -+ * - isdnlog/isdnrep/rep_main.c -+ * - isdnlog/isdnrep/isdnrep.1.in -+ * - isdnlog/tools/rate.c ... dupl entry in rate.conf -+ * - isdnlog/tools/NEWS -+ * - isdnlog/tools/isdnrate.c -+ * - isdnlog/tools/dest/configure{,.in} -+ * - isdnlog/tools/zone/configure{,.in} -+ * -+ * Revision 1.28 1999/12/16 23:08:28 akool -+ * isdnlog-3.78 -+ * - isdnlog/tools/isdnrate.c ... new sOcket option -+ * - isdnlog/tools/NEWS ... new sOcket option -+ * - doc/isdnrate.man ... ditto -+ * - isdnlog/tools/telrate/config.in ... ditto -+ * - isdnlog/tools/telrate/telrate.cgi.in ... ditto -+ * - isdnlog/tools/telrate/README-telrate ditto -+ * -+ * Revision 1.27 1999/12/02 19:28:02 akool -+ * isdnlog-3.73 -+ * - isdnlog/tools/telrate/telrate.cgi.in faster -+ * - doc/isdnrate.man ... -P -+ * - isdnlog/tools/isdnrate.c ... -P -+ * - isdnlog/tools/NEWS ... -P -+ * - isdnlog/tools/rate-at.c ... 194040 -+ * - isdnlog/rate-at.dat -+ * - isdnlog/tools/rate.c ... SIGSEGV -+ * -+ * Revision 1.26 1999/12/01 21:47:25 akool -+ * isdnlog-3.72 -+ * - new rates for 01051 -+ * - next version of isdnbill -+ * -+ * - isdnlog/tools/telnum.c ... cleanup -+ * - isdnlog/tools/isdnrate.c ... -s Service -+ * - isdnlog/tools/rate.{c,h} ... -s -+ * - isdnlog/tools/NEWS ... -s -+ * - doc/isdnrate.man .. updated -o, -s -+ * - doc/rate-files.man ... updated -+ * - isdnlog/tools/dest/README.makedest ... updt. -+ * - isdnlog/isdnlog/isdnlog.8.in .. updt. -+ * -+ * Telrate -+ * - isdnlog/tools/telrate/README-telrate -+ * - isdnlog/tools/telrate/config.in NEW -+ * - isdnlog/tools/telrate/configure NEW -+ * - isdnlog/tools/telrate/Makefile.in NEW -+ * - isdnlog/tools/telrate/index.html.in was index.html -+ * - isdnlog/tools/telrate/info.html.in was info.html -+ * - isdnlog/tools/telrate/telrate.cgi.in was telrate.cgi -+ * - isdnlog/tools/telrate/leo.sample NEW sample config -+ * - isdnlog/tools/telrate/alex.sample NEW sample config -+ * -+ * Revision 1.25 1999/11/08 21:09:41 akool -+ * isdnlog-3.65 -+ * - added "B:" Tag to "rate-xx.dat" -+ * -+ * Revision 1.24 1999/11/07 13:29:28 akool -+ * isdnlog-3.64 -+ * - new "Sonderrufnummern" handling -+ * -+ * Revision 1.22 1999/10/26 18:17:14 akool -+ * isdnlog-3.62 -+ * - many new rates -+ * - next try to fix "Sonderrufnummern" -+ * -+ * isdnlog-3.58 -+ * - big cleanup ( > 1.3 Mb removed!) -+ * - v0.02 of destination support - better, but not perfect -+ * (does't work with gcc-2.7.2.3 yet - use egcs!) -+ * -+ * Revision 1.21 1999/10/25 18:30:03 akool -+ * isdnlog-3.57 -+ * WARNING: Experimental version! -+ * Please use isdnlog-3.56 for production systems! -+ * -+ * Revision 1.20 1999/09/19 14:16:27 akool -+ * isdnlog-3.53 -+ * -+ * Revision 1.19 1999/09/16 20:27:21 akool -+ * isdnlog-3.52 -+ * -+ * Revision 1.18 1999/09/13 09:09:44 akool -+ * isdnlog-3.51 -+ * - changed getProvider() to not return NULL on unknown providers -+ * many thanks to Matthias Eder <mateder@netway.at> -+ * - corrected zone-processing when doing a internal -> world call -+ * -+ * Revision 1.17 1999/09/09 11:21:05 akool -+ * isdnlog-3.49 -+ * -+ * Revision 1.16 1999/08/04 23:06:52 akool -+ * Better codeall for .at -+ * -+ * Revision 1.15 1999/07/31 09:25:36 akool -+ * getRate() speedup -+ * -+ * Revision 1.14 1999/07/26 16:28:41 akool -+ * getRate() speedup from Leo -+ * -+ * Revision 1.13 1999/07/25 15:57:46 akool -+ * isdnlog-3.43 -+ * added "telnum" module -+ * -+ * Revision 1.12 1999/07/24 08:45:17 akool -+ * isdnlog-3.42 -+ * rate-de.dat 1.02-Germany [18-Jul-1999 10:44:21] -+ * better Support for Ackermann Euracom -+ * WEB-Interface for isdnrate -+ * many small fixes -+ * -+ * Revision 1.11 1999/07/15 16:42:04 akool -+ * small enhancement's and fixes -+ * -+ * Revision 1.10 1999/07/07 19:44:07 akool -+ * patches from Michael and Leo -+ * -+ * Revision 1.9 1999/07/04 20:47:05 akool -+ * rate-de.dat V:1.02-Germany [04-Jul-1999 22:56:37] -+ * -+ * Revision 1.8 1999/07/03 10:24:14 akool -+ * fixed Makefile -+ * -+ * Revision 1.7 1999/07/02 19:18:00 akool -+ * rate-de.dat V:1.02-Germany [02-Jul-1999 21:27:20] -+ * -+ * Revision 1.6 1999/07/02 18:20:50 akool -+ * rate-de.dat V:1.02-Germany [02-Jul-1999 20:29:21] -+ * country-de.dat V:1.02-Germany [02-Jul-1999 19:13:54] -+ * -+ * Revision 1.5 1999/07/01 20:40:07 akool -+ * isdnrate optimized -+ * -+ * Revision 1.4 1999/06/30 20:53:28 akool -+ * added "-t" option to "isdnrate" -+ * -+ * Revision 1.3 1999/06/30 17:17:37 akool -+ * isdnlog Version 3.39 -+ * -+ * Revision 1.2 1999/06/29 20:11:25 akool -+ * now compiles with ndbm -+ * (many thanks to Nima <nima_ghasseminejad@public.uni-hamburg.de>) -+ * -+ * Revision 1.1 1999/06/28 19:16:33 akool -+ * isdnlog Version 3.38 -+ * - new utility "isdnrate" started -+ * -+ */ -+ -+#include "isdnlog.h" -+#include "tools/zone.h" -+#include <unistd.h> -+#include "dest.h" -+ -+#define WIDTH 19 -+#define _MAXLAST 20 /* the real max */ -+#define MAXLAST ((best>=_MAXLAST||best<=2)?5:best) -+ -+ -+static void print_header(void); -+ -+static char *myname, *myshortname; -+static char options[] = "ab:d:f:h:l:op:st:v::x:CD::G:HLNP:O:S:TUVX::Z"; -+static char usage[] = "%s: usage: %s [ -%s ] Destination ...\n"; -+ -+static int header = 0, best = MAXPROVIDER, table = 0, explain = 0; -+int verbose = 0; -+static int usestat = 0; -+static int duration = LCR_DURATION; -+static time_t start; -+static int day, month, year, hour, min, sec; -+static char ignore[MAXPROVIDER]; -+static char *fromarea = 0; -+static char wanted_day; -+static int list = 0; -+static char *comment; -+static char **providers = 0; /* incl these */ -+static int n_providers = 0; -+static int business = 0; -+static char **xproviders = 0; /* excl these */ -+static int nx_providers = 0; -+static int xbusiness = 0; -+static int all = 0; -+static int booked = 0; -+static int service = 0; -+ -+#define SOCKNAME "/tmp/isdnrate" -+static int is_daemon = 0; -+static int is_client = 0; -+static int we_are_daemon = 0; -+static int takt = 99999; -+static char sortby; -+static int need_dest; -+static int h_param = 0; -+static int lcr = 0; -+static TELNUM srcnum, destnum; -+static char *pid_dir = 0; -+static char *pid_file = 0; -+static char *socket_file = 0; -+static char **hup_argv; /* args to restart with */ -+ -+typedef struct { -+ int prefix; -+ double rate; -+ char *name; -+ char *explain; -+} SORT; -+ -+typedef struct { -+ int weight; -+ int index; -+} SORT2; -+ -+static SORT sort[MAXPROVIDER]; -+ -+#undef MAXPROVIDER -+#define MAXPROVIDER getNProvider() -+ -+#undef BUFSIZ /* sorry but 8192 is too much for me */ -+#define BUFSIZ 256 -+ -+int print_msg(int Level, const char *fmt,...) -+{ -+ auto va_list ap; -+ auto char String[BUFSIZ * 3]; -+ -+ if ((Level > PRT_ERR && !verbose) || (Level > PRT_WARN && verbose < 2)) -+ return (1); -+ -+ va_start(ap, fmt); -+ (void) vsnprintf(String, BUFSIZ * 3, fmt, ap); -+ va_end(ap); -+ -+ fprintf(stderr, "%s", String); -+ -+ return (0); -+} /* print_msg */ -+ -+ -+static void init() -+{ -+ auto char *version, **message; -+ -+ if (readconfig(myshortname) < 0) -+ exit(1); -+ -+ if (verbose) -+ message = &version; -+ else -+ message = NULL; -+ -+ initHoliday(holifile, message); -+ -+ if (verbose && *version) -+ print_msg(PRT_V, "%s\n", version); -+ initDest(destfile, message); -+ if (verbose && *version) -+ print_msg(PRT_V, "%s\n", version); -+ -+ initRate(rateconf, ratefile, zonefile, message); -+ -+ if (verbose && *version) -+ print_msg(PRT_V, "%s\n", version); -+ -+} /* init */ -+ -+#if 0 -+static void deinit(void) -+{ -+ exitRate(); -+ exitDest(); -+ exitHoliday(); -+} -+#endif -+ -+/* calc a day/time W | E | H */ -+static void get_day(char d) -+{ -+ struct tm *tm; -+ bitfield mask; -+ int what = 0; -+ -+ tm = localtime(&start); /* now */ -+ switch (d) { -+ case 'W': /* we need a normal weekday, so we take -+ today and inc. day if today is -+ holiday */ -+ what = WORKDAY; -+ if (!h_param) -+ hour = 10; -+ break; -+ case 'N': -+ what = WORKDAY; -+ if (!h_param) -+ hour = 23; -+ break; -+ case 'E': -+ what = SUNDAY; -+ if (!h_param) -+ hour = 10; -+ break; -+ } -+ mask = 1 << what; -+ while (isDay(tm, mask, 0) != what) { -+ tm->tm_mday++; -+ } -+ min = sec = 0; -+ day = tm->tm_mday; -+ month = tm->tm_mon + 1; -+ year = tm->tm_year + 1900; -+} -+ -+static void post_init() -+{ -+ -+ clearNum(&srcnum); -+ if (fromarea) { -+ Strncpy(srcnum.area, fromarea, TN_MAX_AREA_LEN); -+ free(fromarea); -+ fromarea = 0; -+ } -+ initNum(&srcnum); -+ -+ if (wanted_day) -+ get_day(wanted_day); -+} /* post_init */ -+ -+static int opts(int argc, char *argv[]) -+{ -+ register int c; -+ register char *p; -+ int x; -+ -+ h_param = 0; -+ -+ optind = 0; /* make it repeatable */ -+ need_dest = 1; -+ while ((c = getopt(argc, argv, options)) != EOF) { -+ switch (c) { -+ case 'a': /* all rates old/newer */ -+ all++; -+ break; -+ case 'b': -+ best = strtol(optarg, NIL, 0); -+ break; -+ -+/* case 'c': country */ -+ break; -+ -+ case 'd': -+ for (p = optarg; *p && isspace(*p); p++) ; -+ if (isdigit(*p)) { -+ wanted_day = '\0'; -+ day = atoi(optarg); -+ if ((p = strchr(optarg, '.'))) { -+ month = atoi(p + 1); -+ if ((p = strchr(p + 1, '.'))) { -+ year = atoi(p + 1); -+ if (year < 50) -+ year += 2000; -+ else if (year < 100) -+ year += 1900; -+ } -+ } -+ } /* isdigit */ -+ else { -+ wanted_day = *p; -+ } -+ break; -+ -+ case 'f': -+ if (optarg) { /* from */ -+ for (p = optarg; (isspace(*p) || *p == '0') && *p; p++) ; -+ fromarea = strdup(p); -+ } -+ break; -+ -+ case 'h': -+ hour = atoi(optarg); -+ h_param++; -+ sec = 0; -+ if ((p = strchr(optarg + 1, ':'))) { -+ min = atoi(p + 1); -+ if ((p = strchr(p + 1, ':'))) -+ sec = atoi(p + 1); -+ } -+ else -+ min = 0; -+ break; -+ -+ case 'l': -+ duration = strtol(optarg, NIL, 0); /* l wie lt */ -+ break; -+ -+ case 'o': /* booked only */ -+ booked++; -+ break; -+ -+ case 's': /* service */ -+ service++; -+ break; -+ -+ case 't': -+ x = strtol(optarg, NIL, 0); -+ if (x > 0) -+ takt = x; -+ break; -+ -+ case 'x': /* eXclude Poviders */ -+ { -+ char *arg = strdup(optarg); -+ -+ p = strtok(arg, ","); -+ while (p) { -+ if (*p == 'B') { /* Business Provider */ -+ xbusiness = 1; -+ p = strtok(0, ","); -+ continue; -+ } -+ xproviders = realloc(xproviders, (nx_providers + 1) * sizeof(char *)); -+ -+ xproviders[nx_providers] = strdup(p); -+ p = strtok(0, ","); -+ nx_providers++; -+ } -+ free(arg); -+ } -+ break; -+ -+ case 'p': /* Providers ... */ -+ { -+ char *arg = strdup(optarg); -+ -+ p = strtok(arg, ","); -+ while (p) { -+ if (*p == 'B') { /* Business Provider */ -+ business = 1; -+ p = strtok(0, ","); -+ continue; -+ } -+ providers = realloc(providers, (n_providers + 1) * sizeof(char *)); -+ -+ providers[n_providers] = strdup(p); -+ p = strtok(0, ","); -+ n_providers++; -+ } -+ free(arg); -+ } -+ break; -+ -+ case 'v': -+ verbose++; -+ if (optarg && (x = atoi(optarg))) -+ verbose = x; -+ break; -+/* Uppercase options are for output format */ -+ -+ case 'C': -+ is_client = 1; -+ break; -+ -+ case 'D': -+ is_daemon = 1; -+ need_dest = 0; -+ if (optarg) { -+ x = atoi(optarg); -+ is_daemon = x; -+ if (we_are_daemon && x == 3) { -+ kill(getppid(), SIGTERM); -+ exit(EXIT_SUCCESS); -+ } -+ } -+ break; -+ -+ case 'G': -+ explain = atoi(optarg); -+ break; -+ case 'H': -+ header++; -+ break; -+ case 'L': -+ list++; -+ explain = 9; -+ break; -+ case 'N': -+ explain = 55; -+ break; -+ case 'P': -+ pid_dir = strdup(optarg); -+ break; -+ case 'O': -+ free(socket_file); -+ socket_file = strdup(optarg); -+ break; -+ case 'S': -+ sortby = *optarg; -+ break; -+ case 'T': -+ table++; -+ break; -+/* Fixme: check/warn illegal kombinations of options */ -+ case 'U': -+ usestat++; -+ break; -+ -+ case 'V': -+ print_version(myshortname); -+ exit(0); -+ -+ case 'X': -+ if (explain == 0) { -+ explain++; -+ if (optarg && isdigit(*optarg) && (x = atoi(optarg))) { -+ explain = x; -+ if (x == 50 || x == 51 || x == 52) -+ need_dest = 0; -+ } -+ else if (optarg) { -+ comment = strdup(optarg); -+ explain = 8; -+ need_dest = 0; -+ } -+ break; -+ } -+ /* fallthrough */ -+ case '?': -+ print_msg(PRT_A, usage, myshortname, myshortname, options); -+ break; -+ -+ case 'Z': -+ lcr++; -+ break; -+ } /* switch */ -+ } /* while */ -+ if (is_client && is_daemon != 3 && is_daemon) { -+ is_daemon = 0; -+ print_msg(PRT_V, "Conflicting options, -D disabled\n"); -+ } -+ if (list && table) { -+ table = 0; -+ print_msg(PRT_V, "Conflicting options, -T disabled\n"); -+ } -+ if (usestat && !table) -+ print_msg(PRT_V, "Conflicting options, -U ignored\n"); -+ if ((list || table) && explain >= 10) { -+ list = table = 0; -+ print_msg(PRT_V, "Conflicting options, -T, -L disabled\n"); -+ } -+ if (best < 1) { -+ best = MAXPROVIDER; -+ print_msg(PRT_V, "Illegal options, -b ignored\n"); -+ } -+ if ((explain == 50 || explain == 51 || explain == 52) && header) { -+ print_msg(PRT_V, "Conflicting options, -H ignored\n"); -+ } -+ if (explain >= 10 && service) { -+ print_msg(PRT_V, "Conflicting options, -s ignored\n"); -+ service = 0; -+ } -+ if (argc > optind) -+ return (optind); -+ else -+ return (0); -+} /* opts */ -+ -+ -+static int (*compare_func) (const void *s1, const void *s2); -+static int compare(const void *s1, const void *s2) -+{ -+ return (((SORT *) s1)->rate > ((SORT *) s2)->rate); -+} /* compare */ -+static int compare_vbn(const void *s1, const void *s2) -+{ -+ return (((SORT *) s1)->prefix > ((SORT *) s2)->prefix); -+} -+static int compare_name(const void *s1, const void *s2) -+{ -+ return strcasecmp(((SORT *) s1)->name, ((SORT *) s2)->name); -+} -+ -+static int compare2(const void *s1, const void *s2) -+{ -+ return (((SORT2 *) s1)->weight < ((SORT2 *) s2)->weight); -+} /* compare2 */ -+ -+char *short_explainRate(RATE * Rate) -+{ -+ -+ static char buffer[BUFSIZ]; -+ char *p = buffer; -+ -+ if (service && Rate->dst[1] && *Rate->dst[1]) -+ p += sprintf(p, "%s, ", Rate->dst[1]); -+ -+ if (Rate->Zone && *Rate->Zone) -+ p += sprintf(p, "%s", Rate->Zone); -+ else -+ p += sprintf(p, "Zone %d", Rate->zone); -+ -+ if (!Rate->domestic && Rate->Country && *Rate->Country) -+ p += sprintf(p, " (%s)", Rate->Country); -+ -+ if (Rate->Day && *Rate->Day) -+ p += sprintf(p, ", %s", Rate->Day); -+ -+ if (Rate->Hour && *Rate->Hour) -+ p += sprintf(p, ", %s", Rate->Hour); -+ -+ return buffer; -+} -+ -+static char *printrate(RATE * Rate) -+{ -+ static char message[BUFSIZ]; -+ -+ if (Rate->Basic > 0) -+ sprintf(message, "%s + %s/%.1fs = %s + %s/Min (%s)", -+ printRate(Rate->Basic), -+ printRate(Rate->Price), -+ Rate->Duration, -+ printRate(Rate->Basic), -+ printRate(60 * Rate->Price / Rate->Duration), -+ short_explainRate(Rate)); -+ else -+ sprintf(message, "%s/%.1fs = %s/Min (%s)", -+ printRate(Rate->Price), -+ Rate->Duration, -+ printRate(60 * Rate->Price / Rate->Duration), -+ short_explainRate(Rate)); -+ -+ return (message); -+} /* printrate */ -+ -+ -+static void buildtime() -+{ -+ auto struct tm tm; -+ -+ tm.tm_sec = sec; -+ tm.tm_min = min; -+ tm.tm_hour = hour; -+ tm.tm_mday = day; -+ tm.tm_mon = month - 1; -+ tm.tm_year = year - 1900; /* ja, ja, ich weiá ;-) */ -+ tm.tm_isdst = -1; -+ -+ start = mktime(&tm); -+} /* buildtime */ -+ -+ -+static void splittime() -+{ -+ auto struct tm *tm; -+ -+ tm = localtime(&start); -+ sec = tm->tm_sec; -+ min = tm->tm_min; -+ hour = tm->tm_hour; -+ day = tm->tm_mday; -+ month = tm->tm_mon + 1; -+ year = tm->tm_year + 1900; -+} /* splittime */ -+ -+static char *Provider(int prefix) -+{ -+ register char *p, *p1; -+ register int l; -+ static char s[BUFSIZ]; -+ char prov[TN_MAX_PROVIDER_LEN]; -+ -+ if (prefix == UNKNOWN) -+ return ("?"); -+ -+ p = getProvider(prefix); -+ -+ l = max(WIDTH, strlen(p)) - strlen(p); -+ -+ p1 = prefix2provider_variant(prefix, prov); -+ -+ l += (8 - strlen(p1)); -+ -+ sprintf(s, "%s:%s%*s", p1, p, l, ""); -+ -+ return (s); -+} /* Provider */ -+ -+static char *takt_str(RATE * Rate) -+{ -+ static char s[BUFSIZ]; -+ -+ if (floor(Rate->Rhythm[0]) == Rate->Rhythm[0]) -+ sprintf(s, "%.0f/", Rate->Rhythm[0]); -+ else -+ sprintf(s, "%.3f/", Rate->Rhythm[0]); -+ if (floor(Rate->Rhythm[1]) == Rate->Rhythm[1]) -+ sprintf(s + strlen(s), "%.0f", Rate->Rhythm[1]); -+ else -+ sprintf(s + strlen(s), "%.3f", Rate->Rhythm[1]); -+ return s; -+} -+ -+static inline char *P_EMPTY(char *s) -+{ -+ char *p = s; -+ -+ return p ? p : ""; -+} -+ -+#define DEL ';' -+static int compute(char *num) -+{ -+ register int i, n = 0; -+ register int low = 0, high = MAXPROVIDER - 1; -+ auto RATE Rate; -+ auto char s[BUFSIZ]; -+ struct tm *tm; -+ char prov[TN_MAX_PROVIDER_LEN]; -+ int first = 1; -+ static char BUSINESS[] = "Business"; /* in C:GT:Tag */ -+ -+ if (destnum.nprovider != UNKNOWN) { -+ low = high = destnum.nprovider; -+ } /* if */ -+ compare_func = compare; -+ switch (sortby) { -+ case 'v': -+ compare_func = compare_vbn; -+ break; -+ case 'n': -+ compare_func = compare_name; -+ break; -+ } -+ -+ buildtime(); -+ if (explain == 98 || explain == 97) { /* Minutenpreis fuer -+ diese Woche */ -+ tm = localtime(&start); -+ tm->tm_hour = 0; -+ tm->tm_min = 1; -+ tm->tm_sec = 0; -+ start = mktime(tm); -+ if (explain == 98) { -+ while (tm->tm_wday) { /* find last monday */ -+ start -= (60 * 60 * 24); -+ tm = localtime(&start); -+ } /* while */ -+ start += (60 * 60 * 24); -+ } -+ } -+ if (service) { -+ num = getServiceNum(num); -+ if (!num || !*num) { -+ return 0; -+ } -+ } -+ do { -+ for (i = low; i <= high; i++) { -+ int found, p; -+ char *t; -+ -+ if (ignore[i]) /* Fixme: */ -+ continue; -+ if (booked && !isProviderBooked(i)) -+ continue; -+ if (!all && !isProviderValid(i, start)) -+ continue; -+ t = getProvider(i); -+ if (!t || t[strlen(t) - 1] == '?') /* UNKNOWN Provider */ -+ continue; -+ -+ t = getComment(i, "GT"); /* get Geb. Text comment */ -+ if (business) { /* only business wanted */ -+ if (t == 0) -+ continue; -+ else if (strstr(t, BUSINESS) == 0) -+ continue; -+ } -+ if (xbusiness) { /* no business wanted */ -+ if (t && strstr(t, BUSINESS) > 0) -+ continue; -+ } -+ found = 0; -+ if (n_providers) { -+ for (p = 0; p < n_providers; p++) -+ if (pnum2prefix_variant(providers[p], start) == i) { -+ found = 1; -+ break; -+ } -+ if (!found) -+ continue; -+ } -+ if (nx_providers) { -+ for (p = 0; p < nx_providers; p++) -+ if (pnum2prefix_variant(xproviders[p], start) == i) { -+ found = 1; -+ break; -+ } -+ if (found) -+ continue; -+ } -+ clearRate(&Rate); -+ Rate.src[0] = srcnum.country; -+ Rate.src[1] = srcnum.area; -+ Rate.src[2] = ""; -+ -+ destnum.nprovider = i; -+ Strncpy(destnum.provider, getProvider(i), TN_MAX_PROVIDER_LEN); -+ if (normalizeNumber(num, &destnum, TN_ALL) == UNKNOWN) { -+ continue; -+ } -+ -+ Rate.dst[0] = destnum.country; -+ Rate.dst[1] = destnum.area; -+ Rate.dst[2] = destnum.msn; -+ /* Rate.Service = "Internet by call"; */ -+ -+ Rate.prefix = i; -+ -+ Rate.start = start; -+ Rate.now = start + duration - 1; -+ if (explain == 99) { -+ int j; -+ double oldCharge = -1.0; -+ -+ if (first && header) -+ print_header(); -+ first = 0; -+ printf("@ %s\n", prefix2provider_variant(Rate.prefix, prov)); -+ Rate.now = start + 1; -+ for (j = 1; j < duration; j++) { -+ if (!getRate(&Rate, NULL) && (Rate.Price != 99.99)) { -+ if (Rate.Charge != oldCharge || j == duration - 1) { -+ printf("%d %.4f\n", j, Rate.Charge); -+ oldCharge = Rate.Charge; -+ } -+ } -+ else -+ break; -+ Rate.now++; -+ } -+ if (Rate.Duration <= takt) -+ printf("@----- %s %s\n", currency, Rate.Provider); -+ } -+ if (explain == 98 || explain == 97) { /* Minutenpreis fuer -+ diese Woche/Tag */ -+ int j; -+ -+ if (first && header) -+ print_header(); -+ first = 0; -+ printf("@ %s\n", prefix2provider_variant(Rate.prefix, prov)); -+ for (j = 0; j < (explain == 98 ? 7 * 24 : 24); j++) { -+ if (!getRate(&Rate, NULL) && (Rate.Price != 99.99)) { -+ printf("%d %.4f\n", j, Rate.Charge); -+ } -+ else -+ break; -+ Rate.now += 3600; -+ Rate.start += 3600; -+ } -+ if (Rate.Duration <= takt) -+ printf("@----- %s %s\n", currency, Rate.Provider); -+ } -+ else if (explain == 50 || explain == 51) { -+ int fi = 1; -+ -+ while (getZoneRate(&Rate, explain - 50, fi) == 0) { -+ double cpm = Rate.Duration > 0 ? 60 * Rate.Price / Rate.Duration : 99.99; -+ -+ if (Rate.Price == 0) -+ cpm = Rate.Basic; -+ -+ fi = 0; -+ if (Rate.Price != 99.99) -+ printf("%s%c%s%c%s%c%.2f%c%.2f%c%s\n", prefix2provider(Rate.prefix, prov), DEL, -+ Rate.Provider, DEL, currency, DEL, Rate.Charge, DEL, cpm, DEL, -+ P_EMPTY(Rate.Country)); -+ free(Rate.Country); -+ } -+ } -+ else { -+ /* kludge to suppress "impossible" Rates */ -+ char **message, *msg; -+ if(verbose) -+ message = &msg; -+ else -+ message = NULL; -+ if (!getRate(&Rate, message) && (Rate.Price != 99.99)) { -+ if (!(Rate.Duration <= takt)) -+ continue; -+ sort[n].prefix = Rate.prefix; -+ sort[n].rate = Rate.Charge; -+ sort[n].name = Rate.Provider; -+ switch (explain) { -+ case 1: -+ if (service) -+ sprintf(s, " (%s, %s)", P_EMPTY(Rate.dst[1]), Rate.Zone); -+ else -+ sprintf(s, " (%s)", Rate.Zone); -+ sort[n].explain = strdup(s); -+ break; -+ case 2: -+ sprintf(s, " (%s)", printrate(&Rate)); -+ sort[n].explain = strdup(s); -+ break; -+ case 8: -+ sort[n].explain = strdup(P_EMPTY(getComment(i, comment))); -+ break; -+ case 9: /* used by list */ -+ { -+ double cpm = Rate.Duration > 0 ? 60 * Rate.Price / Rate.Duration : 99.99; -+ -+ if (Rate.Price == 0) -+ cpm = Rate.Basic; -+ -+ sprintf(s, "%s%c" -+ "%s%c%s%c%s%c%s%c" -+ "%s%c" -+ "%.3f%c%.4f%c%.4f%c%.2f%c%.3f%c" -+ "%s%c%.2f", -+ prefix2provider_variant(Rate.prefix, prov), DEL, -+ Rate.Provider, DEL, P_EMPTY(Rate.Zone), DEL, P_EMPTY(Rate.Day), DEL, P_EMPTY(Rate.Hour), DEL, -+ currency, DEL, /* Fixme: global or per -+ Provider?? wg. EURO */ -+ Rate.Charge, DEL, Rate.Basic, DEL, Rate.Price, DEL, Rate.Duration, DEL, cpm, DEL, -+ takt_str(&Rate), DEL, Rate.Sales); -+ sort[n].explain = strdup(s); -+ } -+ break; -+ default: -+ sort[n].explain = strdup(""); -+ break; -+ } -+ -+ n++; -+ } /* if */ -+ else if(verbose && *msg) -+ print_msg(PRT_V, "%s\n", msg); -+ -+ } /* else 99 */ -+ } /* for i */ -+ if (service) -+ num = getServiceNum(0); /* get next service num */ -+ else -+ num = 0; -+ } while (num && *num); -+ if (explain < 10) { -+ qsort((void *) sort, n, sizeof(SORT), compare_func); -+ if (lcr && n) { -+ RATE Cheap; -+ int res = getLeastCost(&Rate, &Cheap, booked, -1); -+ -+ if (res != UNKNOWN) { -+ sort[n].prefix = Cheap.prefix; -+ sort[n].rate = Cheap.Charge; -+ sort[n].name = Cheap.Provider; -+ sprintf(s, "(Cheapest: %s %s %s %s)", Cheap.dst[0], Cheap.dst[1], Cheap.dst[2], P_EMPTY(Cheap.Zone)); -+ sort[n].explain = strdup(s); -+ n++; -+ } /* res */ -+ } /* lcr */ -+ } /* explain */ -+ return (n); -+} /* compute */ -+ -+static void print_header(void) -+{ -+ printf("Eine %d Sekunden lange Verbindung von %s nach %s kostet am %s\n", -+ duration, formatNumber("%F", &srcnum), formatNumber("%F", &destnum), -+ ctime(&start)); -+} -+ -+static void printList(int n) -+{ -+ int i; -+ -+ if (header) -+ print_header(); -+ if (n > best) -+ n = best; -+ -+ for (i = 0; i < n; i++) -+ printf("%s\n", sort[i].explain); -+} -+ -+static void result(int n) -+{ -+ -+ register int i; -+ -+ if (header) -+ print_header(); -+ -+ if (n > best) -+ n = best; -+ for (i = 0; i < n; i++) -+ printf("%s %s %8.3f %s\n", -+ Provider(sort[i].prefix), currency, sort[i].rate, sort[i].explain); -+} /* result */ -+ -+ -+static void purge(int n) -+{ -+ register int i; -+ -+ for (i = 0; i < n; i++) -+ if (sort[i].explain) -+ free(sort[i].explain); -+} /* purge */ -+ -+/* -+ Werktag -+ Wochenende -+ Ortszone -+ Regionalzone -+ Fernzone -+ Handy -+ Internet -+ 0..23 Uhr -+ */ -+ -+#define STARTHOUR 8 -+ -+static void printTable(char *num) -+{ -+ register int n, d, i, h, lasthour; -+ auto struct tm *tm; -+ auto SORT last[_MAXLAST]; -+ auto int used[MAXPROVIDER]; -+ auto int hours[MAXPROVIDER]; -+ auto int weight[MAXPROVIDER]; -+ auto int useds = 0, maxhour; -+ auto SORT2 wsort[MAXPROVIDER]; -+ static int firsttime = 1; -+ int first; -+ int prefix; -+ -+ memset(used, 0, sizeof(used)); -+ memset(hours, 0, sizeof(hours)); -+ memset(weight, 0, sizeof(weight)); -+ -+ for (d = 0; d < 3; d++) { /* Werktag, Samstag, Sonntag */ -+ last[0].prefix = UNKNOWN; -+ lasthour = UNKNOWN; -+ -+ buildtime(); -+ tm = localtime(&start); -+ -+ if (!d) { /* first time */ -+ while (tm->tm_wday != 5) { /* find next Friday */ -+ start += (60 * 60 * 24); -+ tm = localtime(&start); -+ } /* while */ -+ } -+ else /* erst Samstag, dann */ -+ start += (60 * 60 * 24); /* Sonntag */ -+ -+ splittime(); -+ buildtime(); -+ -+ hour = STARTHOUR; -+ min = 0; -+ -+ first = 1; -+ -+ while (1) { -+ destnum.nprovider = UNKNOWN; -+ if (provider2prefix(num, &prefix)) /* set provider if it is in number */ -+ normalizeNumber(num, &destnum, TN_PROVIDER); -+ n = compute(num); -+ -+ if (header && first && d == 0 && firsttime) -+ print_header(); -+ -+ if (header && first) { -+ switch (d) { -+ case 0 : printf("\nWerktag:\n"); break; -+ case 1 : printf("\nSamstag:\n"); break; -+ case 2 : printf("\nSonntag:\n"); break; -+ } /* switch */ -+ -+ first = 0; -+ } /* if */ -+ -+ if (last[0].prefix == UNKNOWN) { -+ for (i = 0; i < min(n, MAXLAST); i++) { -+ if (sort[i].prefix) { -+ last[i].prefix = sort[i].prefix; -+ last[i].rate = sort[i].rate; -+ last[i].explain = strdup(sort[i].explain); -+ } /* if */ -+ } /* for */ -+ } /* if */ -+ -+ if (lasthour == UNKNOWN) -+ lasthour = hour; -+ -+ if (sort[0].prefix != last[0].prefix) { -+ for (i = 0; i < min(n, MAXLAST); i++) { -+ -+ if (!i) -+ printf(" %02d:00 .. %02d:59 %s = %s %s%s\n", -+ lasthour, hour - 1, Provider(last[i].prefix), -+ currency, -+ double2str(last[i].rate, 5, 3, DEB), -+ last[i].explain); -+ else -+ printf(" %s = %s %s%s\n", -+ Provider(last[i].prefix), -+ currency, -+ double2str(last[i].rate, 5, 3, DEB), -+ last[i].explain); -+ } /* for */ -+ -+ used[last[0].prefix]++; -+ -+ if (lasthour >= hour) -+ h = ((24 - lasthour) + hour); -+ else -+ h = hour - lasthour; -+ -+ hours[last[0].prefix] += h; -+ -+ if ((lasthour > 8) && (lasthour < 21)) -+ h *= 2; -+ -+ weight[last[0].prefix] += h * (d ? 1 : 5); -+ -+ for (i = 0; i < min(n, MAXLAST); i++) { -+ last[i].prefix = sort[i].prefix; -+ last[i].rate = sort[i].rate; -+ last[i].explain = strdup(sort[i].explain); -+ } /* for */ -+ -+ lasthour = hour; -+ } /* if */ -+ -+ purge(n); -+ -+ hour++; -+ -+ if (hour == 24) -+ hour = 0; -+ else if (hour == STARTHOUR) -+ break; -+ } /* while */ -+ -+ for (i = 0; i < min(n, MAXLAST); i++) { -+ -+ if (!i) { -+ if ((lasthour == STARTHOUR) && (hour == STARTHOUR)) -+ printf(" immer %s = %s %s%s\n", -+ Provider(last[i].prefix), -+ currency, -+ double2str(last[i].rate, 5, 3, DEB), -+ last[i].explain); -+ else -+ printf(" %02d:00 .. %02d:59 %s = %s %s%s\n", -+ lasthour, hour - 1, Provider(last[i].prefix), -+ currency, -+ double2str(last[i].rate, 5, 3, DEB), -+ last[i].explain); -+ } -+ else -+ printf(" %s = %s %s%s\n", -+ Provider(last[i].prefix), -+ currency, -+ double2str(last[i].rate, 5, 3, DEB), -+ last[i].explain); -+ } /* for */ -+ -+ used[last[0].prefix]++; -+ -+ if (lasthour >= hour) -+ h = ((24 - lasthour) + hour); -+ else -+ h = hour - lasthour; -+ -+ hours[last[0].prefix] += h; -+ -+ if ((lasthour > 8) && (lasthour < 21)) -+ h *= 2; -+ -+ weight[last[0].prefix] += h * (d ? 1 : 5); -+ -+ } /* for */ -+ -+ if (usestat) { -+ printf("\nProvider(s) used:\n"); -+ -+ maxhour = 9999999; -+ useds = 0; -+ -+ for (i = 0; i < MAXPROVIDER; i++) -+ if (used[i]) { -+ printf("%s %d times, %d hours, weight = %d\n", -+ Provider(i), used[i], hours[i], weight[i]); -+ -+ wsort[useds].weight = weight[i]; -+ wsort[useds].index = i; -+ -+ useds++; -+ -+ if (hours[i] < maxhour) -+ maxhour = hours[i]; -+ } /* if */ -+ -+ if ((best < MAXPROVIDER) && (best < useds)) { -+ printf("Retrying with only %d provider(s), eliminating %d provider(s)\n", best, useds - best); -+ -+ qsort((void *) wsort, useds, sizeof(SORT2), compare2); -+ -+ for (i = 0; i < useds; i++) { -+ printf("%s %d times, %d hours, weight = %d\n", -+ Provider(wsort[i].index), used[wsort[i].index], hours[wsort[i].index], weight[wsort[i].index]); -+ -+ if (i == best - 1) -+ printf("\n"); -+ -+ if (i >= best - 1) -+ ignore[wsort[i].index]++; -+ } /* for */ -+ -+ if (firsttime) -+ printTable(num); -+ -+ firsttime = 0; -+ -+ } /* if */ -+ } /* if */ -+} /* printTable */ -+ -+ -+static void clean_up() -+{ -+ if (providers) -+ free(providers); -+ providers = 0; -+ fromarea = 0; -+ table = list = header = explain = 0; -+ usestat = 0; -+ duration = LCR_DURATION; -+ wanted_day = '\0'; -+ takt = 99999; -+ if (comment) -+ free(comment); -+ comment = 0; -+ sortby = 0; -+ need_dest = 1; -+} -+ -+static char * sub_sp(char *p) -+{ -+ char *o = p; -+ int allupper=1; -+ for (; *p; p++) -+ if(!isupper(*p) && *p != '_' && !isdigit(*p)) { /* e.g. _DEMD1 */ -+ allupper = 0; -+ break; -+ } -+ if (!allupper) -+ for (p = o; *p; p++) -+ if(*p == '_') -+ *p = ' '; -+ return o; -+} -+static void doit(int i, int argc, char *argv[]) -+{ -+ int n; -+ int prefix; -+ char *num; -+ -+ post_init(); -+ memset(ignore, 0, sizeof(ignore)); -+ if (!need_dest && i == 0) { -+ i = 0; -+ argc = 1; -+ argv[0] = "2345"; -+ } -+ while (i < argc) { -+ num = sub_sp(argv[i]); -+ if (explain == 55) { -+ if (n_providers) { -+ destnum.nprovider = pnum2prefix_variant(providers[0], 0); -+ Strncpy(destnum.provider, getProvider(destnum.nprovider), TN_MAX_PROVIDER_LEN); -+ normalizeNumber(num, &destnum, TN_NO_PROVIDER); -+ } -+ else -+ normalizeNumber(num, &destnum, TN_ALL); -+ printf("%s => %s \n", num, formatNumber("%l - %p", &destnum)); -+ i++; -+ continue; -+ } -+ else if (explain == 52) { // enum Servce names -+ -+ int first = 1; -+ char *p; -+ -+ do { -+ p = getServiceNames(first); -+ if (p) -+ printf("%s\n", p); -+ first = 0; -+ } -+ while (p); -+ return; -+ } -+ destnum.nprovider = UNKNOWN; -+ if (provider2prefix(num, &prefix)) /* set provider if it is in -+ number */ -+ normalizeNumber(num, &destnum, TN_PROVIDER); -+ if (table) -+ printTable(num); -+ else { -+ n = compute(num); -+ if (list) -+ printList(n); -+ else if (explain < 10) -+ result(n); -+ purge(n); -+ } -+ i++; -+ } /* while */ -+ clean_up(); -+} -+ -+static void err(char *s) -+{ -+ print_msg(PRT_A, "%s - '%s'\n", s, strerror(errno)); -+ if (is_daemon == 2) -+ kill(getppid(), SIGTERM); -+ exit(2); -+} -+ -+static int handle_client(int fd) -+{ -+ char buffer[BUFSIZ]; -+ int argc, n, i; -+ char **argv; -+ char *p; -+ -+ if ((n = read(fd, buffer, BUFSIZ)) < 0) -+ err("Read"); -+ if (n) { -+ argv = calloc(sizeof(char *), 20); -+ -+ buffer[n] = '\0'; -+ if (verbose) -+ fprintf(stderr, "got '%s'\n", buffer); -+ argc = 0; -+ argv[argc++] = strdup(myname); -+ p = strtok(buffer, "\t\n "); -+ while (p) { -+ argv[argc++] = strdup(p); -+ p = strtok(0, "\t\n "); -+ if (argc >= 20) -+ break; -+ } -+ time(&start); /* set time of call */ -+ splittime(); /* date time my be overridden by opts */ -+ we_are_daemon = 1; -+ if ((i = opts(argc, argv)) || need_dest == 0) { -+ if (shutdown(fd, 0) < 0) /* no read any more */ -+ err("shutdown"); -+ if (dup2(fd, STDOUT_FILENO) < 0) /* stdout to sock */ -+ err("dup"); -+ doit(i, argc, argv); -+ fflush(stdout); -+ fclose(stdout); -+ } -+ for (i = 0; i < argc; i++) -+ free(argv[i]); -+ free(argv); -+ } -+ return n == 0 ? -1 : 0; -+} -+ -+void catch_sig(int sig) -+{ -+ print_msg(PRT_A, "Signal %d\n", sig); -+ unlink(socket_file); -+ if (pid_dir) -+ unlink(pid_file); -+ err("Sig"); -+} -+ -+static void del_sock(void) -+{ -+ if (getppid() > 0) { -+ unlink(socket_file); -+ if (pid_dir) -+ unlink(pid_file); -+ } -+} -+ -+static volatile sig_atomic_t stopped = 0; -+static volatile sig_atomic_t reinit = 0; -+ -+static void catch_term(int sig) -+{ -+ stopped = 1; -+} -+ -+static void catch_hup(int sig) -+{ -+ print_msg(PRT_A, "Signal %d restarting %s\n", sig, myname); -+ del_sock(); -+ execvp(myname, hup_argv); -+ print_msg(PRT_A, "- failed\n"); -+} -+ -+static void do_reinit(void) -+{ -+ /* deinit(), init() doesn't */ -+ reinit=0; -+} -+ -+/* thank's to Jochen Erwied for this: */ -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) \ -+ -+#endif -+ -+static void setup_daemon() -+{ -+ int sock; -+ struct sockaddr_un sa; -+ struct sockaddr_in client; -+ fd_set active_fd_set, read_fd_set; -+ char *sock_name = socket_file; -+ socklen_t size; -+ struct stat stat_buf; -+ int i; -+ pid_t pid; -+ char pidname[] = "isdnrate.pid"; -+ FILE *fp; -+ -+ if (verbose) -+ fprintf(stderr, "Setup sockets\n"); -+ signal(SIGTERM, catch_term); -+ signal(SIGINT, catch_sig); -+ signal(SIGHUP, catch_hup); -+ -+ if (is_daemon == 2) { /* go background */ -+ -+ fprintf(stderr, "Going background\n"); -+ verbose = 0; -+ pid = fork(); -+ if (pid < 0) -+ err("Going bg failed"); -+ else if (pid > 0) { -+ exit(EXIT_SUCCESS); -+ } -+ } -+ if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) -+ err("Can't open socket"); -+ sa.sun_family = AF_UNIX; -+ strcpy(sa.sun_path, sock_name); -+ size = offsetof(struct sockaddr_un, sun_path) + strlen(sa.sun_path) + 1; -+ -+ if (bind(sock, (struct sockaddr *) &sa, size) < 0) -+ err("Can't bind sock"); -+ -+ stat(sock_name, &stat_buf); -+ chmod(sock_name, stat_buf.st_mode | S_IWOTH | S_IWGRP); -+/* should better have perm wwwrun.nogroup */ -+ -+ if (listen(sock, SOMAXCONN) < 0) -+ err("Can't listen"); -+ if (pid_dir) { -+ pid_file = malloc(strlen(pid_dir) + strlen(pidname) + 2); -+ strcpy(pid_file, pid_dir); -+ if (pid_file[strlen(pid_file) - 1] != '/') -+ strcat(pid_file, "/"); -+ strcat(pid_file, pidname); -+ if ((fp = fopen(pid_file, "w")) == 0) -+ fprintf(stderr, "Can't write %s\n", pid_file); -+ else { -+ fprintf(fp, "%d\n", getpid()); -+ fclose(fp); -+ } -+ } -+ atexit(del_sock); -+ FD_ZERO(&active_fd_set); -+ FD_SET(sock, &active_fd_set); -+ while (!stopped) { -+ if (reinit) -+ do_reinit(); -+ read_fd_set = active_fd_set; -+ if (TEMP_FAILURE_RETRY(select(FD_SETSIZE, &read_fd_set, 0, 0, 0)) < 0) -+ err("select"); -+ for (i = 0; i < FD_SETSIZE; i++) -+ if (FD_ISSET(i, &read_fd_set)) { -+ if (i == sock) { /* request on orig */ -+ int new; -+ -+ size = sizeof(client); -+ if ((new = accept(sock, (struct sockaddr *) &client, &size)) < 0) -+ err("accept"); -+ if (verbose) -+ fprintf(stderr, "Accepted %d\n", new); -+ FD_SET(new, &active_fd_set); -+ } -+ else { /* already connected */ -+ pid_t pid; -+ int status; -+ -+ if (verbose) -+ fprintf(stderr, "Handle client %d\n", i); -+ pid = fork(); -+ if (pid == 0) { -+ handle_client(i); -+ _exit(EXIT_SUCCESS); -+ } -+ else if (pid < 0) -+ err("fork"); -+ else { -+ if (waitpid(pid, &status, 0) != pid) -+ err("waitpid"); -+ close(i); -+ FD_CLR(i, &active_fd_set); -+ } -+ } /* if i */ -+ } /* if ISSET */ -+ } /* while */ -+ del_sock(); -+ exit(EXIT_SUCCESS); -+} -+ -+static int connect_2_daemon(int argc, char *argv[]) -+{ -+ int sock; -+ struct sockaddr_un sa; -+ char *sock_name = socket_file; -+ size_t size; -+ int i, c, len; -+ char *p, *q, buffer[BUFSIZ]; -+ -+ if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) -+ err("Can't open socket"); -+ sa.sun_family = AF_UNIX; -+ strcpy(sa.sun_path, sock_name); -+ size = offsetof(struct sockaddr_un, sun_path) + strlen(sa.sun_path) + 1; -+ -+ if (connect(sock, (struct sockaddr *) &sa, size) < 0) -+ err("Can't connect sock"); -+ p = buffer; -+ optind = 0; /* reinit */ -+ len = 0; -+ while ((c = getopt(argc, argv, options)) != EOF && len < BUFSIZ - 10) { -+ switch (c) { -+ case '?': -+ case 'C': -+ break; -+ case 'D': -+ if (optarg && atoi(optarg) == 3) ; /* goon, kill a running -+ daemon */ -+ else -+ break; -+ default: -+ *p++ = '-'; -+ *p++ = c; -+ len += 3; -+ if (optarg) -+ for (q = optarg; *q && len < BUFSIZ - 10; len++) -+ *p++ = *q++; -+ *p++ = ' '; -+ break; -+ } -+ } -+ for (i = optind; i < argc; i++) { -+ for (q = argv[i]; *q && len < BUFSIZ - 10; len++) -+ *p++ = *q++; -+ *p++ = ' '; -+ len++; -+ } -+ *--p = '\x0'; -+ i = write(sock, buffer, strlen(buffer) + 1); -+ if (i < 0) -+ err("Write sock"); -+ while ((i = read(sock, buffer, BUFSIZ)) > 0) -+ write(1, buffer, i); -+ close(sock); -+ return EXIT_SUCCESS; -+} -+ -+ -+int main(int argc, char *argv[], char *envp[]) -+{ -+ register int i; -+ sigset_t unblock_set; -+ -+ myname = argv[0]; -+ myshortname = basename(myname); -+ -+ time(&start); -+ splittime(); -+ socket_file = strdup(SOCKNAME); -+ /* borrowed from isdnlog.c, thanks */ -+ hup_argv = argv; -+ sigemptyset(&unblock_set); -+ sigaddset(&unblock_set, SIGHUP); -+ sigprocmask(SIG_UNBLOCK, &unblock_set, NULL); -+ -+ if ((i = opts(argc, argv)) || need_dest == 0) { -+ if (is_client) -+ exit(connect_2_daemon(argc, argv)); -+ else -+ init(); -+ if (is_daemon) { -+ clean_up(); -+ setup_daemon(); -+ } -+ else -+ doit(i, argc, argv); -+ } -+ else { -+ print_msg(PRT_A, usage, myshortname, myshortname, options); -+ print_msg(PRT_A, "\n"); -+ print_msg(PRT_A, "\t-a \tall=show old and newer rates (default actual only)\n", MAXPROVIDER); -+ print_msg(PRT_A, "\t-b best\tshow only the first <best> provider(s) (default %d)\n", MAXPROVIDER); -+ print_msg(PRT_A, "\t-d d[.m[.y]] | {W|N|E}\tstart date of call (default now)\n"); -+ print_msg(PRT_A, "\t-f areacode\tyou are calling from <areacode>\n"); -+ print_msg(PRT_A, "\t-h h[:m[:s]]\tstart time of call (default now)\n"); -+ print_msg(PRT_A, "\t-l duration\tduration of call in seconds (default %d seconds)\n", LCR_DURATION); -+ print_msg(PRT_A, "\t-o \t show only booked providers\n"); -+ print_msg(PRT_A, "\t-p prov|B[,prov...]\t show only these providers\n"); -+ print_msg(PRT_A, "\t-s \t consider 'Destination' as a service name\n"); -+ print_msg(PRT_A, "\t-t takt\t\tshow providers if chargeduration<=takt\n"); -+ print_msg(PRT_A, "\t-v [level]\tverbose\n"); -+ print_msg(PRT_A, "\t-x prov|B[,prov...]\t exclude these providers\n"); -+ -+ print_msg(PRT_A, "\tOutput and run options\n"); -+ print_msg(PRT_A, "\t-C\trun as client, connecting to a running daemon\n"); -+ print_msg(PRT_A, "\t-CD3\tkill a running daemon\n"); -+ print_msg(PRT_A, "\t-D\trun as daemon\n"); -+ print_msg(PRT_A, "\t-D2\trun as daemon & go background\n"); -+ print_msg(PRT_A, "\t-G which\tshow raw data\n"); -+ print_msg(PRT_A, "\t-H\tshow a header\n"); -+ print_msg(PRT_A, "\t-L\tshow a detailed list\n"); -+ print_msg(PRT_A, "\t-O sOcket-path\twrite socket to this file (def:tmp/isdnrate)\n"); -+ print_msg(PRT_A, "\t-P pid-dir\twrite own PID to pid-dir/isdnrate.pid\n"); -+ print_msg(PRT_A, "\t-N\tparse the given telefon numbers\n"); -+ print_msg(PRT_A, "\t-S[v|n]\tsort by v=VBN, n=Name, default=Charge\n"); -+ print_msg(PRT_A, "\t-T\tshow a table of day/night week/weekend\n"); -+ print_msg(PRT_A, "\t-U\tshow usage stats for table\n"); -+ print_msg(PRT_A, "\t-V\tshow version info\n"); -+ print_msg(PRT_A, "\t-X\texplain each rate\n"); -+ print_msg(PRT_A, "\t-X2\texplain more\n"); -+ print_msg(PRT_A, "\t-X comment\tprint <comment> from C:tag\n"); -+ print_msg(PRT_A, "\t-Z show entry from getLeastCost\n"); -+ print_msg(PRT_A, "\n\te.g.\t%s -b5 -f30 -TH -t1 Zaire\n", myshortname); -+ } /* else */ -+/* deinit(); Fixme: this SIGSEGVs in exitHoliday */ -+ return (0); -+} /* isdnrate */ -diff -Naur isdn4k-utils-orig//isdnlog/tools/rate.c isdn4k-utils/isdnlog/tools/rate.c ---- isdn4k-utils-orig//isdnlog/tools/rate.c 2002-07-06 09:22:33.000000000 +1000 -+++ isdn4k-utils/isdnlog/tools/rate.c 2010-12-04 20:44:03.786672226 +1000 -@@ -1773,6 +1773,7 @@ - number=realloc(number, numbers*sizeof(int)); - number[numbers-1]=i; - skip: -+ ; - } - - while (isblank(*s)) s++; -@@ -2344,6 +2345,7 @@ - } - return UNKNOWN; - done: -+ ; - } - } - } -diff -Naur isdn4k-utils-orig//lib/libtools.c isdn4k-utils/lib/libtools.c ---- isdn4k-utils-orig//lib/libtools.c 1999-11-04 02:13:36.000000000 +1000 -+++ isdn4k-utils/lib/libtools.c 2010-12-04 20:44:03.786672226 +1000 -@@ -711,6 +711,7 @@ - case 'r': _mode |= R_OK; - break; - default : -+ ; - } - } - -diff -Naur isdn4k-utils-orig//Makefile isdn4k-utils/Makefile ---- isdn4k-utils-orig//Makefile 2002-07-20 05:03:49.000000000 +1000 -+++ isdn4k-utils/Makefile 2010-12-04 20:43:57.890005560 +1000 -@@ -132,12 +132,6 @@ - - install: rootperm - set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done -- @if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \ -- then \ -- /bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \ -- else \ -- sh scripts/makedev.sh $(DESTDIR) ; \ -- fi - - uninstall: rootperm - set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done diff --git a/testing/jfsutils/PKGBUILD b/testing/jfsutils/PKGBUILD deleted file mode 100644 index ad63dae8a..000000000 --- a/testing/jfsutils/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 141712 2011-11-02 12:52:05Z bisson $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=jfsutils -pkgver=1.1.15 -pkgrel=3 -pkgdesc='JFS filesystem utilities' -arch=('i686' 'x86_64') -url='http://jfs.sourceforge.net' -license=('GPL') -groups=('base') -depends=('util-linux-ng') -source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz") -sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --sbindir=/sbin - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/kwebkitpart/PKGBUILD b/testing/kwebkitpart/PKGBUILD deleted file mode 100644 index 3580adbf8..000000000 --- a/testing/kwebkitpart/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 141353 2011-10-29 17:37:01Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kwebkitpart -pkgver=1.2.0 -pkgrel=2 -pkgdesc="A WebKit browser component for KDE" -url="http://opendesktop.org/content/show.php?content=127960" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") -md5sums=('e736d7b26cf6e3c0eed837837b3f032b') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/testing/kwebkitpart/kwebkitpart.install b/testing/kwebkitpart/kwebkitpart.install deleted file mode 100644 index e70c054ec..000000000 --- a/testing/kwebkitpart/kwebkitpart.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/libcroco/PKGBUILD b/testing/libcroco/PKGBUILD deleted file mode 100644 index 5beb276a6..000000000 --- a/testing/libcroco/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 142751 2011-11-14 19:18:02Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libcroco -pkgver=0.6.3 -pkgrel=1 -pkgdesc="A CSS parsing library" -arch=('x86_64' 'i686') -depends=('glib2' 'libxml2') -makedepends=('intltool') -license=('LGPL') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz) -url="http://www.gnome.org" -sha256sums=('8b7c565bf3eae1dff0a09d128fc3726acc1a492a7de23b25dce803a4f93d42c1') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/testing/libffado/60-ffado.rules b/testing/libffado/60-ffado.rules deleted file mode 100644 index 6ab8ef851..000000000 --- a/testing/libffado/60-ffado.rules +++ /dev/null @@ -1,27 +0,0 @@ -SUBSYSTEM!="firewire", GOTO="ffado_end" - -ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1" # TC GROUP A/S -ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1" # Mark of the Unicorn, Inc. -ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1" # Apogee Electronics Corp. -ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1" # Alesis Corporation -ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1" # Bridgeco Co AG -ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1" # Presonus Corporation -ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1" # TerraTec Electronic GmbH -ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1" # M-Audio -ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1" # Ego Systems Inc. -ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1" # Loud Technologies Inc. -ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1" # Stanton Magnetics,inc. -ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1" # Focusrite Audio Engineering Limited -ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1" # Echo Digital Audio Corporation -ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1" # BEHRINGER Spezielle Studiotechnik GmbH -ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1" # FlexRadio Systems -ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1" # Weiss Engineering Ltd. -ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1" # ROLAND DG CORPORATION - -# The devices below abuse another Vendor's ID, and therefore we need more advanced rules for those. - -ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # CME, Matrix K FW -ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # Mackie, Onyx Firewire -ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1" # RME - -LABEL="ffado_end" diff --git a/testing/libffado/PKGBUILD b/testing/libffado/PKGBUILD deleted file mode 100644 index a73d9a212..000000000 --- a/testing/libffado/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# $Id: PKGBUILD 142838 2011-11-16 19:18:19Z schiv $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: galiyosha@gmail.com -# Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> - -pkgname=libffado -pkgver=2.0.1 -pkgrel=5 -pkgdesc="Driver for FireWire audio devices" -arch=('i686' 'x86_64') -url="http://www.ffado.org/" -license=('GPL') -depends=('libiec61883' 'libavc1394' 'libsigc++' - 'libxml++' 'alsa-lib' 'dbus') -makedepends=('scons' 'python2-qt') -optdepends=('python2: ffado-diag' - 'python2-qt: mixer applet') -provides=('ffado') -source=("http://www.ffado.org/files/$pkgname-$pkgver.tar.gz" - '60-ffado.rules') -md5sums=('786f31facd417e6207e429f50af0e15e' - 'f03a3e950801c4405b8934084651bca8') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # hack to use CFLAGS without optimising - sed -i 's/-O2//g' SConstruct - - if [ "$CARCH" = "x86_64" ]; then - sed -i "s/-m64/-m64 $CFLAGS/g" SConstruct - else - sed -i "s/-m32/-m32 $CFLAGS/g" SConstruct - fi - - # python2 fix - sed -i 's:python $SOURCE:python2 $SOURCE:' SConstruct - sed -i 's:python support/tools:python2 support/tools:' \ - support/tools/SConscript - - scons PREFIX=/usr #ENABLE_OPTIMIZATIONS=True -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - scons DESTDIR="$pkgdir" WILL_DEAL_WITH_XDG_MYSELF="True" install - - # add audio device rules - # see https://bugs.archlinux.org/task/26342 - install -Dm644 "$srcdir/60-ffado.rules" \ - "$pkgdir/lib/udev/rules.d/60-ffado.rules" - - # python2 fix - for i in $(grep '^#!.*bin.*python' -R "$pkgdir" | sed 's/:.*//'); do - sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' "$i" - done - - # desktop files & icons - install -Dm644 support/xdg/ffado.org-ffadomixer.desktop \ - "$pkgdir/usr/share/applications/ffadomixer.desktop" - - install -Dm644 support/xdg/hi64-apps-ffado.png \ - "$pkgdir/usr/share/pixmaps/$pkgname.png" -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/libgnome-keyring/PKGBUILD b/testing/libgnome-keyring/PKGBUILD deleted file mode 100644 index 8f8cb25cb..000000000 --- a/testing/libgnome-keyring/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -#$Id: PKGBUILD 142734 2011-11-14 11:17:40Z ibiru $ -#Maintainer: Jan De Groot <jgc@archlinux.org> - -pkgname=libgnome-keyring -pkgver=3.2.2 -pkgrel=1 -pkgdesc="GNOME keyring client library" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -depends=('dbus-core' 'libgcrypt' 'glib2') -makedepends=('intltool' 'pkgconfig') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2bcbe47b1960737866835a516056c36d1a3d82d5ad101c70d5a87e1ad616adb3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-keyring - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/librpcsecgss/PKGBUILD b/testing/librpcsecgss/PKGBUILD deleted file mode 100644 index b492e3218..000000000 --- a/testing/librpcsecgss/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 141978 2011-11-03 20:10:28Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Andrew Krawchyk <krawch_a@denison.edu>, Marco Lima <cipparello gmail com> - -pkgname=librpcsecgss -pkgver=0.19 -pkgrel=7 -pkgdesc="Library for RPCSECGSS support" -arch=('i686' 'x86_64') -url="http://www.citi.umich.edu/projects/nfsv4/linux/" -license=('GPL') -depends=('glibc' 'krb5' 'libgssglue') -makedepends=('pkg-config' 'autoconf') -options=('!libtool') -source=("http://www.citi.umich.edu/projects/nfsv4/linux/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('b45ed565bdc3099023aa35830ec92997') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir/" install -} diff --git a/testing/librpcsecgss/librpcsecgss-0.18-heimdal.patch b/testing/librpcsecgss/librpcsecgss-0.18-heimdal.patch deleted file mode 100644 index deb039123..000000000 --- a/testing/librpcsecgss/librpcsecgss-0.18-heimdal.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -NaurwB librpcsecgss-0.18.orig/configure.in librpcsecgss-0.18/configure.in ---- librpcsecgss-0.18.orig/configure.in 2008-04-09 00:05:40.000000000 +0200 -+++ librpcsecgss-0.18/configure.in 2008-06-12 19:05:51.000000000 +0200 -@@ -12,10 +12,15 @@ - AC_PROG_RANLIB - - # Checks for libraries. --PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1], [], -+PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1], -+ [echo GSSGLUE found; GSSAPI_IMPLEMENTATION=libgssglue], -+ [PKG_CHECK_MODULES([GSSGLUE], [heimdal-gssapi], -+ [echo HEIMDAL found; GSSAPI_IMPLEMENTATION=heimdal-gssapi], - [AC_MSG_ERROR([Unable to locate information required to use libgssglue. - If you have pkgconfig installed, you might try setting environment -- variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])]) -+ variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])])]) -+ -+AC_SUBST([GSSAPI_IMPLEMENTATION]) - - # Checks for header files. - AC_HEADER_STDC -diff -NaurwB librpcsecgss-0.18.orig/librpcsecgss.pc.in librpcsecgss-0.18/librpcsecgss.pc.in ---- librpcsecgss-0.18.orig/librpcsecgss.pc.in 2007-09-06 17:39:04.000000000 +0200 -+++ librpcsecgss-0.18/librpcsecgss.pc.in 2008-06-12 19:06:40.000000000 +0200 -@@ -5,7 +5,7 @@ - - Name: librpcsecgss - Description: Library that implements rpcsec_gss interface. --Requires: libgssglue -+Requires: @GSSAPI_IMPLEMENTATION@ - Version: @PACKAGE_VERSION@ - Libs: -L@libdir@ -lrpcsecgss - Cflags: -I@includedir@/rpcsecgss diff --git a/testing/librsvg/PKGBUILD b/testing/librsvg/PKGBUILD deleted file mode 100644 index e9a4a7357..000000000 --- a/testing/librsvg/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 142753 2011-11-14 19:25:00Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=librsvg -pkgver=2.34.2 -pkgrel=1 -pkgdesc="A SVG viewing library" -arch=(i686 x86_64) -license=('LGPL') -depends=('gdk-pixbuf2' 'pango' 'libcroco') -makedepends=('intltool' 'gtk2') -optdepends=('gtk2: for rsvg-view support') -options=('!libtool' '!emptydirs') -url="http://librsvg.sourceforge.net/" -install=librsvg.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.34/$pkgname-$pkgver.tar.xz) -sha256sums=('5de701325b84c0a15ab6892f49ffd6471722044bfe0b350725bf420642ee4464') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' rsvg.in - ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \ - --with-croco --disable-static \ - --with-svgz - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/testing/librsvg/librsvg.install b/testing/librsvg/librsvg.install deleted file mode 100644 index 4d48b071f..000000000 --- a/testing/librsvg/librsvg.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/gdk-pixbuf-query-loaders --update-cache -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/libusb-compat/PKGBUILD b/testing/libusb-compat/PKGBUILD deleted file mode 100644 index 1e8f2a3d9..000000000 --- a/testing/libusb-compat/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 142008 2011-11-03 22:50:48Z andrea $ -# Maintainer: -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: arjan <arjan@archlinux.org> - -pkgname=libusb-compat -pkgver=0.1.3 -pkgrel=2 -pkgdesc="Library to enable user space application programs to communicate with USB devices" -arch=('i686' 'x86_64') -depends=('libusb' 'sh') -url="http://libusb.sourceforge.net/" -license=('LGPL') -source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2") -options=('!libtool') -md5sums=('570ac2ea085b80d1f74ddc7c6a93c0eb') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install -} diff --git a/testing/linux-atm/PKGBUILD b/testing/linux-atm/PKGBUILD deleted file mode 100644 index ad76db0b5..000000000 --- a/testing/linux-atm/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 141992 2011-11-03 20:43:33Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Surain Mallawa Arachchi <mas@crc32.net> - -pkgname=linux-atm -pkgver=2.5.2 -pkgrel=1 -pkgdesc="Drivers and tools to support ATM networking under Linux." -arch=('i686' 'x86_64') -depends=('glibc') -url="http://linux-atm.sourceforge.net/" -license=(GPL) -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz - man-pages.patch) -options=(!libtool !makeflags) -md5sums=('d49499368c3cf15f73a05d9bce8824a8' - '181390736336cdb615ae32f1ae5acfa6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../man-pages.patch - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/linux-atm/man-pages.patch b/testing/linux-atm/man-pages.patch deleted file mode 100644 index c504cfe87..000000000 --- a/testing/linux-atm/man-pages.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up linux-atm-2.5.1/src/led/zeppelin.8.fixman linux-atm-2.5.1/src/led/zeppelin.8 ---- linux-atm-2.5.1/src/led/zeppelin.8.fixman 2003-05-02 19:35:04.000000000 +0200 -+++ linux-atm-2.5.1/src/led/zeppelin.8 2010-10-13 12:58:18.000000000 +0200 -@@ -99,7 +99,7 @@ Ring and ATM parts of the ELAN, so using - recommended. Token Ring support has received less testing than its - Ethernet counterpart. - .SH FILES --.IP \fI/var/run/lec[interface number].pid\fP -+\fI/var/run/lec[interface number].pid\fP - The file containing the process id of zeppelin. - .SH BUGS - John Bonham died 1980 and Led Zeppelin broke. -diff -up linux-atm-2.5.1/src/mpoad/mpcd.8.fixman linux-atm-2.5.1/src/mpoad/mpcd.8 ---- linux-atm-2.5.1/src/mpoad/mpcd.8.fixman 2001-10-10 00:33:07.000000000 +0200 -+++ linux-atm-2.5.1/src/mpoad/mpcd.8 2010-10-13 12:59:14.000000000 +0200 -@@ -28,7 +28,7 @@ mpcd \- ATM MPOA (Multi\-Protocol Over A - .B ]] - .SH DESCRIPTION - MPOA client --.SM(MPC) is responsible for creating and receiving -+.SM (MPC) is responsible for creating and receiving - internetwork layer shortcuts. Using these shortcuts MPCs forward - unicast internetwork layer packets effectively over ATM without need - for routing protocols. -@@ -43,7 +43,7 @@ accepts shortcuts and packets arriving o - shortcuts is done with the help of - .SM MPOA - server --.SM(MPS). -+.SM (MPS). - .PP - Just as the Linux - .SM LAN -diff -up linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman linux-atm-2.5.1/src/sigd/atmsigd.conf.4 ---- linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman 2001-10-10 00:33:07.000000000 +0200 -+++ linux-atm-2.5.1/src/sigd/atmsigd.conf.4 2010-10-13 12:58:49.000000000 +0200 -@@ -125,7 +125,7 @@ a comment. The `#' character cannot be e - .P - If an option is specified in \fBatmsigd.conf\fP and on the command - line, the command line has priority. --.COMPATIBILITY -+.SH COMPATIBILITY - Certain options used by past versions of \fBatmsigd\fP but no longer documented - on the man page are still recognized and supported, but they also yield a - warning message. Future versions of \fBatmsigd\fP will not recognize those diff --git a/testing/nouveau-drm-lts/COPYING b/testing/nouveau-drm-lts/COPYING deleted file mode 100644 index 6e74c337c..000000000 --- a/testing/nouveau-drm-lts/COPYING +++ /dev/null @@ -1,48 +0,0 @@ - Copyright 2005 Adam Jackson. - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation on the rights to use, copy, modify, merge, - publish, distribute, sub license, and/or sell copies of the Software, - and to permit persons to whom the Software is furnished to do so, - subject to the following conditions: - - The above copyright notice and this permission notice (including the - next paragraph) shall be included in all copies or substantial - portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NON-INFRINGEMENT. IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - ------------------------------------------------------------------------- - - Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. - Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. - All Rights Reserved. - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice (including the - next paragraph) shall be included in all copies or substantial - portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS - SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. diff --git a/testing/nouveau-drm-lts/Makefile b/testing/nouveau-drm-lts/Makefile deleted file mode 100644 index 123bc5339..000000000 --- a/testing/nouveau-drm-lts/Makefile +++ /dev/null @@ -1,102 +0,0 @@ -# This Makefile is loosely based on the drm.git/linux-core/Makefile and -# the preliminary work by Christopher James Halse Rogers. -# Edited by Pekka Paalanen <pq@iki.fi> - -# By default, the build is done against the running linux kernel source. -# To build against a different kernel source tree, set LINUXDIR: -# -# make LINUXDIR=/path/to/kernel/source - -# By default, it is assumed the Nouveau kernel tree is found in $PWD/../. -# To use a different path to the Nouveau kernel tree, set NOUVEAUROOTDIR: -# -# make NOUVEAUROOTDIR=/path/to/nouveau/linux-2.6 - - -ifndef LINUXDIR -RUNNING_REL := $(shell uname -r) - -LINUXDIR := $(shell if [ -e /lib/modules/$(RUNNING_REL)/source ]; then \ - echo /lib/modules/$(RUNNING_REL)/source; \ - else echo /lib/modules/$(RUNNING_REL)/build; fi) -endif - -NOUVEAUGITREMOTE ?= origin -NOUVEAUROOTDIR ?= $(CURDIR)/.. -override NOUVEAUROOTDIR := $(abspath $(NOUVEAUROOTDIR)) - -TESTFILE := include/drm/nouveau_drm.h -ifeq ($(wildcard $(NOUVEAUROOTDIR)/$(TESTFILE)),) -$(error $(NOUVEAUROOTDIR) does not look like the right kernel tree, \ - please set NOUVEAUROOTDIR) -endif - -GIT_REVISION := $(shell GIT_DIR=$(NOUVEAUROOTDIR)/.git \ - git describe --always --abbrev=17 2> /dev/null) - -DRMINC := -I$(NOUVEAUROOTDIR)/include/drm -DRMDIR := $(NOUVEAUROOTDIR)/drivers/gpu/drm -DRMCFG := \ - CONFIG_DRM=m \ - CONFIG_DRM_KMS_HELPER=m \ - CONFIG_DRM_TTM=m \ - CONFIG_DRM_NOUVEAU=m \ - CONFIG_DRM_NOUVEAU_KMS=n \ - CONFIG_DRM_NOUVEAU_BACKLIGHT=y \ - CONFIG_DRM_NOUVEAU_DEBUG=y \ - CONFIG_DRM_I2C_CH7006=m \ - CONFIG_DRM_TDFX=n \ - CONFIG_DRM_R128=n \ - CONFIG_DRM_RADEON=n \ - CONFIG_DRM_MGA=n \ - CONFIG_DRM_I810=n \ - CONFIG_DRM_I830=n \ - CONFIG_DRM_I915=n \ - CONFIG_DRM_SIS=n \ - CONFIG_DRM_SAVAGE=n \ - CONFIG_DRM_VIA=n - -EXTRA_CFLAGS := -MYEXTRA_CFLAGS := -MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_BACKLIGHT -MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_DEBUG - -ifneq ($(GIT_REVISION),) -MYEXTRA_CFLAGS += '-DGIT_REVISION=\"$(GIT_REVISION)\"' -endif - -MYPARMS := -C $(LINUXDIR) KCPPFLAGS="$(DRMINC)" SUBDIRS="$(DRMDIR)" $(DRMCFG) - -MYEXTRA_CFLAGS += $(EXTRA_CFLAGS) -ifneq ($(MYEXTRA_CFLAGS),) -MYPARMS += EXTRA_CFLAGS="$(MYEXTRA_CFLAGS)" -endif - -.PHONY: all modules install clean archive FORCE - -all: modules -FORCE: - -modules: - $(MAKE) $(MYPARMS) modules - -install: - $(MAKE) $(MYPARMS) modules_install - -clean: - $(MAKE) $(MYPARMS) clean - -archive: newttm-devel-compat.tar.gz newttm-devel.tar.gz master.tar.gz - -newttm-devel-compat.tar.gz: EXTRAS=nouveau README-nouveau - -%.tar: FORCE - GIT_DIR=$(NOUVEAUROOTDIR)/.git \ - git archive --format=tar --prefix=$*/ $(NOUVEAUGITREMOTE)/$* \ - drivers/gpu/drm include/drm $(EXTRAS) > $@ - -%.tar.gz: %.tar - gzip -9 -c $< > $@ - -# The commit id of the archive can be read with -# $ zcat foo.tar.gz | git get-tar-commit-id diff --git a/testing/nouveau-drm-lts/PKGBUILD b/testing/nouveau-drm-lts/PKGBUILD deleted file mode 100644 index 1899ca19a..000000000 --- a/testing/nouveau-drm-lts/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 142530 2011-11-11 16:57:55Z tpowa $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: buddabrod <buddabrod@gmail.com> - -pkgname=nouveau-drm-lts -_snapdate=20100313 -pkgver=0.0.16_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version -_extramodules=extramodules-2.6.32-lts -_kernver="$(cat /lib/modules/${_extramodules}/version)" -pkgrel=7 -pkgdesc="nvidia opensource X driver" -arch=('i686' 'x86_64') -url="http://nouveau.freedesktop.org/" -depends=("kernel26-lts>=2.6.32" "kernel26-lts<2.6.33") -makedepends=("kernel26-lts-headers>=2.6.32" "kernel26-lts-headers<2.6.33") -# http://nouveau.freedesktop.org/wiki/InstallDRM#head-771a47a133fba6a5a70253656e76c61e9bff93bd -optdepends=('nouveau-firmware: needed for very new card (NV50 family and above) to work properly where the OSS replacement does not work well') -#makedepends=('git' 'autoconf' 'pkgconfig') -install=nouveau-drm.install -license=('GPL') -options=('!strip') -source=(ftp://ftp.archlinux.org/other/${pkgname/-lts//}/master-${_snapdate}.tar.gz - # http://people.freedesktop.org/~pq/nouveau-drm/master.tar.gz - # get the Makefile from http://cgit.freedesktop.org/nouveau/linux-2.6/plain/nouveau/Makefile?h=master-compat - Makefile) -md5sums=('ad7ad0fb73d56bcff3d2b54a70c3d511' - 'e7d5df80186d5c736e82b0a7d46216bc') - -build() { - cd ${srcdir}/master - mkdir nouveau - cp $srcdir/Makefile ${srcdir}/master/nouveau/ - cd nouveau - make LINUXDIR=/lib/modules/${_kernver}/build DRM_MODULES="nouveau" -} - -package() { - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm.ko ${pkgdir}/lib/modules/${_extramodules}/updates/drm.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm_kms_helper.ko ${pkgdir}/lib/modules/${_extramodules}/updates/drm_kms_helper.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/${_extramodules}/kernel/drivers/video/nouveau.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/${_extramodules}/updates/ttm.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/${_extramodules}/updates/ch7006.ko - - # install script - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" ${startdir}/nouveau-drm.install - # gzip -9 modules - find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; -} diff --git a/testing/nouveau-drm-lts/dont_check_for_pthread.patch b/testing/nouveau-drm-lts/dont_check_for_pthread.patch deleted file mode 100644 index 050f55767..000000000 --- a/testing/nouveau-drm-lts/dont_check_for_pthread.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac ---- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 -+++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 -@@ -32,10 +32,6 @@ - AC_HEADER_STDC - AC_SYS_LARGEFILE - --PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) --AC_SUBST(PTHREADSTUBS_CFLAGS) --AC_SUBST(PTHREADSTUBS_LIBS) -- - pkgconfigdir=${libdir}/pkgconfig - AC_SUBST(pkgconfigdir) - AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev], -diff -ru libdrm-2.4.0/libdrm/intel/Makefile.am libdrm-2.4.0-nostubs/libdrm/intel/Makefile.am ---- libdrm-2.4.0/libdrm/intel/Makefile.am 2008-10-14 01:39:32.000000000 +0200 -+++ libdrm-2.4.0-nostubs/libdrm/intel/Makefile.am 2008-10-21 10:49:00.000000000 +0200 -@@ -26,13 +26,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir)/libdrm \ - -I$(top_srcdir)/libdrm/intel \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/shared-core - - libdrm_intel_la_LTLIBRARIES = libdrm_intel.la - libdrm_intel_ladir = $(libdir) - libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_intel_la_LIBADD = ../libdrm.la - - libdrm_intel_la_SOURCES = \ - intel_bufmgr.c \ ---- libdrm-2.4.5/libdrm/nouveau/Makefile.am.orig 2009-02-28 19:06:24.000000000 +0000 -+++ libdrm-2.4.5/libdrm/nouveau/Makefile.am 2009-02-28 19:06:33.000000000 +0000 -@@ -2,13 +2,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir)/libdrm \ - -I$(top_srcdir)/libdrm/nouveau \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/shared-core - - libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la - libdrm_nouveau_ladir = $(libdir) - libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_nouveau_la_LIBADD = ../libdrm.la - - libdrm_nouveau_la_SOURCES = \ - nouveau_device.c \ diff --git a/testing/nouveau-drm-lts/nouveau-drm.install b/testing/nouveau-drm-lts/nouveau-drm.install deleted file mode 100644 index 2aa581d47..000000000 --- a/testing/nouveau-drm-lts/nouveau-drm.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-2.6.32-lts' - depmod $(cat /lib/modules/$EXTRAMODULES/version) - echo "if you are running kms in early mode please rebuild your initrd" -} - -post_upgrade() { - post_install $1 - rmmod nouveau || echo 'In order to use the new nouveau module, exit Xserver and unload it manually.' -} - -post_remove() { - EXTRAMODULES='extramodules-2.6.32-lts' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} - diff --git a/testing/p11-kit/PKGBUILD b/testing/p11-kit/PKGBUILD deleted file mode 100644 index 365b67cd7..000000000 --- a/testing/p11-kit/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 142938 2011-11-18 18:11:54Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=p11-kit -pkgver=0.9 -pkgrel=1 -pkgdesc="Library to work with PKCS#11 modules" -arch=(i686 x86_64) -url="http://p11-glue.freedesktop.org" -license=('BSD') -depends=(glibc) -options=(!libtool) -source=($url/releases/$pkgname-$pkgver.tar.gz) -md5sums=('029aa2a3a103e7eb81b4aa731b93539e') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-module-path=/usr/lib/pkcs11 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/ppp/PKGBUILD b/testing/ppp/PKGBUILD deleted file mode 100644 index 06940052d..000000000 --- a/testing/ppp/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# $Id: PKGBUILD 141972 2011-11-03 19:01:44Z thomas $ -# Maintainer: Thomas Baechler <thomas@archlinux.org> -pkgname=ppp -pkgver=2.4.5 -pkgrel=3 -pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" -arch=(i686 x86_64) -url="http://www.samba.org/ppp/" -license=('custom:GPL/BSD') -groups=('base') -depends=('glibc' 'libpcap>=1.0.0') -backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down}) -source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz - options - pon - poff - ppp - plog - pon.1 - ip-up - ip-down - ip-up.d.dns.sh - ip-down.d.dns.sh) -md5sums=('4621bc56167b6953ec4071043fe0ec57' - '7a9259a8f038073eeea7e4552ff1849f' - '48c024f73a80c8b69c4def22f86902cc' - '2d811f8470ccdea3b8c4505a438483e9' - '7561c73b557292d5ba1a9c5dbd270fde' - '86cdaf133f7a79fb464f02d83afc7734' - '44cc662ba9aa61dd9add3ddd4c5ded57' - 'e4beb16ed600b61336d50b2bd2df7cd5' - '2fa0671f40711e69194ccf60979f8b33' - '4a074d74c29625b254a1db720cb87b99' - '8d1be5af8e46393ba6eb273377831e38') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # fix CFLAGS - # -D_GNU_SOURCE is needed for IPv6 to work apparently - export CFLAGS="$CFLAGS -D_GNU_SOURCE" - sed -i "s:-O2 -pipe -Wall -g:${CFLAGS}:" pppd/Makefile.linux - sed -i "s:-g -O2:${CFLAGS}:" pppd/plugins/Makefile.linux - sed -i "s:-O2:${CFLAGS}:" pppstats/Makefile.linux - sed -i "s:-O2 -g -pipe:${CFLAGS}:" chat/Makefile.linux - sed -i "s:-O:${CFLAGS}:" pppdump/Makefile.linux - - # enable active filter - sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux - # enable ipv6 support - sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux - # Enable Microsoft proprietary Callback Control Protocol - sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux - - # Fix build error with recent kernels - rm include/linux/if_pppol2tp.h - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}/usr" install - install -D -m644 ../options "${pkgdir}/etc/ppp/options" - install -D -m755 ../ip-up "${pkgdir}/etc/ppp/ip-up" - install -D -m755 ../ip-down "${pkgdir}/etc/ppp/ip-down" - install -d -m755 "${pkgdir}/etc/ppp/ip-up.d" - install -d -m755 "${pkgdir}/etc/ppp/ip-down.d" - install -m755 ../ip-up.d.dns.sh "${pkgdir}/etc/ppp/ip-up.d/00-dns.sh" - install -m755 ../ip-down.d.dns.sh "${pkgdir}/etc/ppp/ip-down.d/00-dns.sh" - install -D -m755 ../pon "${pkgdir}/usr/bin/pon" - install -D -m755 ../poff "${pkgdir}/usr/bin/poff" - install -D -m755 ../plog "${pkgdir}/usr/sbin/plog" - install -D -m600 etc.ppp/pap-secrets "${pkgdir}/etc/ppp/pap-secrets" - install -D -m600 etc.ppp/chap-secrets "${pkgdir}/etc/ppp/chap-secrets" - install -D -m755 ${srcdir}/ppp "${pkgdir}/etc/rc.d/ppp" - install -D -m644 ${srcdir}/pon.1 "${pkgdir}/usr/share/man/man1/pon.1" - install -d -m755 "${pkgdir}/etc/ppp/peers" - chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so -} diff --git a/testing/ppp/ip-down b/testing/ppp/ip-down deleted file mode 100644 index 301f3ab9b..000000000 --- a/testing/ppp/ip-down +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# -# This script is run by pppd after the connection has ended. -# - -# Execute all scripts in /etc/ppp/ip-up.d/ -for ipdown in /etc/ppp/ip-down.d/*.sh; do - if [ -x $ipdown ]; then - # Parameters: interface-name tty-device speed local-IP-address remote-IP-address ipparam - $ipdown "$@" - fi -done diff --git a/testing/ppp/ip-down.d.dns.sh b/testing/ppp/ip-down.d.dns.sh deleted file mode 100644 index 9e19f7d1b..000000000 --- a/testing/ppp/ip-down.d.dns.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -[ -e /etc/resolv.conf.backup.${IFNAME} ] && mv /etc/resolv.conf.backup.${IFNAME} /etc/resolv.conf diff --git a/testing/ppp/ip-up b/testing/ppp/ip-up deleted file mode 100644 index 20473d73a..000000000 --- a/testing/ppp/ip-up +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# -# This script is run by pppd when there's a successful ppp connection. -# - -# Execute all scripts in /etc/ppp/ip-up.d/ -for ipup in /etc/ppp/ip-up.d/*.sh; do - if [ -x $ipup ]; then - # Parameters: interface-name tty-device speed local-IP-address remote-IP-address ipparam - $ipup "$@" - fi -done diff --git a/testing/ppp/ip-up.d.dns.sh b/testing/ppp/ip-up.d.dns.sh deleted file mode 100644 index f9df543a4..000000000 --- a/testing/ppp/ip-up.d.dns.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ "$USEPEERDNS" = "1" -a -f /etc/ppp/resolv.conf ]; then - [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME} - mv /etc/ppp/resolv.conf /etc/resolv.conf - chmod 644 /etc/resolv.conf -fi diff --git a/testing/ppp/options b/testing/ppp/options deleted file mode 100644 index 63691842c..000000000 --- a/testing/ppp/options +++ /dev/null @@ -1,352 +0,0 @@ -# /etc/ppp/options -# -# Originally created by Jim Knoble <jmknoble@mercury.interpath.net> -# Modified for Debian by alvar Bray <alvar@meiko.co.uk> -# Modified for PPP Server setup by Christoph Lameter <clameter@debian.org> -# Modified for ArchLinux by Manolis Tzanidakis <manolis@archlinux.org> -# -# To quickly see what options are active in this file, use this command: -# egrep -v '#|^ *$' /etc/ppp/options - -# Specify which DNS Servers the incoming Win95 or WinNT Connection should use -# Two Servers can be remotely configured -# ms-dns 192.168.1.1 -# ms-dns 192.168.1.2 - -# Specify which WINS Servers the incoming connection Win95 or WinNT should use -# ms-wins 192.168.1.50 -# ms-wins 192.168.1.51 - -# Run the executable or shell command specified after pppd has -# terminated the link. This script could, for example, issue commands -# to the modem to cause it to hang up if hardware modem control signals -# were not available. -#disconnect "chat -- \d+++\d\c OK ath0 OK" - -# async character map -- 32-bit hex; each bit is a character -# that needs to be escaped for pppd to receive it. 0x00000001 -# represents '\x01', and 0x80000000 represents '\x1f'. -asyncmap 0 - -# Require the peer to authenticate itself before allowing network -# packets to be sent or received. -# Please do not disable this setting. It is expected to be standard in -# future releases of pppd. Use the call option (see manpage) to disable -# authentication for specific peers. -auth - -# Use hardware flow control (i.e. RTS/CTS) to control the flow of data -# on the serial port. -crtscts - -# Use software flow control (i.e. XON/XOFF) to control the flow of data -# on the serial port. -#xonxoff - -# Specifies that certain characters should be escaped on transmission -# (regardless of whether the peer requests them to be escaped with its -# async control character map). The characters to be escaped are -# specified as a list of hex numbers separated by commas. Note that -# almost any character can be specified for the escape option, unlike -# the asyncmap option which only allows control characters to be -# specified. The characters which may not be escaped are those with hex -# values 0x20 - 0x3f or 0x5e. -#escape 11,13,ff - -# Don't use the modem control lines. -#local - -# Specifies that pppd should use a UUCP-style lock on the serial device -# to ensure exclusive access to the device. -lock - -# Don't show the passwords when logging the contents of PAP packets. -# This is the default. -hide-password - -# When logging the contents of PAP packets, this option causes pppd to -# show the password string in the log message. -#show-password - -# Use the modem control lines. On Ultrix, this option implies hardware -# flow control, as for the crtscts option. (This option is not fully -# implemented.) -modem - -# Set the MRU [Maximum Receive Unit] value to <n> for negotiation. pppd -# will ask the peer to send packets of no more than <n> bytes. The -# minimum MRU value is 128. The default MRU value is 1500. A value of -# 296 is recommended for slow links (40 bytes for TCP/IP header + 256 -# bytes of data). -#mru 542 - -# Set the interface netmask to <n>, a 32 bit netmask in "decimal dot" -# notation (e.g. 255.255.255.0). -#netmask 255.255.255.0 - -# Disables the default behaviour when no local IP address is specified, -# which is to determine (if possible) the local IP address from the -# hostname. With this option, the peer will have to supply the local IP -# address during IPCP negotiation (unless it specified explicitly on the -# command line or in an options file). -#noipdefault - -# Enables the "passive" option in the LCP. With this option, pppd will -# attempt to initiate a connection; if no reply is received from the -# peer, pppd will then just wait passively for a valid LCP packet from -# the peer (instead of exiting, as it does without this option). -#passive - -# With this option, pppd will not transmit LCP packets to initiate a -# connection until a valid LCP packet is received from the peer (as for -# the "passive" option with old versions of pppd). -#silent - -# Don't request or allow negotiation of any options for LCP and IPCP -# (use default values). -#-all - -# Disable Address/Control compression negotiation (use default, i.e. -# address/control field disabled). -#-ac - -# Disable asyncmap negotiation (use the default asyncmap, i.e. escape -# all control characters). -#-am - -# Don't fork to become a background process (otherwise pppd will do so -# if a serial device is specified). -#-detach - -# Disable IP address negotiation (with this option, the remote IP -# address must be specified with an option on the command line or in -# an options file). -#-ip - -# Disable IPCP negotiation and IP communication. This option should -# only be required if the peer is buggy and gets confused by requests -# from pppd for IPCP negotiation. -#noip - -# Disable magic number negotiation. With this option, pppd cannot -# detect a looped-back line. -#-mn - -# Disable MRU [Maximum Receive Unit] negotiation (use default, i.e. -# 1500). -#-mru - -# Disable protocol field compression negotiation (use default, i.e. -# protocol field compression disabled). -#-pc - -# Require the peer to authenticate itself using PAP. -#+pap - -# Don't agree to authenticate using PAP. -#-pap - -# Require the peer to authenticate itself using CHAP [Cryptographic -# Handshake Authentication Protocol] authentication. -#+chap - -# Don't agree to authenticate using CHAP. -#-chap - -# Disable negotiation of Van Jacobson style IP header compression (use -# default, i.e. no compression). -#-vj - -# Increase debugging level (same as -d). If this option is given, pppd -# will log the contents of all control packets sent or received in a -# readable form. The packets are logged through syslog with facility -# daemon and level debug. This information can be directed to a file by -# setting up /etc/syslog.conf appropriately (see syslog.conf(5)). (If -# pppd is compiled with extra debugging enabled, it will log messages -# using facility local2 instead of daemon). -#debug - -# Append the domain name <d> to the local host name for authentication -# purposes. For example, if gethostname() returns the name porsche, -# but the fully qualified domain name is porsche.Quotron.COM, you would -# use the domain option to set the domain name to Quotron.COM. -#domain <d> - -# Enable debugging code in the kernel-level PPP driver. The argument n -# is a number which is the sum of the following values: 1 to enable -# general debug messages, 2 to request that the contents of received -# packets be printed, and 4 to request that the contents of transmitted -# packets be printed. -#kdebug n - -# Set the MTU [Maximum Transmit Unit] value to <n>. Unless the peer -# requests a smaller value via MRU negotiation, pppd will request that -# the kernel networking code send data packets of no more than n bytes -# through the PPP network interface. -#mtu <n> - -# Set the name of the local system for authentication purposes to <n>. -# This is a privileged option. With this option, pppd will use lines in the -# secrets files which have <n> as the second field when looking for a -# secret to use in authenticating the peer. In addition, unless overridden -# with the user option, <n> will be used as the name to send to the peer -# when authenticating the local system to the peer. (Note that pppd does -# not append the domain name to <n>.) -#name <n> - -# Enforce the use of the hostname as the name of the local system for -# authentication purposes (overrides the name option). -#usehostname - -# Set the assumed name of the remote system for authentication purposes -# to <n>. -#remotename <n> - -# Add an entry to this system's ARP [Address Resolution Protocol] -# table with the IP address of the peer and the Ethernet address of this -# system. -proxyarp - -# Use the system password database for authenticating the peer using -# PAP. Note: mgetty already provides this option. If this is specified -# then dialin from users using a script under Linux to fire up ppp wont work. -# login - -# If this option is given, pppd will send an LCP echo-request frame to the -# peer every n seconds. Normally the peer should respond to the echo-request -# by sending an echo-reply. This option can be used with the -# lcp-echo-failure option to detect that the peer is no longer connected. -lcp-echo-interval 30 - -# If this option is given, pppd will presume the peer to be dead if n -# LCP echo-requests are sent without receiving a valid LCP echo-reply. -# If this happens, pppd will terminate the connection. Use of this -# option requires a non-zero value for the lcp-echo-interval parameter. -# This option can be used to enable pppd to terminate after the physical -# connection has been broken (e.g., the modem has hung up) in -# situations where no hardware modem control lines are available. -lcp-echo-failure 4 - -# Set the LCP restart interval (retransmission timeout) to <n> seconds -# (default 3). -#lcp-restart <n> - -# Set the maximum number of LCP terminate-request transmissions to <n> -# (default 3). -#lcp-max-terminate <n> - -# Set the maximum number of LCP configure-request transmissions to <n> -# (default 10). -#lcp-max-configure <n> - -# Set the maximum number of LCP configure-NAKs returned before starting -# to send configure-Rejects instead to <n> (default 10). -#lcp-max-failure <n> - -# Set the IPCP restart interval (retransmission timeout) to <n> -# seconds (default 3). -#ipcp-restart <n> - -# Set the maximum number of IPCP terminate-request transmissions to <n> -# (default 3). -#ipcp-max-terminate <n> - -# Set the maximum number of IPCP configure-request transmissions to <n> -# (default 10). -#ipcp-max-configure <n> - -# Set the maximum number of IPCP configure-NAKs returned before starting -# to send configure-Rejects instead to <n> (default 10). -#ipcp-max-failure <n> - -# Set the PAP restart interval (retransmission timeout) to <n> seconds -# (default 3). -#pap-restart <n> - -# Set the maximum number of PAP authenticate-request transmissions to -# <n> (default 10). -#pap-max-authreq <n> - -# Set the maximum time that pppd will wait for the peer to authenticate -# itself with PAP to <n> seconds (0 means no limit). -#pap-timeout <n> - -# Set the CHAP restart interval (retransmission timeout for -# challenges) to <n> seconds (default 3). -#chap-restart <n> - -# Set the maximum number of CHAP challenge transmissions to <n> -# (default 10). -#chap-max-challenge - -# If this option is given, pppd will rechallenge the peer every <n> -# seconds. -#chap-interval <n> - -# With this option, pppd will accept the peer's idea of our local IP -# address, even if the local IP address was specified in an option. -#ipcp-accept-local - -# With this option, pppd will accept the peer's idea of its (remote) IP -# address, even if the remote IP address was specified in an option. -#ipcp-accept-remote - -# Disable the IPXCP and IPX protocols. -# To let pppd pass IPX packets comment this out --- you'll probably also -# want to install ipxripd, and have the Internal IPX Network option enabled -# in your kernel. /usr/doc/HOWTO/IPX-HOWTO.gz contains more info. -noipx - -# Exit once a connection has been made and terminated. This is the default, -# unless the `persist' or `demand' option has been specified. -#nopersist - -# Do not exit after a connection is terminated; instead try to reopen -# the connection. -#persist - -# Terminate after n consecutive failed connection attempts. -# A value of 0 means no limit. The default value is 10. -#maxfail <n> - -# Initiate the link only on demand, i.e. when data traffic is present. -# With this option, the remote IP address must be specified by the user on -# the command line or in an options file. Pppd will initially configure -# the interface and enable it for IP traffic without connecting to the peer. -# When traffic is available, pppd will connect to the peer and perform -# negotiation, authentication, etc. When this is completed, pppd will -# commence passing data packets (i.e., IP packets) across the link. -#demand - -# Specifies that pppd should disconnect if the link is idle for <n> seconds. -# The link is idle when no data packets (i.e. IP packets) are being sent or -# received. Note: it is not advisable to use this option with the persist -# option without the demand option. If the active-filter option is given, -# data packets which are rejected by the specified activity filter also -# count as the link being idle. -#idle <n> - -# Specifies how many seconds to wait before re-initiating the link after -# it terminates. This option only has any effect if the persist or demand -# option is used. The holdoff period is not applied if the link was -# terminated because it was idle. -#holdoff <n> - -# Wait for up n milliseconds after the connect script finishes for a valid -# PPP packet from the peer. At the end of this time, or when a valid PPP -# packet is received from the peer, pppd will commence negotiation by -# sending its first LCP packet. The default value is 1000 (1 second). -# This wait period only applies if the connect or pty option is used. -#connect-delay <n> - -# Packet filtering: for more information, see pppd(8) -# Any packets matching the filter expression will be interpreted as link -# activity, and will cause a "demand" connection to be activated, and reset -# the idle connection timer. (idle option) -# The filter expression is akin to that of tcpdump(1) -#active-filter <filter-expression> - -# uncomment the line below this if you use PPPoE -#plugin /usr/lib/pppd/plugins/pppoe.so - -# ---<End of File>--- diff --git a/testing/ppp/plog b/testing/ppp/plog deleted file mode 100644 index 84d2c7340..000000000 --- a/testing/ppp/plog +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ -s /var/log/ppp.log ]; then - exec tail "$@" /var/log/ppp.log -else - exec tail "$@" /var/log/syslog | grep ' \(pppd\|chat\)\[' -fi diff --git a/testing/ppp/poff b/testing/ppp/poff deleted file mode 100644 index 8b4dffc59..000000000 --- a/testing/ppp/poff +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh - -# Written by John Hasler <john@dhh.gt.org> and based on work -# by Phil Hands <phil@hands.com>. Distributed under the GNU GPL - -if [ -x /usr/bin/kill ]; then - KILL="/usr/bin/kill" -else - KILL="/bin/kill" -fi -SIG=TERM -DONE="stopped" -MODE="" - -usage () -{ - cat <<!EOF! -usage: $0 [option] [provider] -options: - -r Cause pppd to drop the line and redial. - -d Toggle the state of pppd's debug option. - -c Cause pppd to renegotiate compression. - -a Stop all pppd's. 'provider' will be ignored. - -h Print this help summary and exit. - -v Print version and exit. - none Stop pppd. - -Options may not be combined. - -If 'provider' is omitted pppd will be stopped or signalled if and only if -there is exactly one running unless the '-a' option was given. If -'provider' is supplied the pppd controlling the connection to that -provider will be stopped or signalled. -!EOF! -} - -# Get option. If there are none replace the "?" that getopts puts in -# FLAG on error with "null". -getopts rdcavh FLAG -if [ "$?" -ne 0 ]; then - FLAG="null" -fi - -# Check for additional options. Should be none. -getopts :rdcavh DUMMY -if [ "$?" -eq 0 ]; then - echo "$0: Illegal option -- ${OPTARG}." - exit 1 -fi - -case $FLAG in - "r") SIG=HUP; DONE=signalled; shift ;; - "d") SIG=USR1; DONE=signalled; shift ;; - "c") SIG=USR2; DONE=signalled; shift ;; - "a") MODE="all"; shift ;; - "v") echo "$0$Revision: 1.1 $_TrickToPrint_RCS_Revision"; exit 0 ;; - "h") usage; exit 0 ;; - "?") exit 1; -esac - -# Get the PIDs of all the pppds running. Could also get these from -# /var/run, but pppd doesn't create .pid files until ppp is up. -PIDS=`pidof pppd` - -# poff is pointless if pppd isn't running. -if test -z "$PIDS"; then - echo "$0: No pppd is running. None ${DONE}." - exit 1 -fi - -# Find out how many pppd's are running. -N=`echo "$PIDS" | wc -w` - -# If there are no arguments we can't do anything if there is more than one -# pppd running. -if test "$#" -eq 0 -a "$N" -gt 1 -a $FLAG != "a" ; then - echo "$0: More than one pppd running and no "-a" option and -no arguments supplied. Nothing ${DONE}." - exit 1 -fi - -# If either there are no arguments or '-a' was specified kill all the -# pppd's. -if test "$#" -eq 0 -o "$MODE" = "all" ; then - $KILL -$SIG $PIDS || { - echo "$0: $KILL failed. None ${DONE}." - exit 1 - } - exit 0 -fi - -# There is an argument, so kill the pppd started on that provider. -PID=`ps axw | grep "[ /]pppd call $1 *\$" | awk '{print $1}'` -if test -n "$PID" ; then - $KILL -$SIG $PID || { - echo "$0: $KILL failed. None ${DONE}." - exit 1 - } -else - echo "$0: I could not find a pppd process for provider '$1'. None ${DONE}." - exit 1 -fi -exit 0 diff --git a/testing/ppp/pon b/testing/ppp/pon deleted file mode 100644 index 36885050b..000000000 --- a/testing/ppp/pon +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -case "$1" in - -*) echo " -Usage: pon [provider] [arguments] - -If you specify one argument, a PPP connection will be started using -settings from the appropriate file in the /etc/ppp/peers/ directory, and -any additional arguments supplied will be passed as extra arguments to -pppd. -" - exit 0 - ;; -esac - -if [ -z "$1" -a ! -f /etc/ppp/peers/provider ]; then - echo " -Please configure /etc/ppp/peers/provider or use a command line argument to -use another file in /etc/ppp/peers/ directory. -" - exit 1 -fi - -if [ "$1" -a ! -f "/etc/ppp/peers/$1" ]; then - echo " -The file /etc/ppp/peers/$1 does not exist. -" - exit 1 -fi - -exec /usr/sbin/pppd call ${@:-provider} - diff --git a/testing/ppp/pon.1 b/testing/ppp/pon.1 deleted file mode 100644 index bb3220564..000000000 --- a/testing/ppp/pon.1 +++ /dev/null @@ -1,121 +0,0 @@ -.\" This manual is published under the GPL. -.\" All guidelines specified in the GPL apply here. -.\" To get an ascii file: -.\" groff -man -Tascii pon.1 > pon.txt -.\" -.TH PON 1 "July 2000" "Debian Project" "Debian PPPD" -.SH NAME -pon, poff, plog \- starts up, shuts down or lists the log of PPP connections -.SH SYNOPSIS -.B pon -[ isp-name [ options ] ] -.br -.B poff -[ -r ] [ -d ] [ -c ] [ -a ] [ -h ] [ isp-name ] -.br -.B plog -[ arguments ] -.SH DESCRIPTION -This manual page describes the \fBpon\fP, \fBplog\fP and \fBpoff\fP -scripts, which allow users to control PPP connections. -.. -.SS pon -\fBpon\fP, invoked without arguments, runs the \fI/etc/ppp/ppp_on_boot\fP -file, if it exists and is executable. Otherwise, a PPP connection will be -started using configuration from \fI/etc/ppp/peers/provider\fP. -This is the default behaviour unless an \fBisp-name\fP argument is given. -.PP -For instance, to use ISP configuration "myisp" run: -.IP -pon myisp -.PP -\fBpon\fP will then use the options file \fI/etc/ppp/peers/myisp\fP. -You can pass additional \fBoptions\fP after the ISP name, too. -\fBpon\fP can be used to run multiple, simultaneous PPP connections. -.. -.SS poff -\fBpoff\fP closes a PPP connection. If more than one PPP connection exists, -the one named in the argument to \fBpoff\fP will be killed, e.g. -.IP -poff myprovider2 -.PP -will terminate the connection to myprovider2, and leave the PPP connections -to e.g. "myprovider1" or "myprovider3" up and running. -.PP -\fBpoff\fP takes the following command line options: -.RS -.TP -.B "\-r" -causes the connection to be redialed after it is dropped. -.TP -.B "\-d" -toggles the state of pppd's debug option. -.TP -.B "\-c" -causes -.BR pppd (8) -to renegotiate compression. -.TP -.B "\-a" -stops all running ppp connections. If the argument \fBisp-name\fP -is given it will be ignored. -.TP -.B "\-h" -displays help information. -.TP -.B "\-v" -prints the version and exits. -.PP -If no argument is given, \fBpoff\fP will stop or signal pppd if and only -if there is exactly one running. If more than one connection is active, -it will exit with an error code of 1. -.. -.SS plog -\fBplog\fP shows you the last few lines of \fI/var/log/ppp.log\fP. If that -file doesn't exist, it shows you the last few lines of your -\fI/var/log/syslog\fP file, but excluding the lines not generated by pppd. -This script makes use of the -.BR tail (1) -command, so arguments that can be passed to -.BR tail (1) -can also be passed to \fBplog\fP. -.PP -Note: the \fBplog\fP script can only be used by root or another system -administrator in group "adm", due to security reasons. Also, to have all -pppd-generated information in one logfile, that plog can show, you need the -following line in your \fI/etc/syslog.conf\fP file: -.PP -local2.* -/var/log/ppp.log -.RE -.SH FILES -.TP -.I /etc/ppp/options -PPPd system options file. -.TP -.I /etc/ppp/pap-secrets -System PAP passwords file. -.TP -.I /etc/ppp/chap-secrets -System CHAP passwords file. -.TP -.I /etc/ppp/peers/ -Directory holding the peer options files. The default file is called -\fIprovider\fP. -.TP -.I /etc/chatscripts/provider -The chat script invoked from the default \fI/etc/ppp/peers/provider\fP. -.TP -.I /var/log/ppp.log -The default PPP log file. -.SH AUTHORS -The p-commands were written by Christoph Lameter <clameter@debian.org>. -Updated and revised by Philip Hands <phil@hands.com>. -.br -This manual was written by Othmar Pasteka <othmar@tron.at>. Modified -by Rob Levin <lilo@openprojects.net>, with some extensions taken from -the old p-commands manual written by John Hasler <jhasler@debian.org>. -.SH "SEE ALSO" -.BR pppd (8), -.BR chat (8), -.BR tail (1). - diff --git a/testing/ppp/ppp b/testing/ppp/ppp deleted file mode 100644 index 16e01bad7..000000000 --- a/testing/ppp/ppp +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/pppd` -case "$1" in - start) - stat_busy "Starting PPP daemon" - [ -z "$PID" ] && /usr/bin/pon - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ppp - stat_done - fi - ;; - stop) - stat_busy "Stopping PPP daemon" - [ ! -z "$PID" ] && poff -a &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ppp - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/pptpclient/PKGBUILD b/testing/pptpclient/PKGBUILD deleted file mode 100644 index 1cb05b6f8..000000000 --- a/testing/pptpclient/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 142106 2011-11-05 10:12:06Z pierre $ -# Maintainer: Daniel Isenmann <daniel @ archlinux.org> -# Contributor: Mark Nikkel <mnikkel@gmail.com> - -pkgname=pptpclient -pkgver=1.7.2 -pkgrel=4 -pkgdesc="Client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP." -arch=('i686' 'x86_64') -url="http://pptpclient.sourceforge.net/" -license=('GPL') -depends=('ppp' 'iproute2') -backup=('etc/ppp/options.pptp') -source=("http://downloads.sourceforge.net/sourceforge/pptpclient/pptp-$pkgver.tar.gz") -md5sums=('4c3d19286a37459a632c7128c92a9857') - -build() { - cd $srcdir/pptp-$pkgver - - # use our CFLAGS and LDFLAGS - sed -i -e "/CFLAGS =/ c\CFLAGS = ${CFLAGS}" Makefile - sed -i -e "/LDFLAGS =/ c\LDFLAGS = ${LDFLAGS}" Makefile - - # adjust ip path - sed -i 's#/bin/ip#/usr/sbin/ip#' routing.c - - make -} - -package() { - cd $srcdir/pptp-$pkgver - make DESTDIR=$pkgdir install -} diff --git a/testing/proftpd/PKGBUILD b/testing/proftpd/PKGBUILD deleted file mode 100644 index cbdb700c3..000000000 --- a/testing/proftpd/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 142449 2011-11-10 05:57:41Z eric $ -# Maintainer: -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=proftpd -pkgver=1.3.4 -pkgrel=1 -pkgdesc="A high-performance, scalable FTP server" -arch=('i686' 'x86_64') -url="http://www.proftpd.org" -license=('GPL') -depends=('libldap' 'libmysqlclient' 'postgresql-libs') -backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') -source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2{,.asc} - 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d') -md5sums=('7734142c7fa7212ab9f188a617a4be87' - '0426c03ca88f1b8794006916ac6466ce' - '99f6f9a989e70e3fa50809fc2bbbbb0a' - 'ddb09eb13131becdf0e081eef413116b' - '71d5932b0461c318ed68c2c0c2660736') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --libexecdir=/usr/lib \ - --disable-pam \ - --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \ - --sysconfdir=/etc \ - --localstatedir=/var/run \ - --enable-ctrls \ - --enable-ipv6 \ - --with-includes=/usr/include/mysql:/usr/include/postgresql \ - --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \ - --enable-nls - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf" - - install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd" - install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd" - install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" - install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" -} diff --git a/testing/proftpd/proftpd b/testing/proftpd/proftpd deleted file mode 100755 index 357a7663d..000000000 --- a/testing/proftpd/proftpd +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# source application-specific settings -PROFTPD_ARGS= -[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting ProFTPd Server" - /usr/sbin/proftpd ${PROFTPD_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon proftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping ProFTPd Server" - [ -f /var/run/proftpd.pid ] && kill $(cat /var/run/proftpd.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/proftpd.pid - rm_daemon proftpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/testing/proftpd/proftpd.conf.d b/testing/proftpd/proftpd.conf.d deleted file mode 100644 index 1a5a8a201..000000000 --- a/testing/proftpd/proftpd.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to proftpd -# -PROFTPD_ARGS="" diff --git a/testing/proftpd/proftpd.logrotate b/testing/proftpd/proftpd.logrotate deleted file mode 100644 index 7b6d7a87b..000000000 --- a/testing/proftpd/proftpd.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/xferlog { - postrotate - /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/testing/reiserfsprogs/PKGBUILD b/testing/reiserfsprogs/PKGBUILD deleted file mode 100644 index 0caddd355..000000000 --- a/testing/reiserfsprogs/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 142096 2011-11-05 09:21:11Z pierre $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=reiserfsprogs -pkgver=3.6.21 -pkgrel=4 -pkgdesc="Reiserfs utilities" -arch=('i686' 'x86_64') -url="http://www.kernel.org/" -license=('GPL') -groups=('base') -depends=('util-linux-ng') -source=("ftp://ftp.archlinux.org/other/reiserfsprogs/reiserfsprogs-${pkgver}.tar.bz2") -md5sums=('0639cefac8f8150536cfa7531c2aa2d2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sbindir=/sbin - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - ln -s reiserfsck "${pkgdir}/sbin/fsck.reiserfs" - ln -s mkreiserfs "${pkgdir}/sbin/mkfs.reiserfs" -} diff --git a/testing/rfkill/60-rfkill.rules b/testing/rfkill/60-rfkill.rules deleted file mode 100644 index bc98a3bef..000000000 --- a/testing/rfkill/60-rfkill.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="rfkill", GROUP="rfkill", MODE="0664" diff --git a/testing/rfkill/PKGBUILD b/testing/rfkill/PKGBUILD deleted file mode 100644 index 68d7ec070..000000000 --- a/testing/rfkill/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 142056 2011-11-04 23:31:12Z stephane $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=rfkill -pkgver=0.4 -pkgrel=3 -pkgdesc="A tool for enabling and disabling wireless devices" -arch=('i686' 'x86_64') -url="http://linuxwireless.org/en/users/Documentation/rfkill" -license=('custom') -depends=('glibc' 'filesystem>=2010.01') -source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - 60-rfkill.rules - rfkill.conf.d - rfkill.rc.d) -backup=(etc/conf.d/rfkill) -md5sums=('727892c0fb35c80ee3849fbe89b45350' - '63f9bf9264911242e430867a41e8918c' - '398e7cadf023e05e3e0c323aa33575b9' - '793f0510e26547eb2632efce7d16e50e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - # License - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - # Udev rule - install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/lib/udev/rules.d/60-rfkill.rules" - # Init script - install -Dm644 "${srcdir}/rfkill.conf.d" "${pkgdir}/etc/conf.d/rfkill" - install -Dm755 "${srcdir}/rfkill.rc.d" "${pkgdir}/etc/rc.d/rfkill" -} diff --git a/testing/rfkill/rfkill.conf.d b/testing/rfkill/rfkill.conf.d deleted file mode 100644 index 4483da26c..000000000 --- a/testing/rfkill/rfkill.conf.d +++ /dev/null @@ -1,20 +0,0 @@ -# -# /etc/conf.d/rfkill -# Configuration for the rfkill startup script -# - -# List of devices to block on startup (space-separated) -RFKILL_BLOCK="" - -# List of devices to unblock on startup (space-separated) -RFKILL_UNBLOCK="all" - -# Supported device names are: all, wifi, bluetooth, umb, wimax, wwan, gps and specific device names like phy0, hci0, ... -# See "rfkill list" for available devices -# Examples: -# -# Block all bluetooth devices: -# RFKILL_BLOCK="bluetooth" -# -# Unblock the phy0 wifi device and all wwan devices: -# RFKILL_UNBLOCK="phy0 wwan" diff --git a/testing/rfkill/rfkill.rc.d b/testing/rfkill/rfkill.rc.d deleted file mode 100755 index ce90ee150..000000000 --- a/testing/rfkill/rfkill.rc.d +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/rfkill - -case "$1" in - start) - for device in ${RFKILL_BLOCK}; do - stat_busy "Blocking rfkill device: ${device}" - /usr/sbin/rfkill block ${device} - if [ $? -eq 0 ]; then - stat_done - else - stat_fail - fi - done - for device in ${RFKILL_UNBLOCK}; do - stat_busy "Unblocking rfkill device: ${device}" - /usr/sbin/rfkill unblock ${device} - if [ $? -eq 0 ]; then - stat_done - else - stat_fail - fi - done - ;; - stop) - ;; - restart) - $0 start - ;; - *) - echo "usage: $0 {start}" - exit 1 - ;; -esac -exit 0 diff --git a/testing/rpcbind/PKGBUILD b/testing/rpcbind/PKGBUILD deleted file mode 100644 index c7600e76c..000000000 --- a/testing/rpcbind/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 141984 2011-11-03 20:14:20Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=rpcbind -pkgver=0.2.0 -pkgrel=5 -pkgdesc="portmap replacement which supports RPC over various protocols" -arch=(i686 x86_64) -depends=('bash' 'glibc' 'libtirpc') -url="http://rpcbind.sourceforge.net" -license=('custom') -replaces=('portmap') -source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2 - rpcbind-sunrpc.patch - rpcbind) -md5sums=('1a77ddb1aaea8099ab19c351eeb26316' - 'c02ac36a98baac70b8a26190524b7b73' - '78a963654f57cbb209e228884767836e') - -build() { - cd $srcdir/$pkgname-$pkgver - # patch for iana services file - patch -Np1 -i ../rpcbind-sunrpc.patch - ./configure --prefix=/usr - make -} - -check() { - cd $srcdir/$pkgname-$pkgver - make check -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - # install missing man page - https://bugs.archlinux.org/task/21271 - install -m644 man/rpcinfo.8 $pkgdir/usr/share/man/man8/ - # install daemon - install -D -m755 $srcdir/rpcbind $pkgdir/etc/rc.d/rpcbind - # install license - install -D -m644 COPYING $pkgdir/usr/share/licenses/rpcbind/COPYING -} diff --git a/testing/rpcbind/rpcbind b/testing/rpcbind/rpcbind deleted file mode 100755 index 87c5b50da..000000000 --- a/testing/rpcbind/rpcbind +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID="$(pidof -o %PPID /usr/bin/rpcbind)" -case "$1" in - start) - stat_busy "Starting rpcbind" - [ -z "$PID" ] && /usr/bin/rpcbind &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - PID=$(pidof -o %PPID /usr/bin/rpcbind) - echo $PID > /var/run/rpcbind.pid - add_daemon rpcbind - stat_done - fi - ;; - stop) - stat_busy "Stopping rpcbind" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/rpcbind.pid - rm_daemon rpcbind - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/rpcbind/rpcbind-sunrpc.patch b/testing/rpcbind/rpcbind-sunrpc.patch deleted file mode 100644 index 76cf54ba9..000000000 --- a/testing/rpcbind/rpcbind-sunrpc.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- rpcbind-0.1.7/src/rpcbind.c.orig 2008-11-19 14:17:34.000000000 +0100 -+++ rpcbind-0.1.7/src/rpcbind.c 2010-01-07 13:03:37.416632894 +0100 -@@ -114,7 +114,7 @@ - char *udp_uaddr; /* Universal UDP address */ - char *tcp_uaddr; /* Universal TCP address */ - #endif --static char servname[] = "rpcbind"; -+static char servname[] = "sunrpc"; - static char superuser[] = "superuser"; - - int main __P((int, char *[])); ---- rpcbind-0.1.7/src/rpcinfo.c~ 2010-01-08 16:14:24.592156602 +0000 -+++ rpcbind-0.1.7/src/rpcinfo.c 2010-01-08 16:14:31.578838609 +0000 -@@ -633,7 +633,7 @@ - { - memset (&hints, 0, sizeof hints); - hints.ai_family = AF_INET; -- if ((error = getaddrinfo (host, "rpcbind", &hints, &res)) != 0 && -+ if ((error = getaddrinfo (host, "sunrpc", &hints, &res)) != 0 && - (error = getaddrinfo (host, "portmapper", &hints, &res)) != 0) - { - fprintf (stderr, "rpcinfo: %s: %s\n", diff --git a/testing/sdparm/PKGBUILD b/testing/sdparm/PKGBUILD deleted file mode 100644 index d7f23084c..000000000 --- a/testing/sdparm/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 141893 2011-11-02 20:16:08Z andrea $ -# Maintainer: -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: grimi@poczta.fm - -pkgname=sdparm -pkgver=1.06 -pkgrel=2 -pkgdesc="An utility similar to hdparm but for SCSI devices" -arch=('i686' 'x86_64') -url="http://sg.danny.cz/sg/sdparm.html" -license=('BSD') -depends=('glibc') -source=("http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz") -md5sums=('5e19913658bb4f9849ddd909e0f47cde') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -Dm644 COPYING \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/seahorse/PKGBUILD b/testing/seahorse/PKGBUILD deleted file mode 100644 index fdec5f80c..000000000 --- a/testing/seahorse/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 142740 2011-11-14 12:23:22Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Michel Brabants <michel.linux@tiscali.be> - -pkgname=seahorse -pkgver=3.2.2 -pkgrel=1 -pkgdesc="GNOME application for managing PGP keys." -arch=(i686 x86_64) -license=('GPL') -url="http://projects.gnome.org/seahorse/" -depends=('gtk3' 'libgnome-keyring' 'gnome-keyring' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') -makedepends=('gettext' 'libldap' 'intltool' 'pkgconfig' 'gnome-doc-utils' 'gobject-introspection' 'openssh' 'libsm') -optdepends=('openssh: SSH support') -provides=('x11-ssh-askpass') -options=('!libtool' '!emptydirs') -groups=('gnome-extra') -install=seahorse.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - seahorse-ssh-askpass.sh) -sha256sums=('25146aa4c4bb4c375ec1afec524e1907852989bd1b0c9e12490326616ac6a7e9' - '1792ab2c0bbad446b8fad0a0c9008a75f60a9666c895d37d2adcd827e49fafbb') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-ldap --enable-hkp \ - --disable-scrollkeeper \ - --disable-update-mime-database \ - --disable-schemas-compile - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/seahorse-ssh-askpass.sh" \ - "$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh" -} diff --git a/testing/seahorse/seahorse-ssh-askpass.sh b/testing/seahorse/seahorse-ssh-askpass.sh deleted file mode 100644 index 44281ac2b..000000000 --- a/testing/seahorse/seahorse-ssh-askpass.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -z "$SSH_ASKPASS" ]; then - export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass -fi diff --git a/testing/seahorse/seahorse.install b/testing/seahorse/seahorse.install deleted file mode 100644 index 9a98d52e0..000000000 --- a/testing/seahorse/seahorse.install +++ /dev/null @@ -1,21 +0,0 @@ -pkgname=seahorse - -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then - usr/sbin/gconfpkg --uninstall $pkgname - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/syslog-ng/PKGBUILD b/testing/syslog-ng/PKGBUILD deleted file mode 100644 index d96ccbb34..000000000 --- a/testing/syslog-ng/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 142718 2011-11-13 17:30:10Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Maintainer: Aaron Griffin <aaron@archlinux.org> - -pkgname=syslog-ng -pkgver=3.3.2 -pkgrel=1 -pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" -arch=('i686' 'x86_64') -license=('GPL2') -groups=('base') -url="http://www.balabit.com/network-security/syslog-ng/" -depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk') -makedepends=('flex' 'pkg-config') -optdepends=('logrotate: for rotating log files') -provides=('logger') -options=('!libtool') -backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \ - 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') -source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz" - syslog-ng.conf - syslog-ng.logrotate - syslog-ng.rc) -sha1sums=('a7cfc987cdd584e357e253d2794bad1159776638' - '98074e0facfc6ef036202662cc86d04b38a2c142' - 'ac997b25d7d8e69e66782d3771a0e12aff55ae7f' - 'a6ad26912b5bcbe1b47b003309945d733613b98f') - -build() { - cd "$pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc/syslog-ng \ - --libexecdir=/usr/lib \ - --localstatedir=/var/lib/syslog-ng \ - --with-pidfile-dir=/run \ - --disable-spoof-source \ - --enable-systemd \ - --with-systemdsystemunitdir=/lib/systemd/system - - make -} - -package() { - make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - - install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d" - install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf" - install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng" - install -Dm755 "$srcdir/syslog-ng.rc" "$pkgdir/etc/rc.d/syslog-ng" -} diff --git a/testing/syslog-ng/syslog-ng.conf b/testing/syslog-ng/syslog-ng.conf deleted file mode 100644 index 8f86eac2f..000000000 --- a/testing/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,92 +0,0 @@ -@version: 3.3 -# -# /etc/syslog-ng/syslog-ng.conf -# - -options { - stats_freq (0); - flush_lines (0); - time_reopen (10); - log_fifo_size (10000); - chain_hostnames (off); - use_dns (no); - use_fqdn (no); - create_dirs (no); - keep_hostname (yes); - perm(0640); - group("log"); -}; - -source src { - unix-dgram("/dev/log"); - internal(); - file("/proc/kmsg"); -}; - -destination d_authlog { file("/var/log/auth.log"); }; -destination d_syslog { file("/var/log/syslog.log"); }; -destination d_cron { file("/var/log/crond.log"); }; -destination d_daemon { file("/var/log/daemon.log"); }; -destination d_kernel { file("/var/log/kernel.log"); }; -destination d_lpr { file("/var/log/lpr.log"); }; -destination d_user { file("/var/log/user.log"); }; -destination d_uucp { file("/var/log/uucp.log"); }; -destination d_mail { file("/var/log/mail.log"); }; -destination d_news { file("/var/log/news.log"); }; -destination d_ppp { file("/var/log/ppp.log"); }; -destination d_debug { file("/var/log/debug.log"); }; -destination d_messages { file("/var/log/messages.log"); }; -destination d_errors { file("/var/log/errors.log"); }; -destination d_everything { file("/var/log/everything.log"); }; -destination d_iptables { file("/var/log/iptables.log"); }; -destination d_acpid { file("/var/log/acpid.log"); }; -destination d_console { usertty("root"); }; - -# Log everything to tty12 -destination console_all { file("/dev/tty12"); }; - -filter f_auth { facility(auth); }; -filter f_authpriv { facility(auth, authpriv); }; -filter f_syslog { program(syslog-ng); }; -filter f_cron { facility(cron); }; -filter f_daemon { facility(daemon); }; -filter f_kernel { facility(kern) and not filter(f_iptables); }; -filter f_lpr { facility(lpr); }; -filter f_mail { facility(mail); }; -filter f_news { facility(news); }; -filter f_user { facility(user); }; -filter f_uucp { facility(uucp); }; -filter f_ppp { facility(local2); }; -filter f_debug { not facility(auth, authpriv, news, mail); }; -filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); }; -filter f_everything { level(debug..emerg) and not facility(auth, authpriv); }; -filter f_emergency { level(emerg); }; -filter f_info { level(info); }; -filter f_notice { level(notice); }; -filter f_warn { level(warn); }; -filter f_crit { level(crit); }; -filter f_err { level(err); }; -filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); }; -filter f_acpid { program("acpid"); }; - -log { source(src); filter(f_acpid); destination(d_acpid); }; -log { source(src); filter(f_authpriv); destination(d_authlog); }; -log { source(src); filter(f_syslog); destination(d_syslog); }; -log { source(src); filter(f_cron); destination(d_cron); }; -log { source(src); filter(f_daemon); destination(d_daemon); }; -log { source(src); filter(f_kernel); destination(d_kernel); }; -log { source(src); filter(f_lpr); destination(d_lpr); }; -log { source(src); filter(f_mail); destination(d_mail); }; -log { source(src); filter(f_news); destination(d_news); }; -log { source(src); filter(f_ppp); destination(d_ppp); }; -log { source(src); filter(f_user); destination(d_user); }; -log { source(src); filter(f_uucp); destination(d_uucp); }; -#log { source(src); filter(f_debug); destination(d_debug); }; -log { source(src); filter(f_messages); destination(d_messages); }; -log { source(src); filter(f_err); destination(d_errors); }; -log { source(src); filter(f_emergency); destination(d_console); }; -log { source(src); filter(f_everything); destination(d_everything); }; -log { source(src); filter(f_iptables); destination(d_iptables); }; - -# Log everything to tty12 -#log { source(src); destination(console_all); }; diff --git a/testing/syslog-ng/syslog-ng.logrotate b/testing/syslog-ng/syslog-ng.logrotate deleted file mode 100644 index e0e6929f2..000000000 --- a/testing/syslog-ng/syslog-ng.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log { - missingok - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null` 2> /dev/null || true - endscript -} diff --git a/testing/syslog-ng/syslog-ng.rc b/testing/syslog-ng/syslog-ng.rc deleted file mode 100755 index 516b03da3..000000000 --- a/testing/syslog-ng/syslog-ng.rc +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -checkconfig() { - if ! syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf; then - stat_fail - exit 1 - fi -} - -pidfile=/run/syslog-ng.pid -if [[ -r $pidfile ]]; then - read -r PID < "$pidfile" - if [[ $PID && ! -d /proc/$PID ]]; then - # stale pidfile - unset PID - rm -f "$pidfile" - fi -fi - -case $1 in - start) - stat_busy "Starting Syslog-NG" - checkconfig - if [[ -z $PID ]] && /usr/sbin/syslog-ng; then - add_daemon syslog-ng - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping Syslog-NG" - if [[ $PID ]] && kill $PID &>/dev/null; then - rm_daemon syslog-ng - stat_done - else - stat_fail - exit 1 - fi - ;; - reload) - stat_busy "Reloading Syslog-NG configuration and re-opening log files" - if [[ -z $PID ]]; then - stat_fail - else - checkconfig - if kill -HUP $PID &>/dev/null; then - stat_done - else - stat_fail - exit 1 - fi - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" -esac diff --git a/testing/tomboy/PKGBUILD b/testing/tomboy/PKGBUILD deleted file mode 100644 index b386d328b..000000000 --- a/testing/tomboy/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 142761 2011-11-14 21:22:26Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=tomboy -pkgver=1.8.3 -pkgrel=1 -pkgdesc="Desktop note-taking application for Linux and Unix" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/tomboy/" -depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme') -makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') -options=('!libtool' '!emptydirs' '!makeflags') -groups=('gnome-extra') -install=tomboy.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.8/$pkgname-$pkgver.tar.xz) -sha256sums=('3f704bac772a54cf668aca769c766bc1fb9ebc8823a903ef108927805c020bea') - -build() { - export MONO_SHARED_DIR="$srcdir/.wabi" - mkdir -p "$MONO_SHARED_DIR" - - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper \ - --disable-update-mimedb - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain tomboy $pkgdir/etc/gconf/schemas/*.schemas - rm -f $pkgdir/etc/gconf/schemas/*.schemas -} diff --git a/testing/tomboy/tomboy.install b/testing/tomboy/tomboy.install deleted file mode 100644 index f8e2e4a07..000000000 --- a/testing/tomboy/tomboy.install +++ /dev/null @@ -1,25 +0,0 @@ -pkgname=tomboy - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime -} diff --git a/testing/valgrind/PKGBUILD b/testing/valgrind/PKGBUILD deleted file mode 100644 index a48cb6eff..000000000 --- a/testing/valgrind/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 142728 2011-11-14 01:17:20Z allan $ -# Maintainer: Dan McGee <dan@archlinux.org> -# Maintainer: Allan McRae <allan@archlinux.org> - -pkgname=valgrind -pkgver=3.7.0 -pkgrel=1 -pkgdesc="A tool to help find memory-management problems in programs" -arch=('i686' 'x86_64') -license=('GPL') -url="http://valgrind.org/" -depends=('glibc>=2.14' 'glibc<2.15' 'perl') -makedepends=('gdb') -options=('!emptydirs') -source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2) -md5sums=('a855fda56edf05614f099dca316d1775') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - if [ "${CARCH}" = "x86_64" ]; then - ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit - else - ./configure --prefix=/usr --mandir=/usr/share/man - fi - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/testing/vinagre/PKGBUILD b/testing/vinagre/PKGBUILD deleted file mode 100644 index e7fb8932a..000000000 --- a/testing/vinagre/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 142764 2011-11-14 21:29:43Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Allan McRae <mcrae_allan@hotmail.com> -# Contributor: lp76 <l.peduto@gmail.com> - -pkgname=vinagre -pkgver=3.2.2 -pkgrel=1 -pkgdesc="A VNC Client for the GNOME Desktop" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/vinagre/" -install=vinagre.install -depends=('libgnome-keyring' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme') -optdepends=('openssh: SSH plugin' - 'rdesktop: RDP plugin') -makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh') -groups=('gnome-extra') -options=('!emptydirs' '!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1533cc447177f8d6c9cfe45d61b05904efbf66c86b86b4c332e972ff965d76bd') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - #building with as-needed breaks rdp - #https://bugzilla.gnome.org/show_bug.cgi?id=653558 - export LDFLAGS="$LDFLAGS,--no-as-needed" - ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \ - --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/testing/vinagre/vinagre.install b/testing/vinagre/vinagre.install deleted file mode 100644 index 68158ac80..000000000 --- a/testing/vinagre/vinagre.install +++ /dev/null @@ -1,20 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime > /dev/null -} - -pre_upgrade() { - if (( $(vercmp $2 2.91.91-2) < 0 )); then - usr/sbin/gconfpkg --uninstall vinagre - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/vino/PKGBUILD b/testing/vino/PKGBUILD deleted file mode 100644 index f3ff87b9b..000000000 --- a/testing/vino/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 142766 2011-11-14 21:34:58Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=vino -pkgver=3.2.2 -pkgrel=1 -pkgdesc="a VNC server for the GNOME desktop" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils') -makedepends=('intltool' 'networkmanager') -groups=('gnome-extra') -url="http://www.gnome.org" -options=(!emptydirs) -install=vino.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('51089c35b5187c37ebcd4f8ad921123f9a56713316876531189a3f3765dc87d1') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/vino \ - --localstatedir=/var \ - --enable-gnome-keyring \ - --enable-avahi \ - --disable-http-server - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/testing/vino/vino.install b/testing/vino/vino.install deleted file mode 100644 index 469266843..000000000 --- a/testing/vino/vino.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall vino - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/xfsprogs/PKGBUILD b/testing/xfsprogs/PKGBUILD deleted file mode 100644 index 044081699..000000000 --- a/testing/xfsprogs/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 142910 2011-11-18 08:13:20Z tpowa $ -# Maintainer: Paul Mattal <paul@archlinux.org> -pkgname=xfsprogs -pkgver=3.1.7 -pkgrel=1 -pkgdesc="XFS filesystem utilities" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://oss.sgi.com/projects/xfs/" -groups=('base') -depends=('util-linux-ng>=2.16') -options=('!makeflags' '!libtool') -# We mirror the sources as upstream tends to move them once a new release is out -source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") -md5sums=('049cf9873794ea49d0bb3f12d45748a4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export OPTIMIZER="-march=${CARCH/_/-} -O1" - export DEBUG=-DNDEBUG - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DIST_ROOT="${pkgdir}" install install-dev - chown -R root $pkgdir - chgrp -R root $pkgdir -} diff --git a/testing/xorg-server/10-quirks.conf b/testing/xorg-server/10-quirks.conf deleted file mode 100644 index 7afad22dc..000000000 --- a/testing/xorg-server/10-quirks.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Collection of quirks and blacklist/whitelists for specific devices. - - -# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable -# http://bugs.freedesktop.org/show_bug.cgi?id=22442 -Section "InputClass" - Identifier "ThinkPad HDAPS accelerometer blacklist" - MatchProduct "ThinkPad HDAPS accelerometer data" - Option "Ignore" "on" -EndSection diff --git a/testing/xorg-server/PKGBUILD b/testing/xorg-server/PKGBUILD deleted file mode 100644 index c2a5e2c4f..000000000 --- a/testing/xorg-server/PKGBUILD +++ /dev/null @@ -1,205 +0,0 @@ -# $Id: PKGBUILD 142829 2011-11-16 11:34:48Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=xorg-server -pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.11.2 -pkgrel=2 -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'udev' 'libgcrypt') -options=('!libtool') -source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - autoconfig-nvidia.patch - autoconfig-sis.patch - revert-trapezoids.patch - git-fixes.patch - xserver-1.11.2-record-crasher.patch - Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch - xvfb-run - xvfb-run.1 - 10-quirks.conf) -md5sums=('8796fff441e5435ee36a72579008af24' - '6c7e87d63ac4b535e19a80c89d0cf091' - 'f8194638ca4872c2b0a67862a70bcebf' - 'f6c84f4936f8e00abdfbd9fb4eda83fb' - '6fb42ec979ecd6125b6599f54dc00d14' - '3f9de4dbfee2da90167192d8ca9eb2b4' - '47f9b979fe38043b42ff86eeee6fd0d0' - '52fd3effd80d7bc6c1660d4ecf23d31c' - '376c70308715cd2643f7bff936d9934b' - 'd4f7dfc6be4ef4e2c6dd7632a9d88abe') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Use nouveau/nv/nvidia drivers for nvidia devices - patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" - - # Use unofficial imedia SiS driver for supported SiS devices - patch -Np0 -i "${srcdir}/autoconfig-sis.patch" - - # Revert commit that causes huge slowdowns with binary nVidia driver - patch -Np1 -i "${srcdir}/revert-trapezoids.patch" - - # Add post-release patches from 1.11 branch - patch -Np1 -i "${srcdir}/git-fixes.patch" - - # From Fedora. - # Upstream URL: http://patchwork.freedesktop.org/patch/7866/ - patch -Np1 -i "${srcdir}/xserver-1.11.2-record-crasher.patch" - - # From Fedora. - # Upstream URL: https://bugs.freedesktop.org/show_bug.cgi?id=42298 - patch -Np1 -i "${srcdir}/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch" - - autoreconf -fi - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-dri \ - --enable-dmx \ - --enable-xvfb \ - --enable-xnest \ - --enable-composite \ - --enable-xcsecurity \ - --enable-xorg \ - --enable-xephyr \ - --enable-glx-tls \ - --enable-kdrive \ - --enable-install-setuid \ - --enable-config-udev \ - --disable-config-dbus \ - --enable-record \ - --disable-xfbdev \ - --disable-xfake \ - --disable-static \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var \ - --with-xkb-path=/usr/share/X11/xkb \ - --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts - make - - # Disable subdirs for make install rule to make splitting easier - sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ - -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ - -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ - -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ - -i hw/Makefile -} - -package_xorg-server-common() { - pkgdesc="Xorg server common files" - depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') - - cd "${srcdir}/${pkgbase}-${pkgver}" - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" - install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" - - make -C xkb DESTDIR="${pkgdir}" install-data - - install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/lib/xorg" - install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" -} - -package_xorg-server() { - pkgdesc="Xorg X server" - depends=(libxdmcp libxfont udev libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev) - backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') - provides=('x-server') - groups=('xorg') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/X11" - mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" - install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - - rmdir "${pkgdir}/usr/share/X11" - - # Needed for non-mesa drivers, libgl will restore it - mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ - "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" - - rm -rf "${pkgdir}/var" - - rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" - rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" - - rm -rf "${pkgdir}/usr/lib/pkgconfig" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/share/aclocal" -} - -package_xorg-server-xephyr() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING" -} - -package_xorg-server-xvfb() { - pkgdesc="Virtual framebuffer X server" - depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb" - make DESTDIR="${pkgdir}" install - - install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" - install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING" -} - -package_xorg-server-xnest() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libxext libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING" -} - -package_xorg-server-xdmx() { - pkgdesc="Distributed Multihead X Server and utilities" - depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING" -} - -package_xorg-server-devel() { - pkgdesc="Development files for the X.Org X server" - depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess) - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}/usr/bin" - rm -rf "${pkgdir}/usr/share/man" - rm -rf "${pkgdir}/usr/share/doc" - rm -rf "${pkgdir}/usr/share/X11" - rm -rf "${pkgdir}/usr/lib/xorg" - rm -rf "${pkgdir}/var" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" -} diff --git a/testing/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch b/testing/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch deleted file mode 100644 index 8bddb2945..000000000 --- a/testing/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 97f2af5876dab0dfab06be735416f3fc950ed39e Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Thu, 27 Oct 2011 11:03:39 +1000 -Subject: [PATCH] Xi: allow passive keygrabs on the XIAll(Master)Devices fake - devices - -They don't have a KeyClassRec, but we must still allow passive grabs on -them. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -Tested-by: Bastien Nocera <hadess@hadess.net> ---- - Xi/exevents.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Xi/exevents.c b/Xi/exevents.c -index 053c76f..edf2c39 100644 ---- a/Xi/exevents.c -+++ b/Xi/exevents.c -@@ -1495,7 +1495,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device, - rc = CheckGrabValues(client, param); - if (rc != Success) - return rc; -- if (k == NULL) -+ if ((dev->id != XIAllDevices && dev->id != XIAllMasterDevices) && k == NULL) - return BadMatch; - if (grabtype == GRABTYPE_XI) - { --- -1.7.7 - diff --git a/testing/xorg-server/autoconfig-nvidia.patch b/testing/xorg-server/autoconfig-nvidia.patch deleted file mode 100644 index baa2eb601..000000000 --- a/testing/xorg-server/autoconfig-nvidia.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/hw/xfree86/common/xf86pciBus.c -+++ b/hw/xfree86/common/xf86pciBus.c -@@ -1123,7 +1123,25 @@ videoPtrToDriverList(struct pci_device * - break; - case 0x102b: driverList[0] = "mga"; break; - case 0x10c8: driverList[0] = "neomagic"; break; -- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; -+ case 0x10de: case 0x12d2: -+ switch (dev->device_id) { -+ /* NV1 */ -+ case 0x0008: -+ case 0x0009: -+ driverList[0] = "vesa"; -+ break; -+ /* NV3 */ -+ case 0x0018: -+ case 0x0019: -+ driverList[0] = "nv"; -+ break; -+ default: -+ driverList[0] = "nouveau"; -+ driverList[1] = "nv"; -+ driverList[2] = "nvidia"; -+ break; -+ } -+ break; - case 0x1106: driverList[0] = "openchrome"; break; - case 0x1b36: driverList[0] = "qxl"; break; - case 0x1163: driverList[0] = "rendition"; break; diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch deleted file mode 100644 index d936efaaa..000000000 --- a/testing/xorg-server/autoconfig-sis.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 -+++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 -@@ -1140,7 +1140,15 @@ - driverList[0] = "savage"; break; - } - break; -- case 0x1039: driverList[0] = "sis"; break; -+ case 0x1039: -+ switch (dev->device_id) -+ { -+ case 0x6350: case 0x6351: -+ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; -+ default: -+ driverList[0] = "sis"; break; -+ } -+ break; - case 0x126f: driverList[0] = "siliconmotion"; break; - case 0x121a: - if (dev->device_id < 0x0003) diff --git a/testing/xorg-server/git-fixes.patch b/testing/xorg-server/git-fixes.patch deleted file mode 100644 index 27da61eca..000000000 --- a/testing/xorg-server/git-fixes.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 89626304ea1ad316c5b7145a40f09377148cff21 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Thu, 20 Oct 2011 13:43:01 +0000 -Subject: xf86Crtc: handle no outputs with no modes harder. - -If you started an X server with no connected outputs, we pick a default -1024x768 mode, however if you then ran an xvidmode using app against that -server it would segfault the server due to not finding any valid modes. - -This was due to the no output mode set code, only adding the modes to the -scrn->modes once, when something called randr 1.2 xf86SetScrnInfoModes would -get called and remove all the modes and we'd end up with 0. - -This change fixes xf86SetScrnInfoModes to always report a scrn mode of at -least 1024x768, and pushes the initial configuration to just call it instead -of setting up the mode itself. - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=746926 - -I've seen other bugs like this on other distros so it might also actually fix them. - -Signed-off-by: Dave Airlie <airlied@redhat.com> -Reviewed-by: Keith Packard <keithp@keithp.com> -Signed-off-by: Keith Packard <keithp@keithp.com> -(cherry picked from commit 17416e88dcfcc584fe5f87580d5d2b719b3521c3) ---- -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index d75cd77..8906806 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -1915,19 +1915,25 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn) - break; - } - -- if (scrn->modes != NULL) { -- /* For some reason, scrn->modes is circular, unlike the other mode -- * lists. How great is that? -- */ -- for (last = scrn->modes; last && last->next; last = last->next) -- ; -- last->next = scrn->modes; -- scrn->modes->prev = last; -- if (mode) { -- while (scrn->modes != mode) -- scrn->modes = scrn->modes->next; -- } -+ if (!scrn->modes) { -+ scrn->modes = xf86ModesAdd(scrn->modes, -+ xf86CVTMode(scrn->display->virtualX, -+ scrn->display->virtualY, -+ 60, 0, 0)); -+ } -+ -+ /* For some reason, scrn->modes is circular, unlike the other mode -+ * lists. How great is that? -+ */ -+ for (last = scrn->modes; last && last->next; last = last->next) -+ ; -+ last->next = scrn->modes; -+ scrn->modes->prev = last; -+ if (mode) { -+ while (scrn->modes != mode) -+ scrn->modes = scrn->modes->next; - } -+ - scrn->currentMode = scrn->modes; - #ifdef XFreeXDGA - if (scrn->pScreen) -@@ -2529,16 +2535,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) - width, height); - } - -- if (have_outputs) { -- /* Mirror output modes to scrn mode list */ -- xf86SetScrnInfoModes (scrn); -- } else { -- /* Clear any existing modes from scrn->modes */ -- while (scrn->modes != NULL) -- xf86DeleteMode(&scrn->modes, scrn->modes); -- scrn->modes = xf86ModesAdd(scrn->modes, -- xf86CVTMode(width, height, 60, 0, 0)); -- } -+ xf86SetScrnInfoModes (scrn); - - success = TRUE; - bailout: --- -cgit v0.9.0.2-2-gbebe -From 97f2ae60fc0cc755abd8b88df826fcb1a20464fe Mon Sep 17 00:00:00 2001 -From: Christopher Yeleighton <giecrilj@stegny.2a.pl> -Date: Tue, 25 Oct 2011 01:47:06 +0000 -Subject: Bug 38420: Xvfb crashes in miInitVisuals() when started with depth=2 - -https://bugs.freedesktop.org/show_bug.cgi?id=38420 - -Exit with fatal error message, not segfault. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> -Signed-off-by: Keith Packard <keithp@keithp.com> -(cherry picked from commit 7d50211ab57a35910d79fc3f67ae89aff91fa995) ---- -diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c -index 31ed505..dce3f84 100644 ---- a/hw/vfb/InitOutput.c -+++ b/hw/vfb/InitOutput.c -@@ -864,6 +864,8 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) - (1 << DirectColor)), - 10, TrueColor, 0x3ff00000, 0x000ffc00, 0x000003ff); - break; -+ default: -+ return FALSE; - } - - miSetPixmapDepths (); --- -cgit v0.9.0.2-2-gbebe -From 34bb83b9df20ff63dbb147ed661f39efb8bae8e4 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 24 Oct 2011 02:00:32 +0000 -Subject: dix: block signals when closing all devices - -When closing down all devices, we manually unset master for all attached -devices, but the device's sprite info still points to the master's sprite -info. This leaves us a window where the master is freed already but the -device isn't yet. A signal during that window causes dereference of the -already freed spriteInfo in mieqEnqueue's EnqueueScreen macro. - -Simply block signals when removing all devices. It's not like we're really -worrying about high-responsive input at this stage. - -https://bugzilla.redhat.com/show_bug.cgi?id=737031 - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Julien Cristau <jcristau@debian.org> -(cherry picked from commit d7c44a7c9760449bef263413ad3b20f19b1dc95a) ---- -diff --git a/dix/devices.c b/dix/devices.c -index 0ccf252..cbdd4ea 100644 ---- a/dix/devices.c -+++ b/dix/devices.c -@@ -982,6 +982,8 @@ CloseDownDevices(void) - { - DeviceIntPtr dev; - -+ OsBlockSignals(); -+ - /* Float all SDs before closing them. Note that at this point resources - * (e.g. cursors) have been freed already, so we can't just call - * AttachDevice(NULL, dev, NULL). Instead, we have to forcibly set master -@@ -1004,6 +1006,8 @@ CloseDownDevices(void) - inputInfo.keyboard = NULL; - inputInfo.pointer = NULL; - XkbDeleteRulesDflts(); -+ -+ OsReleaseSignals(); - } - - /** --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xorg-server/revert-trapezoids.patch b/testing/xorg-server/revert-trapezoids.patch deleted file mode 100644 index b9046c5cb..000000000 --- a/testing/xorg-server/revert-trapezoids.patch +++ /dev/null @@ -1,179 +0,0 @@ -diff -ru a/fb/fbpict.c b/fb/fbpict.c ---- a/fb/fbpict.c 2011-08-01 01:44:24.000000000 +0200 -+++ b/fb/fbpict.c 2011-10-05 22:45:29.000000000 +0200 -@@ -364,7 +364,7 @@ - ps->Glyphs = miGlyphs; - ps->CompositeRects = miCompositeRects; - ps->RasterizeTrapezoid = fbRasterizeTrapezoid; -- ps->Trapezoids = fbTrapezoids; -+ ps->Trapezoids = miTrapezoids; - ps->AddTraps = fbAddTraps; - ps->AddTriangles = fbAddTriangles; - ps->Triangles = fbTriangles; -diff -ru a/render/mipict.c b/render/mipict.c ---- a/render/mipict.c 2011-04-04 05:19:50.000000000 +0200 -+++ b/render/mipict.c 2011-10-05 22:02:53.000000000 +0200 -@@ -573,6 +573,67 @@ - } - } - -+void -+miTrapezoids (CARD8 op, -+ PicturePtr pSrc, -+ PicturePtr pDst, -+ PictFormatPtr maskFormat, -+ INT16 xSrc, -+ INT16 ySrc, -+ int ntrap, -+ xTrapezoid *traps) -+{ -+ ScreenPtr pScreen = pDst->pDrawable->pScreen; -+ PictureScreenPtr ps = GetPictureScreen(pScreen); -+ -+ /* -+ * Check for solid alpha add -+ */ -+ if (op == PictOpAdd && miIsSolidAlpha (pSrc)) -+ { -+ for (; ntrap; ntrap--, traps++) -+ (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0); -+ } -+ else if (maskFormat) -+ { -+ PicturePtr pPicture; -+ BoxRec bounds; -+ INT16 xDst, yDst; -+ INT16 xRel, yRel; -+ -+ xDst = traps[0].left.p1.x >> 16; -+ yDst = traps[0].left.p1.y >> 16; -+ -+ miTrapezoidBounds (ntrap, traps, &bounds); -+ if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) -+ return; -+ pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat, -+ bounds.x2 - bounds.x1, -+ bounds.y2 - bounds.y1); -+ if (!pPicture) -+ return; -+ for (; ntrap; ntrap--, traps++) -+ (*ps->RasterizeTrapezoid) (pPicture, traps, -+ -bounds.x1, -bounds.y1); -+ xRel = bounds.x1 + xSrc - xDst; -+ yRel = bounds.y1 + ySrc - yDst; -+ CompositePicture (op, pSrc, pPicture, pDst, -+ xRel, yRel, 0, 0, bounds.x1, bounds.y1, -+ bounds.x2 - bounds.x1, -+ bounds.y2 - bounds.y1); -+ FreePicture (pPicture, 0); -+ } -+ else -+ { -+ if (pDst->polyEdge == PolyEdgeSharp) -+ maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1); -+ else -+ maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8); -+ for (; ntrap; ntrap--, traps++) -+ miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps); -+ } -+} -+ - Bool - miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) - { -@@ -599,7 +660,7 @@ - ps->Composite = 0; /* requires DDX support */ - ps->Glyphs = miGlyphs; - ps->CompositeRects = miCompositeRects; -- ps->Trapezoids = 0; -+ ps->Trapezoids = miTrapezoids; - ps->Triangles = 0; - - ps->RasterizeTrapezoid = 0; /* requires DDX support */ -diff -ru a/render/mipict.h b/render/mipict.h ---- a/render/mipict.h 2011-04-04 05:19:50.000000000 +0200 -+++ b/render/mipict.h 2011-10-05 22:06:19.000000000 +0200 -@@ -129,6 +129,23 @@ - CARD32 pixel, - xRenderColor *color); - -+extern _X_EXPORT PicturePtr -+miCreateAlphaPicture (ScreenPtr pScreen, -+ PicturePtr pDst, -+ PictFormatPtr pPictFormat, -+ CARD16 width, -+ CARD16 height); -+ -+extern _X_EXPORT void -+miTrapezoids (CARD8 op, -+ PicturePtr pSrc, -+ PicturePtr pDst, -+ PictFormatPtr maskFormat, -+ INT16 xSrc, -+ INT16 ySrc, -+ int ntrap, -+ xTrapezoid *traps); -+ - extern _X_EXPORT Bool - miIsSolidAlpha (PicturePtr pSrc); - -diff -ru a/render/mitrap.c b/render/mitrap.c ---- a/render/mitrap.c 2011-04-04 05:19:50.000000000 +0200 -+++ b/render/mitrap.c 2011-10-05 22:05:29.000000000 +0200 -@@ -34,6 +34,55 @@ - #include "picturestr.h" - #include "mipict.h" - -+PicturePtr -+miCreateAlphaPicture (ScreenPtr pScreen, -+ PicturePtr pDst, -+ PictFormatPtr pPictFormat, -+ CARD16 width, -+ CARD16 height) -+{ -+ PixmapPtr pPixmap; -+ PicturePtr pPicture; -+ GCPtr pGC; -+ int error; -+ xRectangle rect; -+ -+ if (width > 32767 || height > 32767) -+ return 0; -+ -+ if (!pPictFormat) -+ { -+ if (pDst->polyEdge == PolyEdgeSharp) -+ pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1); -+ else -+ pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8); -+ if (!pPictFormat) -+ return 0; -+ } -+ -+ pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, -+ pPictFormat->depth, 0); -+ if (!pPixmap) -+ return 0; -+ pGC = GetScratchGC (pPixmap->drawable.depth, pScreen); -+ if (!pGC) -+ { -+ (*pScreen->DestroyPixmap) (pPixmap); -+ return 0; -+ } -+ ValidateGC (&pPixmap->drawable, pGC); -+ rect.x = 0; -+ rect.y = 0; -+ rect.width = width; -+ rect.height = height; -+ (*pGC->ops->PolyFillRect)(&pPixmap->drawable, pGC, 1, &rect); -+ FreeScratchGC (pGC); -+ pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat, -+ 0, 0, serverClient, &error); -+ (*pScreen->DestroyPixmap) (pPixmap); -+ return pPicture; -+} -+ - static xFixed - miLineFixedX (xLineFixed *l, xFixed y, Bool ceil) - { - diff --git a/testing/xorg-server/xserver-1.11.2-record-crasher.patch b/testing/xorg-server/xserver-1.11.2-record-crasher.patch deleted file mode 100644 index 3af207bb9..000000000 --- a/testing/xorg-server/xserver-1.11.2-record-crasher.patch +++ /dev/null @@ -1,241 +0,0 @@ -From patchwork Tue Nov 8 18:22:13 2011 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: Save major/minor opcodes in ClientRec for RecordAReply -Date: Tue, 08 Nov 2011 18:22:13 -0000 -From: Keith Packard <keithp@keithp.com> -X-Patchwork-Id: 7866 -Message-Id: <1320776533-3120-1-git-send-email-keithp@keithp.com> -To: xorg-devel@lists.freedesktop.org - -The record extension needs the major and minor opcodes in the reply -hook, but the request buffer may have been freed by the time the hook -is invoked. Saving the request major and minor codes as the request is -executed avoids fetching from the defunct request buffer. - -This patch also eliminates the public MinorOpcodeOfRequest function, -making it static to dispatch. Usages of that function have been -replaced with direct access to the new ClientRec field. - -Signed-off-by: Keith Packard <keithp@keithp.com> -Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi> - ---- -Here's what I was thinking of to fix this -- just record the major and -minor opcodes of the request in the ClientRec during Dispatch and then -using those fields in RecordAReply instead of fetching the discarded -request buffer. - -This is entirely untested; I don't know how to make the old code break. - - Xext/security.c | 4 +--- - Xext/xselinux_hooks.c | 4 ++-- - dix/dispatch.c | 31 ++++++++++++++++++++++--------- - dix/extension.c | 14 -------------- - include/dixstruct.h | 1 + - include/extension.h | 2 -- - record/record.c | 8 +++----- - 7 files changed, 29 insertions(+), 35 deletions(-) - -[ fedora: technically this is an ABI breaker since it's changing ClientRec, - but hopefully not in a way that matters. If it does matter, easiest thing - to do is have Record add a hook for XaceHookDispatch. - ajax ] - -diff --git a/Xext/security.c b/Xext/security.c -index 08d8158..b0d82ab 100644 ---- a/Xext/security.c -+++ b/Xext/security.c -@@ -148,9 +148,7 @@ SecurityLabelInitial(void) - static _X_INLINE const char * - SecurityLookupRequestName(ClientPtr client) - { -- int major = ((xReq *)client->requestBuffer)->reqType; -- int minor = MinorOpcodeOfRequest(client); -- return LookupRequestName(major, minor); -+ return LookupRequestName(client->majorOp, client->minorOp); - } - - -diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c -index f1d8e5d..0d4c9ab 100644 ---- a/Xext/xselinux_hooks.c -+++ b/Xext/xselinux_hooks.c -@@ -263,8 +263,8 @@ SELinuxAudit(void *auditdata, - if (client) { - REQUEST(xReq); - if (stuff) { -- major = stuff->reqType; -- minor = MinorOpcodeOfRequest(client); -+ major = client->majorOp; -+ minor = client->minorOp; - } - } - if (audit->id) -diff --git a/dix/dispatch.c b/dix/dispatch.c -index 6e33615..3600acd 100644 ---- a/dix/dispatch.c -+++ b/dix/dispatch.c -@@ -337,7 +337,20 @@ DisableLimitedSchedulingLatency(void) - SmartScheduleLatencyLimited = 0; - } - --#define MAJOROP ((xReq *)client->requestBuffer)->reqType -+static inline unsigned short -+MinorOpcodeOfRequest(ClientPtr client) -+{ -+ unsigned char major; -+ ExtensionEntry *ext; -+ -+ major = ((xReq *)client->requestBuffer)->reqType; -+ if (major < EXTENSION_BASE) -+ return 0; -+ ext = GetExtensionEntry(major); -+ if (!ext) -+ return 0; -+ return ext->MinorOpcode (client); -+} - - void - Dispatch(void) -@@ -419,21 +432,23 @@ Dispatch(void) - } - - client->sequence++; -+ client->majorOp = ((xReq *)client->requestBuffer)->reqType; -+ client->minorOp = MinorOpcodeOfRequest(client); - #ifdef XSERVER_DTRACE -- XSERVER_REQUEST_START(LookupMajorName(MAJOROP), MAJOROP, -+ XSERVER_REQUEST_START(LookupMajorName(client->majorOp), client->majorOp, - ((xReq *)client->requestBuffer)->length, - client->index, client->requestBuffer); - #endif - if (result > (maxBigRequestSize << 2)) - result = BadLength; - else { -- result = XaceHookDispatch(client, MAJOROP); -+ result = XaceHookDispatch(client, client->majorOp); - if (result == Success) -- result = (* client->requestVector[MAJOROP])(client); -+ result = (* client->requestVector[client->majorOp])(client); - XaceHookAuditEnd(client, result); - } - #ifdef XSERVER_DTRACE -- XSERVER_REQUEST_DONE(LookupMajorName(MAJOROP), MAJOROP, -+ XSERVER_REQUEST_DONE(LookupMajorName(client->majorOp), client->majorOp, - client->sequence, client->index, result); - #endif - -@@ -444,8 +459,8 @@ Dispatch(void) - } - else if (result != Success) - { -- SendErrorToClient(client, MAJOROP, -- MinorOpcodeOfRequest(client), -+ SendErrorToClient(client, client->majorOp, -+ client->minorOp, - client->errorValue, result); - break; - } -@@ -466,8 +481,6 @@ Dispatch(void) - SmartScheduleLatencyLimited = 0; - } - --#undef MAJOROP -- - static int VendorRelease = VENDOR_RELEASE; - static char *VendorString = VENDOR_NAME; - -diff --git a/dix/extension.c b/dix/extension.c -index c7bbac5..b677cdb 100644 ---- a/dix/extension.c -+++ b/dix/extension.c -@@ -228,20 +228,6 @@ StandardMinorOpcode(ClientPtr client) - return ((xReq *)client->requestBuffer)->data; - } - --unsigned short --MinorOpcodeOfRequest(ClientPtr client) --{ -- unsigned char major; -- -- major = ((xReq *)client->requestBuffer)->reqType; -- if (major < EXTENSION_BASE) -- return 0; -- major -= EXTENSION_BASE; -- if (major >= NumExtensions) -- return 0; -- return (*extensions[major]->MinorOpcode)(client); --} -- - void - CloseDownExtensions(void) - { -diff --git a/include/dixstruct.h b/include/dixstruct.h -index 6cc9614..0a85f40 100644 ---- a/include/dixstruct.h -+++ b/include/dixstruct.h -@@ -122,6 +122,7 @@ typedef struct _Client { - - DeviceIntPtr clientPtr; - ClientIdPtr clientIds; -+ unsigned short majorOp, minorOp; - } ClientRec; - - /* -diff --git a/include/extension.h b/include/extension.h -index 29a11c3..9249951 100644 ---- a/include/extension.h -+++ b/include/extension.h -@@ -52,8 +52,6 @@ _XFUNCPROTOBEGIN - - extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client*/); - --extern _X_EXPORT unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/); -- - extern _X_EXPORT Bool EnableDisableExtension(char *name, Bool enable); - - extern _X_EXPORT void EnableDisableExtensionError(char *name, Bool enable); -diff --git a/record/record.c b/record/record.c -index 68311ac..4a0fe23 100644 ---- a/record/record.c -+++ b/record/record.c -@@ -546,7 +546,7 @@ RecordARequest(ClientPtr client) - } - else /* extension, check minor opcode */ - { -- int minorop = MinorOpcodeOfRequest(client); -+ int minorop = client->minorOp; - int numMinOpInfo; - RecordMinorOpPtr pMinorOpInfo = pRCAP->pRequestMinOpInfo; - -@@ -603,12 +603,9 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) - RecordContextPtr pContext; - RecordClientsAndProtocolPtr pRCAP; - int eci; -- int majorop; - ReplyInfoRec *pri = (ReplyInfoRec *)calldata; - ClientPtr client = pri->client; -- REQUEST(xReq); - -- majorop = stuff->reqType; - for (eci = 0; eci < numEnabledContexts; eci++) - { - pContext = ppAllContexts[eci]; -@@ -616,6 +613,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) - NULL); - if (pRCAP) - { -+ int majorop = client->majorOp; - if (pContext->continuedReply) - { - RecordAProtocolElement(pContext, client, XRecordFromServer, -@@ -635,7 +633,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) - } - else /* extension, check minor opcode */ - { -- int minorop = MinorOpcodeOfRequest(client); -+ int minorop = client->minorOp; - int numMinOpInfo; - RecordMinorOpPtr pMinorOpInfo = pRCAP->pReplyMinOpInfo; - assert (pMinorOpInfo); diff --git a/testing/xorg-server/xvfb-run b/testing/xorg-server/xvfb-run deleted file mode 100644 index 4c2f4e0d3..000000000 --- a/testing/xorg-server/xvfb-run +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/sh - -# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ - -# This script starts an instance of Xvfb, the "fake" X server, runs a command -# with that server available, and kills the X server when done. The return -# value of the command becomes the return value of this script. -# -# If anyone is using this to build a Debian package, make sure the package -# Build-Depends on xvfb, xbase-clients, and xfonts-base. - -set -e - -PROGNAME=xvfb-run -SERVERNUM=99 -AUTHFILE= -ERRORFILE=/dev/null -STARTWAIT=3 -XVFBARGS="-screen 0 640x480x8" -LISTENTCP="-nolisten tcp" -XAUTHPROTO=. - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the event -# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the -# script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -# Display a message, wrapping lines at the terminal width. -message () { - echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} -} - -# Display an error message. -error () { - message "error: $*" >&2 -} - -# Display a usage message. -usage () { - if [ -n "$*" ]; then - message "usage error: $*" - fi - cat <<EOF -Usage: $PROGNAME [OPTION ...] COMMAND -Run COMMAND (usually an X client) in a virtual X server environment. -Options: --a --auto-servernum try to get a free server number, starting at - --server-num --e FILE --error-file=FILE file used to store xauth errors and Xvfb - output (default: $ERRORFILE) --f FILE --auth-file=FILE file used to store auth cookie - (default: ./.Xauthority) --h --help display this usage message and exit --n NUM --server-num=NUM server number to use (default: $SERVERNUM) --l --listen-tcp enable TCP port listening in the X server --p PROTO --xauth-protocol=PROTO X authority protocol name to use - (default: xauth command's default) --s ARGS --server-args=ARGS arguments (other than server number and - "-nolisten tcp") to pass to the Xvfb server - (default: "$XVFBARGS") --w DELAY --wait=DELAY delay in seconds to wait for Xvfb to start - before running COMMAND (default: $STARTWAIT) -EOF -} - -# Find a free server number by looking at .X*-lock files in /tmp. -find_free_servernum() { - # Sadly, the "local" keyword is not POSIX. Leave the next line commented in - # the hope Debian Policy eventually changes to allow it in /bin/sh scripts - # anyway. - #local i - - i=$SERVERNUM - while [ -f /tmp/.X$i-lock ]; do - i=$(($i + 1)) - done - echo $i -} - -# Clean up files -clean_up() { - if [ -e "$AUTHFILE" ]; then - XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1 - fi - if [ -n "$XVFB_RUN_TMPDIR" ]; then - if ! rm -r "$XVFB_RUN_TMPDIR"; then - error "problem while cleaning up temporary directory" - exit 5 - fi - fi -} - -# Parse the command line. -ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ - --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ - --name "$PROGNAME" -- "$@") -GETOPT_STATUS=$? - -if [ $GETOPT_STATUS -ne 0 ]; then - error "internal error; getopt exited with status $GETOPT_STATUS" - exit 6 -fi - -eval set -- "$ARGS" - -while :; do - case "$1" in - -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; - -e|--error-file) ERRORFILE="$2"; shift ;; - -f|--auth-file) AUTHFILE="$2"; shift ;; - -h|--help) SHOWHELP="yes" ;; - -n|--server-num) SERVERNUM="$2"; shift ;; - -l|--listen-tcp) LISTENTCP="" ;; - -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; - -s|--server-args) XVFBARGS="$2"; shift ;; - -w|--wait) STARTWAIT="$2"; shift ;; - --) shift; break ;; - *) error "internal error; getopt permitted \"$1\" unexpectedly" - exit 6 - ;; - esac - shift -done - -if [ "$SHOWHELP" ]; then - usage - exit 0 -fi - -if [ -z "$*" ]; then - usage "need a command to run" >&2 - exit 2 -fi - -if ! which xauth >/dev/null; then - error "xauth command not found" - exit 3 -fi - -# tidy up after ourselves -trap clean_up EXIT - -# If the user did not specify an X authorization file to use, set up a temporary -# directory to house one. -if [ -z "$AUTHFILE" ]; then - XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" - AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority" -fi - -# Start Xvfb. -MCOOKIE=$(mcookie) -XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 -add :$SERVERNUM $XAUTHPROTO $MCOOKIE -EOF -XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ - 2>&1 & -XVFBPID=$! -sleep "$STARTWAIT" -if ! kill -0 $XVFBPID 2>/dev/null; then - echo "Xvfb failed to start" >&2 - exit 1 -fi - -# Start the command and save its exit status. -set +e -DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 -RETVAL=$? -set -e - -# Kill Xvfb now that the command has exited. -kill $XVFBPID - -# Return the executed command's exit status. -exit $RETVAL - -# vim:set ai et sts=4 sw=4 tw=80: diff --git a/testing/xorg-server/xvfb-run.1 b/testing/xorg-server/xvfb-run.1 deleted file mode 100644 index 137d3a196..000000000 --- a/testing/xorg-server/xvfb-run.1 +++ /dev/null @@ -1,282 +0,0 @@ -.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ -.\" -.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>. -.\" -.\" This is free software; you may 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, -.\" or (at your option) any later version. -.\" -.\" This 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 with -.\" the Debian operating system, in /usr/share/common-licenses/GPL; if -.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, -.\" Suite 330, Boston, MA 02111-1307 USA -.\" -.\" We need the URL macro from groff's www macro package, but also want -.\" things to work all right for people who don't have it. So we define -.\" our own URL macro and let the www macro package override it if it's -.\" available. -.de URL -\\$2 \(laURL: \\$1 \(ra\\$3 -.. -.if \n[.g] .mso www.tmac -.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" -.SH NAME -xvfb\-run \- run specified X client or command in a virtual X server environment -.SH SYNOPSIS -.B xvfb\-run -[ -.I options -] -.I command -.SH DESCRIPTION -.B xvfb\-run -is a wrapper for the -.BR Xvfb (1x) -command which simplifies the task of running commands (typically an X -client, or a script containing a list of clients to be run) within a virtual -X server environment. -.PP -.B xvfb\-run -sets up an X authority file (or uses an existing user\-specified one), -writes a cookie to it (see -.BR xauth (1x)) -and then starts the -.B Xvfb -X server as a background process. -The process ID of -.B Xvfb -is stored for later use. -The specified -.I command -is then run using the X display corresponding to the -.B Xvfb -server -just started and the X authority file created earlier. -.PP -When the -.I command -exits, its status is saved, the -.B Xvfb -server is killed (using the process ID stored earlier), the X authority -cookie removed, and the authority file deleted (if the user did not specify -one to use). -.B xvfb\-run -then exits with the exit status of -.IR command . -.PP -.B xvfb\-run -requires the -.B xauth -command to function. -.SH OPTIONS -.TP -.B \-a\fR,\fB \-\-auto\-servernum -Try to get a free server number, starting at 99, or the argument to -.BR \-\-server\-num . -.TP -.BI \-e\ file \fR,\fB\ \-\-error\-file= file -Store output from -.B xauth -and -.B Xvfb -in -.IR file . -The default is -.IR /dev/null . -.TP -.BI \-f\ file \fR,\fB\ \-\-auth\-file= file -Store X authentication data in -.IR file . -By default, a temporary directory called -.IR xvfb\-run. PID -(where PID is the process ID of -.B xvfb\-run -itself) is created in the directory specified by the environment variable -.B TMPDIR -(or -.I /tmp -if that variable is null or unset), and the -.BR tempfile (1) -command is used to create a file in that temporary directory called -.IR Xauthority . -.TP -.B \-h\fR,\fB \-\-help -Display a usage message and exit. -.TP -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -Use -.I servernumber -as the server number (but see the -.B \-a\fR,\fB \-\-auto\-servernum -option above). -The default is 99. -.TP -.B \-l\fR,\fB \-\-listen\-tcp -Enable TCP port listening in the X server. -For security reasons (to avoid denial\-of\-service attacks or exploits), -TCP port listening is disabled by default. -.TP -.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname -Use -.I protocolname -as the X authority protocol to use. -The default is \(oq.\(cq, which -.B xauth -interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. -.TP -.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments -Pass -.I arguments -to the -.B Xvfb -server. -Be careful to quote any whitespace characters that may occur within -.I arguments -to prevent them from regarded as separators for -.BR xvfb\-run 's -own arguments. -Also, note that specification of \(oq\-nolisten tcp\(cq in -.I arguments -may override the function of -.BR xvfb\-run 's -own -.B \-l\fR,\fB \-\-listen\-tcp -option, and that specification of the server number (e.g., \(oq:1\(cq) may -be ignored because of the way the X server parses its argument list. -Use the -.B xvfb\-run -option -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -to achieve the latter function. -The default is \(oq\-screen 0 640x480x8\(cq. -.TP -.BI \-w\ delay \fR,\fB\ \-\-wait= delay -Wait -.I delay -seconds after launching -.B Xvfb -before attempting to start the specified command. -The default is 3. -.SH ENVIRONMENT -.TP -.B COLUMNS -indicates the width of the terminal device in character cells. -This value is used for formatting diagnostic messages. -If not set, the terminal is queried using -.BR stty (1) -to determine its width. -If that fails, a value of \(oq80\(cq is assumed. -.TP -.B TMPDIR -specifies the directory in which to place -.BR xvfb\-run 's -temporary directory for storage of the X authority file; only used if the -.B \-f -or -.B \-\-auth\-file -options are not specified. -.SH "OUTPUT FILES" -.PP -Unless the -.B \-f -or -.B \-\-auth\-file -options are specified, a temporary -directory and file within it are created (and deleted) to store the X -authority cookies used by the -.B Xvfb -server and client(s) run under it. -See -.BR tempfile (1). -If \-f or \-\-auth\-file are used, then the specified X authority file is -only written to, not created or deleted (though -.B xauth -creates an authority file itself if told to use use that does not already -exist). -.PP -An error file with a user\-specified name is also created if the -.B \-e -or -.B \-\-error\-file -options are specifed; see above. -.SH "EXIT STATUS" -.B xvfb\-run -uses its exit status as well as output to standard error to communicate -diagnostics. -The exit status of \(oq1\(cq is not used, and should be interpreted as failure -of the specified command. -.TP -0 -.B xvfb\-run -only uses this exit status if the -.B \-h\fR,\fB \-\-help -option is given. -In all other situations, this may be interpreted as success of the specified -command. -.TP -2 -No command to run was specified. -.TP -3 -The -.B xauth -command is not available. -.TP -4 -The temporary directory that was going to be used already exists; since -.B xvfb\-run -produces a uniquely named directory, this may indicate an attempt by another -process on the system to exploit a temporary file race condition. -.TP -5 -A problem was encountered while cleaning up the temporary directory. -.TP -6 -A problem was encountered while using -.BR getopt (1) -to parse the command\-line arguments. -.SH EXAMPLES -.TP -.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo -runs the -.BR xlogo (1x) -demonstration client inside the -.B Xvfb -X server on the first available server number greater than or equal to 1. -.TP -.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces -runs the -.BR ico (1x) -demonstration client (and passes it the -.B \-faces -argument) inside the -.B Xvfb -X server, configured with a root window of 1024 by 768 pixels and a color -depth of 24 bits. -.PP -Note that the demo X clients used in the above examples will not exit on -their own, so they will have to be killed before -.B xvfb\-run -will exit. -.SH BUGS -See -.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . -If you wish to report a bug in -.BR xvfb\-run , -please use the -.BR reportbug (1) -command. -.SH AUTHOR -.B xfvb\-run -was written by Branden Robinson and Jeff Licquia with sponsorship from -Progeny Linux Systems. -.SH "SEE ALSO" -.BR Xvfb (1x), -.BR xauth (1x) -.\" vim:set et tw=80: |
