Removed old 1.0.x versions.
authorStefan Knoblich <stkn@gentoo.org>
Tue, 28 Feb 2006 02:20:53 +0000 (02:20 +0000)
committerStefan Knoblich <stkn@gentoo.org>
Tue, 28 Feb 2006 02:20:53 +0000 (02:20 +0000)
Package-Manager: portage-2.0.53

18 files changed:
net-misc/asterisk/ChangeLog
net-misc/asterisk/Manifest
net-misc/asterisk/asterisk-1.0.5-r3.ebuild [deleted file]
net-misc/asterisk/asterisk-1.0.6-r2.ebuild [deleted file]
net-misc/asterisk/files/1.0.0/asterisk-1.0.1-linux26.diff [deleted file]
net-misc/asterisk/files/digest-asterisk-1.0.5-r3 [deleted file]
net-misc/asterisk/files/digest-asterisk-1.0.6-r2 [deleted file]
net-misc/zaptel/ChangeLog
net-misc/zaptel/Manifest
net-misc/zaptel/files/digest-zaptel-1.0.4-r1 [deleted file]
net-misc/zaptel/files/digest-zaptel-1.0.6-r1 [deleted file]
net-misc/zaptel/files/digest-zaptel-1.0.9_p1-r1 [deleted file]
net-misc/zaptel/files/zaptel-1.0.3-gentoo.diff [deleted file]
net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC7k.patch [deleted file]
net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8l.patch [deleted file]
net-misc/zaptel/zaptel-1.0.4-r1.ebuild [deleted file]
net-misc/zaptel/zaptel-1.0.6-r1.ebuild [deleted file]
net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild [deleted file]

index b20a2594b8b7b133a3faac76f052488ba7c071b0..b8094d9da5d767949c29d7a6ea0edaf4bb314dac 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.101 2006/02/04 23:47:46 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.102 2006/02/28 02:19:50 stkn Exp $
+
+  28 Feb 2006; Stefan Knoblich <stkn@gentoo.org>
+  -files/1.0.0/asterisk-1.0.1-linux26.diff, -asterisk-1.0.5-r3.ebuild,
+  -asterisk-1.0.6-r2.ebuild:
+  Removed old 1.0.x versions.
 
   05 Feb 2006; Stefan Knoblich <stkn@gentoo.org> asterisk-1.2.4.ebuild:
   Fix installation of wrong init and conf.d script (bug #121602).
index ecae3d3e0c707be88d37b0c49fad335d126a4ba1..7e22f3e7d09187b7eb397357886822ac561733be 100644 (file)
@@ -1,14 +1,11 @@
 MD5 0b231fed5aef2b842143ac17936ef6b6 ChangeLog 20298
 MD5 9322226b2f812f260dd052ee9a8ed6a9 asterisk-1.0.10.ebuild 14631
-MD5 68d5fb7fa17a8adb2fde235305eeb444 asterisk-1.0.5-r3.ebuild 12292
-MD5 60c09319bc8263b96943e15c6af270b7 asterisk-1.0.6-r2.ebuild 14064
 MD5 bc4ed2731321058e4f90f38dbb13d99a asterisk-1.0.7-r2.ebuild 13677
 MD5 e2203fc118d7898b358862ddc9bcb8d4 asterisk-1.0.8-r1.ebuild 13800
 MD5 2bb329f2fddb62b6cc55b6ec95990528 asterisk-1.0.9-r2.ebuild 13817
 MD5 ccf3f74b0df577c747f8f1c51846f3e2 asterisk-1.2.0.ebuild 8468
 MD5 725495d05db613d568e01624e2bc9736 asterisk-1.2.1.ebuild 9907
 MD5 fa0757741a543c08e030e4fb1fb2289c asterisk-1.2.4.ebuild 10058
-MD5 f0fe0308b464c71f83cf2483388c8058 files/1.0.0/asterisk-1.0.1-linux26.diff 474
 MD5 88e8cfc364e9767f104159b374eb5bea files/1.0.0/asterisk-1.0.10-misdn.patch 607
 MD5 27bf961621fb1f521bc11293df8b5ec9 files/1.0.0/asterisk-1.0.10-weak-references.diff 8579
 MD5 f20e5b869d5e221194187dd7f504d38b files/1.0.0/asterisk-1.0.5-astcfg-0.0.2.diff 5829
@@ -35,8 +32,6 @@ MD5 ab552fbbe803766b5291d61942dbcd9f files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.d
 MD5 3932983fb155e026eb10533425174f59 files/1.2.0/asterisk-1.2.0_beta-ukcid.patch 5787
 MD5 18c24f2fcea3594b683d1c23643ad7b1 files/1.2.0/asterisk-1.2.1-uclibc-getloadavg.diff 317
 MD5 df9171e8435eddc50bfc453940e88053 files/digest-asterisk-1.0.10 211
-MD5 97ed00bdccf7c70d5fcbf37580da91c4 files/digest-asterisk-1.0.5-r3 139
-MD5 f399592939cd5b43b7851e20744a108e files/digest-asterisk-1.0.6-r2 210
 MD5 48a3518349e2abfe20fa918a9db5eea2 files/digest-asterisk-1.0.7-r2 210
 MD5 b3bbedde09faea609a0357b21eafa596 files/digest-asterisk-1.0.8-r1 210
 MD5 58b3329253168e6dfb4c8ecbb98aeecd files/digest-asterisk-1.0.9-r2 210
diff --git a/net-misc/asterisk/asterisk-1.0.5-r3.ebuild b/net-misc/asterisk/asterisk-1.0.5-r3.ebuild
deleted file mode 100644 (file)
index 9a317d9..0000000
+++ /dev/null
@@ -1,412 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.5-r3.ebuild,v 1.2 2005/11/28 13:15:53 mcummings Exp $
-
-inherit eutils perl-app
-
-ADDONS_VERSION="1.0.4"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="ftp://ftp.digium.com/pub/telephony/${PN}/old-releases/${P}.tar.gz
-        ftp://ftp.digium.com/pub/telephony/${PN}/old-releases/${PN}-addons-${ADDONS_VERSION}.tar.gz"
-
-S_ADDONS=${WORKDIR}/${PN}-addons-${ADDONS_VERSION}
-
-IUSE="alsa doc gtk mmx mysql pri zaptel uclibc resperl debug postgres vmdbmysql vmdbpostgres"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~amd64"
-
-DEPEND="dev-libs/newt
-       dev-libs/openssl
-       media-sound/mpg123
-       media-sound/sox
-       doc? ( app-doc/doxygen )
-       gtk? ( =x11-libs/gtk+-1.2* )
-       pri? ( >=net-libs/libpri-1.0.4-r1 )
-       alsa? ( media-libs/alsa-lib )
-       mysql? ( dev-db/mysql )
-       uclibc? ( sys-libs/uclibc )
-       zaptel? ( >=net-misc/zaptel-1.0.4-r1 )
-       resperl? ( dev-lang/perl
-                  >=net-misc/zaptel-1.0.4-r1 )
-       postgres? ( dev-db/postgresql )
-       vmdbmysql? ( dev-db/mysql )
-       vmdbpostgres? ( dev-db/postgresql )"
-
-
-pkg_setup() {
-       local n
-
-       #
-       # Warning about security changes...
-       #
-       ewarn "****************** Important changes warning! *********************"
-       ewarn
-       ewarn "- Asterisk runs as user asterisk, group asterisk by default"
-       ewarn
-       ewarn "- Permissions of /etc/asterisk have been changed to root:asterisk"
-       ewarn "  750 (directories) / 640 (files)"
-       ewarn
-       ewarn "- Permissions of /var/{log,lib,run,spool}/asterisk have been changed"
-       ewarn "  to asterisk:asterisk 750 (directories) / 640 (files)"
-       ewarn
-       ewarn "- Asterisk's unix socket and pidfile are now in /var/run/astrisk"
-       ewarn
-       ewarn "- More information at the end of this emerge"
-       ewarn
-       ewarn "     http://bugs.gentoo.org/show_bug.cgi?id=88732"
-       ewarn "     http://www.voip-info.org/wiki-Asterisk+non-root"
-       ewarn
-       echo
-       einfo "Press Ctrl+C to abort"
-       echo
-       ebeep
-
-       n=15
-       while [[ $n -gt 0 ]]; do
-               echo -en "  Waiting $n seconds...\r"
-               sleep 1
-               (( n-- ))
-       done
-
-       einfo "Running some pre-flight checks..."
-       if use resperl; then
-               # res_perl pre-flight check...
-               if ! $(perl -V | grep -q "usemultiplicity=define"); then
-                       eerror "Embedded perl add-on needs Perl with built-in threads support"
-                       eerror "(rebuild perl with ithreads use-flag enabled)"
-                       die "Perl w/o threads support..."
-               fi
-               einfo "Perl with ithreads support found"
-       fi
-
-
-       # mysql and postgres voicemail support are mutually exclusive..
-       if use vmdbmysql && use vmdbpostgres; then
-               eerror "MySQL and PostgreSQL Voicemail support are mutually exclusive... choose one!"
-               die "Conflicting use-flags"
-       fi
-}
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-
-       # set cflags & mmx optimization
-       sed -i  -e "s:^\(OPTIMIZE+=\).*:\1 ${CFLAGS}:" \
-               -e "s:^\(CFLAGS+=\$(shell if \$(CC)\):#\1:" \
-               Makefile
-
-       # gsm codec still uses -fomit-frame-pointer, and other codecs have their
-       # own flags. We only change the arch.
-       sed -i -e "s:^OPTIMIZE+=.*:OPTIMIZE+=${CFLAGS}:" codecs/gsm/Makefile
-
-       if use mmx; then
-               einfo "enabling mmx optimization"
-               sed -i -e "s:^#\(K6OPT.*\):\1:" Makefile
-               sed -i -e "s:^#\(K6OPT[\t ]\+= -DK6OPT\):\1:" codecs/gsm/Makefile
-       fi
-
-       if ! use debug; then
-               einfo "disabling debugging"
-               sed -i -e "s:^\(DEBUG=\):#\1:" Makefile
-       fi
-
-       # change image path in voicemail cgi
-       sed -i -e "s:^\(\$astpath = \).*:\1 \"/asterisk\";:" contrib/scripts/vmail.cgi
-
-       #
-       # embedded perl
-       #
-       if use resperl; then
-               einfo "Patching asterisk for embedded perl support..."
-               epatch ${S_ADDONS}/res_perl/astmake.diff
-
-               # create necessary .c file
-               /usr/bin/perl -MExtUtils::Embed -e xsinit || die "Could not create perlxsi.c"
-
-               cd ${S_ADDONS}
-
-               # fix perl path, source location and remove res_musiconhold
-               sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:" \
-                       res_perl/Makefile \
-                       ${S}/Makefile \
-                       res_perl/INC/*.pm
-               sed -i -e "s:^ASTSRC.*:ASTSRC = ${S}:" \
-                       -e "s:\$(ASTLIBDIR)/modules/res_musiconhold.so::" \
-                       res_perl/Makefile
-
-               cd ${S}
-       fi
-
-       #
-       # uclibc patch
-       #
-       if use elibc_uclibc; then
-               einfo "Patching asterisk for uclibc..."
-               epatch ${FILESDIR}/1.0.0/${P}-uclibc-dns.diff
-       fi
-
-       #
-       # other patches
-       #
-
-       # fix lpc10 Makefile, remove the
-       # CFLAGS+=-march=$(shell uname -m) part
-       epatch ${FILESDIR}/1.0.0/${P}-lpc10flags.diff
-
-       # asterisk-config
-       epatch ${FILESDIR}/1.0.0/${P}-astcfg-0.0.2.diff
-
-       # fix include path for speex >= 1.1.0
-       epatch ${FILESDIR}/1.0.0/${P}-speex.diff
-
-       # hppa build fix
-       epatch ${FILESDIR}/1.0.0/${P}-hppa.patch
-
-       #
-       # database voicemail support
-       #
-       if use postgres; then
-               sed -i  -e "s:^#\(APPS+=app_sql_postgres.so\):\1:" \
-                       -e "s:/usr/local/pgsql/include:/usr/include/postgresql/pgsql:" \
-                       -e "s:/usr/local/pgsql/lib:/usr/lib/postgresql:" \
-                       apps/Makefile
-       fi
-
-       if use vmdbpostgres; then
-               einfo "Enabling PostgreSQL voicemail support"
-               sed -i  -e "s:^\(USE_POSTGRES_VM_INTERFACE\).*:\1=1:" \
-                       -e "s:/usr/local/pgsql/include:/usr/include/postgresql/pgsql:" \
-                       -e "s:/usr/local/pgsql/lib:/usr/lib/postgresql:" \
-                       apps/Makefile
-
-               # patch app_voicemail.c
-               sed -i -e "s:^#include <postgresql/libpq-fe\.h>:#include \"libpq-fe\.h\":" \
-                       apps/app_voicemail.c
-
-       elif use vmdbmysql; then
-               einfo "Enabling MySQL voicemail support"
-               sed -i  -e "s:^\(USE_MYSQL_VM_INTERFACE\).*:\1=1:" \
-                       -e "s:^\(CFLAGS+=-DUSEMYSQLVM\):\1 -I${S_ADDONS}:" \
-                       apps/Makefile
-       fi
-
-       #
-       # asterisk add-ons
-       #
-       cd ${S_ADDONS}
-       sed -i -e "s:-I../asterisk:-I${S} -I${S}/include:" Makefile
-       sed -i  -e "s:^OPTIMIZE+=.*:OPTIMIZE+=${CFLAGS}:" \
-               -e "s:^\(CFLAGS=\)\(.*\):\1-I${S}/include -fPIC \2:" \
-               format_mp3/Makefile
-
-       # fix path for non-root
-       cd ${S}
-       sed -i -e "s:^\(ASTVARRUNDIR=\).*:\1\$(INSTALL_PREFIX)/var/run/asterisk:" \
-               Makefile
-
-       # fix contrib scripts for non-root
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.7-scripts.diff
-
-       # add initgroups support to asterisk, this is needed
-       # to support supplementary groups for the asterisk
-       # user (start-stop-daemons --chguid breaks realtime priority support)
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.7-initgroups.diff
-
-       # security fix (www.portcullis-security.com/advisory/advisory-05-013.txt)
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.7-manager-cli-segv.patch
-
-       # fix segfault on amd64 and possibly other 64bit systems (#105762)
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
-
-       # security fix, bug #11836
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
-}
-
-src_compile() {
-       # build asterisk first...
-       einfo "Building Asterisk..."
-       cd ${S}
-       emake -j1 || die "Make failed"
-
-       # documentation
-       use doc && \
-               emake -j1 DESTDIR=${D} progdocs
-
-       #
-       # add-ons
-       #
-       einfo "Building additional stuff..."
-       cd ${S_ADDONS}
-       emake -j1 || die "Make failed"
-
-       if use resperl; then
-               cd ${S_ADDONS}/res_perl
-               emake -j1 || die "Building embedded perl failed"
-       fi
-}
-
-src_install() {
-       make DESTDIR=${D} install || die "Make install failed"
-       make DESTDIR=${D} samples || die "Make install samples failed"
-
-       # install astconf.h, a lot of external modules need this
-       insinto /usr/include/asterisk
-       doins   astconf.h
-
-       # install addmailbox and astgenkey
-       dosbin contrib/scripts/addmailbox
-       dosbin contrib/scripts/astgenkey
-
-       newinitd  ${FILESDIR}/1.0.0/asterisk.rc6.sec asterisk
-       newconfd  ${FILESDIR}/1.0.0/asterisk.confd.sec asterisk
-
-       # don't delete these, even if they are empty
-       keepdir /var/spool/asterisk/voicemail/default/1234/INBOX
-       keepdir /var/spool/asterisk/tmp
-       keepdir /var/log/asterisk/cdr-csv
-       keepdir /var/run/asterisk
-
-       # install standard docs...
-       dodoc BUGS CREDITS LICENSE ChangeLog HARDWARE README README.fpm SECURITY
-
-       # install api docs
-       if use doc; then
-               insinto /usr/share/doc/${PF}/api/html
-               doins doc/api/html/*
-       fi
-
-       docinto scripts
-       dodoc contrib/scripts/*
-       docinto firmware/iax
-       dodoc contrib/firmware/iax/*
-
-       insinto /usr/share/doc/${PF}/cgi
-       doins contrib/scripts/vmail.cgi
-       doins images/*.gif
-
-       #
-       # add-ons
-       #
-
-       # install additional modules...
-       einfo "Installing additional modules..."
-       cd ${S_ADDONS}
-       make INSTALL_PREFIX=${D} install || die "Make install failed"
-
-       if use resperl; then
-               perlinfo
-
-               cd ${S_ADDONS}/res_perl
-               make INSTALL_PREFIX=${D} install || die "Installation of perl AST_API failed"
-
-               # move AstApiBase.so to a proper place
-               dodir ${VENDOR_LIB}/auto/AstAPIBase
-               mv ${D}/etc/asterisk/perl/AstAPIBase.so ${D}${VENDOR_LIB}/auto/AstAPIBase
-
-               # move *.pm files to other location
-               dodir ${VENDOR_LIB}/AstAPI
-               dodir ${VENDOR_LIB}/AstAPIBase
-               for x in AstAPI.pm AstConfig.pm LoadFile.pm PerlSwitch.pm WebServer.pm; do
-                       mv ${D}/etc/asterisk/perl/${x} ${D}${VENDOR_LIB}/AstAPI
-                       dosed "s/^use[\t ]\+${x/.pm/};/use AstAPI::${x/.pm/};/" /etc/asterisk/perl/asterisk_init.pm
-               done
-               mv ${D}/etc/asterisk/perl/AstAPIBase.pm ${D}${VENDOR_LIB}/AstAPIBase
-               dosed "s/^use[\t ]\+AstAPI;/use AstAPI::AstAPI;/" /etc/asterisk/perl/asterisk_init.pm
-               dosed "s/^use[\t ]\+AstAPIBase;/use AstAPIBase::AstAPIBase;/" ${VENDOR_LIB}/AstAPI/AstAPI.pm
-
-               # move apps + htdocs to a proper place
-               dodir /var/lib/asterisk/perl
-               mv ${D}/etc/asterisk/perl/{apps,htdocs} ${D}/var/lib/asterisk/perl
-
-               # fix locations
-               sed -i -e "s:/etc/asterisk/perl:/var/lib/asterisk/perl:" \
-                       ${D}${VENDOR_LIB}/AstAPI/LoadFile.pm ${D}${VENDOR_LIB}/AstAPI/WebServer.pm
-       fi
-}
-
-pkg_preinst() {
-       einfo "Adding asterisk user and group"
-       enewgroup asterisk
-       enewuser asterisk -1 -1 /var/lib/asterisk asterisk
-}
-
-pkg_postinst() {
-       #
-       # Change permissions and ownerships of asterisk
-       # directories and files
-       #
-       einfo "Fixing permissions and ownerships"
-       # fix permissions in /var/...
-       for x in spool run lib log; do
-               chown -R asterisk:asterisk ${ROOT}/var/${x}/asterisk
-               chmod -R u=rwX,g=rX,o=     ${ROOT}/var/${x}/asterisk
-       done
-
-       chown -R root:asterisk ${ROOT}/etc/asterisk
-       chmod -R u=rwX,g=rX,o= ${ROOT}/etc/asterisk
-
-       #
-       # Fix locations for old installations (pre-non-root versions)
-       #
-       if [[ -z "$(grep "/var/run/asterisk" ${ROOT}/etc/asterisk/asterisk.conf)" ]]
-       then
-               einfo "Fixing astrundir in ${ROOT}/etc/asterisk/asterisk.conf"
-               mv -f ${ROOT}/etc/asterisk/asterisk.conf \
-                       ${ROOT}/etc/asterisk/asterisk.conf.bak
-               sed -e "s:^\(astrundir[\t ]=>\).*:\1 /var/run/asterisk:" \
-                       ${ROOT}/etc/asterisk/asterisk.conf.bak >\
-                       ${ROOT}/etc/asterisk/asterisk.conf
-               einfo "Backup has been saved as ${ROOT}/etc/asterisk/asterisk.conf.bak"
-       fi
-
-       #
-       # Some messages
-       #
-       einfo "Asterisk has been installed"
-       einfo ""
-       einfo "to add new Mailboxes use: /usr/sbin/addmailbox"
-       einfo ""
-       einfo "If you want to know more about asterisk, visit these sites:"
-       einfo "http://www.automated.it/guidetoasterisk.htm"
-       einfo "http://asterisk.xvoip.com/"
-       einfo "http://www.voip-info.org/wiki-Asterisk"
-       einfo "http://ns1.jnetdns.de/jn/relaunch/asterisk/"
-       echo
-       ewarn "Additional sounds have been split-out into"
-       ewarn "net-misc/asterisk-sounds"
-
-       #
-       # Warning about security changes...
-       #
-       ewarn "*********************** Important changes **************************"
-       ewarn
-       ewarn "- Asterisk runs as user asterisk, group asterisk by default"
-       ewarn "  Use usermod -G to make the asterisk user a member of additional"
-       ewarn "  groups if necessary."
-       ewarn
-       ewarn "- Make sure the asterisk user is a member of the proper groups if you want it"
-       ewarn "  to have access to hardware devices, e.g. \"audio\" for Alsa and OSS sound or"
-       ewarn "  \"dialout\" for zaptel!"
-       ewarn
-       ewarn "- Permissions of /etc/asterisk have been changed to root:asterisk"
-       ewarn "  750 (rwxr-x--- directories) / 640 (rw-r----- files)"
-       ewarn
-       ewarn "- Permissions of /var/{log,lib,run,spool}/asterisk have been changed"
-       ewarn "  to asterisk:asterisk 750 / 640"
-       ewarn
-       ewarn "- Asterisk's unix socket and pidfile are now in /var/run/asterisk"
-       ewarn
-       ewarn "- Asterisk cannot set the IP ToS bits when run as user,"
-       ewarn "  use something like this to make iptables set them for you:"
-       ewarn "  \"iptables -A OUTPUT -t mangle -p udp -m udp --dport 5060 -j DSCP --set-dscp 0x28\""
-       ewarn "  \"iptables -A OUTPUT -t mangle -p udp -m udp --sport 10000:20000 -j DSCP --set-dscp 0x28\""
-       ewarn "  (taken from voip-info.org comments (see below), thanks andrewid)"
-       ewarn
-       ewarn "For more details:"
-       ewarn "     http://bugs.gentoo.org/show_bug.cgi?id=88732"
-       ewarn "     http://www.voip-info.org/wiki-Asterisk+non-root"
-}
diff --git a/net-misc/asterisk/asterisk-1.0.6-r2.ebuild b/net-misc/asterisk/asterisk-1.0.6-r2.ebuild
deleted file mode 100644 (file)
index 37077aa..0000000
+++ /dev/null
@@ -1,471 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.6-r2.ebuild,v 1.2 2005/11/28 13:15:53 mcummings Exp $
-
-inherit eutils perl-app
-
-ADDONS_VERSION="1.0.6"
-BRI_VERSION="0.2.0-RC7k"
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="ftp://ftp.digium.com/pub/telephony/${PN}/old-releases/${P}.tar.gz
-        ftp://ftp.digium.com/pub/telephony/${PN}/old-releases/${PN}-addons-${ADDONS_VERSION}.tar.gz
-        bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )"
-
-S_ADDONS=${WORKDIR}/${PN}-addons-${ADDONS_VERSION}
-
-IUSE="alsa doc gtk mmx mysql pri zaptel debug postgres vmdbmysql vmdbpostgres bri hardened speex resperl"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~amd64"
-
-DEPEND="dev-libs/newt
-       dev-libs/openssl
-       media-sound/mpg123
-       media-sound/sox
-       doc? ( app-doc/doxygen )
-       gtk? ( =x11-libs/gtk+-1.2* )
-       pri? ( >=net-libs/libpri-1.0.4-r1 )
-       bri? ( >=net-libs/libpri-1.0.6
-               >=net-misc/zaptel-1.0.6-r1 )
-       alsa? ( media-libs/alsa-lib )
-       mysql? ( dev-db/mysql )
-       speex? ( media-libs/speex )
-       zaptel? ( >=net-misc/zaptel-1.0.4-r1 )
-       postgres? ( dev-db/postgresql )
-       vmdbmysql? ( dev-db/mysql )
-       vmdbpostgres? ( dev-db/postgresql )
-       resperl? ( dev-lang/perl
-                  >=net-misc/zaptel-1.0.4-r1 )"
-
-pkg_setup() {
-       local n
-
-       #
-       # Warning about security changes...
-       #
-       ewarn "****************** Important changes warning! *********************"
-       ewarn
-       ewarn "- Asterisk runs as user asterisk, group asterisk by default"
-       ewarn
-       ewarn "- Permissions of /etc/asterisk have been changed to root:asterisk"
-       ewarn "  750 (directories) / 640 (files)"
-       ewarn
-       ewarn "- Permissions of /var/{log,lib,run,spool}/asterisk have been changed"
-       ewarn "  to asterisk:asterisk 750 (directories) / 640 (files)"
-       ewarn
-       ewarn "- Asterisk's unix socket and pidfile are now in /var/run/asterisk"
-       ewarn
-       ewarn "- More information at the end of this emerge"
-       ewarn
-       ewarn "     http://bugs.gentoo.org/show_bug.cgi?id=88732"
-       ewarn "     http://www.voip-info.org/wiki-Asterisk+non-root"
-       ewarn
-       if has_version "net-misc/asterisk"; then
-               echo
-               eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-               eerror "! PLEASE RUN THE FOLLOWING COMMAND AFTER UPDATING ASTERISK:               !"
-               eerror "! \"ebuild /usr/portage/net-misc/asterisk/asterisk-${PVR}.ebuild config\" !"
-               eerror "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-       fi
-       echo
-       einfo "Press Ctrl+C to abort"
-       echo
-       ebeep
-
-       n=20
-       while [[ $n -gt 0 ]]; do
-               echo -en "  Waiting $n seconds...\r"
-               sleep 1
-               (( n-- ))
-       done
-
-       einfo "Running some pre-flight checks..."
-       if use resperl; then
-               # res_perl pre-flight check...
-               if ! $(perl -V | grep -q "usemultiplicity=define"); then
-                       eerror "Embedded perl add-on needs Perl with built-in threads support"
-                       eerror "(rebuild perl with ithreads use-flag enabled)"
-                       die "Perl w/o threads support..."
-               fi
-               einfo "Perl with ithreads support found"
-       fi
-
-
-       # mysql and postgres voicemail support are mutually exclusive..
-       if use vmdbmysql && use vmdbpostgres; then
-               eerror "MySQL and PostgreSQL Voicemail support are mutually exclusive... choose one!"
-               die "Conflicting use-flags"
-       fi
-
-       # check if zaptel and libpri have been built with bri enabled
-       if use bri; then
-               if ! built_with_use net-misc/zaptel bri; then
-                       eerror "Re-emerge zaptel with bri use-flag enabled!"
-                       die "Zaptel without bri support detected"
-               fi
-
-               if ! built_with_use net-libs/libpri bri; then
-                       eerror "Re-emerge libpri with bri use-flag enabled!"
-                       die "Libpri without bri support detected"
-               fi
-       fi
-}
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-
-       # set cflags & mmx optimization
-       sed -i  -e "s:^\(OPTIMIZE+=\).*:\1 ${CFLAGS}:" \
-               -e "s:^\(CFLAGS+=\$(shell if \$(CC)\):#\1:" \
-               Makefile
-
-       # gsm codec still uses -fomit-frame-pointer, and other codecs have their
-       # own flags. We only change the arch.
-       sed -i  -e "s:^OPTIMIZE+=.*:OPTIMIZE=${CFLAGS}:" \
-               -e "s:^CFLAGS[\t ]\++=:CFLAGS =:" \
-               codecs/gsm/Makefile
-
-       # hppa patch for gsm codec
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-hppa.patch
-
-       if use mmx; then
-               if ! use hardened; then
-                       einfo "Enabling mmx optimization"
-                       sed -i  -e "s:^#\(K6OPT[\t ]\+= -DK6OPT\):\1:" \
-                               codecs/gsm/Makefile
-               else
-                       ewarn "Hardened use-flag is set, not enabling mmx optimization for codec_gsm!"
-
-               fi
-       fi
-       if ! use mmx || use hardened; then
-               # don't build + link asm mmx object file
-               # without this codec_gsm.so will include text relocations
-               sed -i  -e "/k6opt\.\(s\|o\)/ d" \
-                       codecs/gsm/Makefile
-       fi
-
-       if ! use debug; then
-               einfo "Disabling debugging"
-               sed -i -e "s:^\(DEBUG=\):#\1:" Makefile
-       fi
-
-       # change image path in voicemail cgi
-       sed -i -e "s:^\(\$astpath = \).*:\1 \"/asterisk\";:" contrib/scripts/vmail.cgi
-
-       #
-       # embedded perl
-       #
-       if use resperl; then
-               einfo "Patching asterisk for embedded perl support..."
-               epatch ${S_ADDONS}/res_perl/astmake.diff
-
-               # create necessary .c file
-               perl -MExtUtils::Embed -e xsinit || die "Could not create perlxsi.c"
-
-               cd ${S_ADDONS}
-               # asterisk-1.0.6 changed two channel functions
-               epatch ${FILESDIR}/1.0.0/${P}-resperl.diff
-
-               # fix perl path, source location and remove res_musiconhold
-               sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:" \
-                       res_perl/Makefile \
-                       ${S}/Makefile \
-                       res_perl/INC/*.pm
-               sed -i -e "s:^ASTSRC.*:ASTSRC = ${S}:" \
-                       -e "s:\$(ASTLIBDIR)/modules/res_musiconhold.so::" \
-                       res_perl/Makefile
-
-               cd ${S}
-       fi
-
-       #
-       # uclibc patch
-       #
-       if use elibc_uclibc; then
-               einfo "Patching asterisk for uclibc..."
-               epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-uclibc-dns.diff
-       fi
-
-       #
-       # other patches
-       #
-
-       # fix lpc10 Makefile, remove the
-       # CFLAGS+=-march=$(shell uname -m) part
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-lpc10flags.diff
-
-       # asterisk-config
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-astcfg-0.0.2.diff
-
-       # fix include path for speex >= 1.1.0
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-speex.diff
-
-       #
-       # database voicemail support
-       #
-       if use postgres; then
-               sed -i  -e "s:^#\(APPS+=app_sql_postgres.so\):\1:" \
-                       -e "s:/usr/local/pgsql/include:/usr/include/postgresql/pgsql:" \
-                       -e "s:/usr/local/pgsql/lib:/usr/lib/postgresql:" \
-                       apps/Makefile
-       fi
-
-       if use vmdbpostgres; then
-               einfo "Enabling PostgreSQL voicemail support"
-               sed -i  -e "s:^\(USE_POSTGRES_VM_INTERFACE\).*:\1=1:" \
-                       -e "s:/usr/local/pgsql/include:/usr/include/postgresql/pgsql:" \
-                       -e "s:/usr/local/pgsql/lib:/usr/lib/postgresql:" \
-                       apps/Makefile
-
-               # patch app_voicemail.c
-               sed -i -e "s:^#include <postgresql/libpq-fe\.h>:#include \"libpq-fe\.h\":" \
-                       apps/app_voicemail.c
-
-       elif use vmdbmysql; then
-               einfo "Enabling MySQL voicemail support"
-               sed -i  -e "s:^\(USE_MYSQL_VM_INTERFACE\).*:\1=1:" \
-                       -e "s:^\(CFLAGS+=-DUSEMYSQLVM\):\1 -I${S_ADDONS}:" \
-                       apps/Makefile
-       fi
-
-       #
-       # asterisk add-ons
-       #
-       cd ${S_ADDONS}
-       sed -i -e "s:-I../asterisk:-I${S} -I${S}/include:" Makefile
-       sed -i  -e "s:^OPTIMIZE+=.*:OPTIMIZE+=${CFLAGS}:" \
-               -e "s:^\(CFLAGS=\)\(.*\):\1-I${S}/include -fPIC \2:" \
-               format_mp3/Makefile
-
-
-       #
-       # BRI patches
-       #
-       if use bri; then
-               cd ${S}
-               einfo "Patching asterisk w/ BRI stuff"
-               epatch ${WORKDIR}/bristuff-${BRI_VERSION}/patches/asterisk.patch
-       fi
-
-       #
-       # Revived snmp plugin support
-       #
-#      if use snmp; then
-#              cd ${S}
-#              einfo "Patching snmp plugin helper functions"
-#              epatch ${FILESDIR}/1.0.0/ast-ax-snmp-1.0.6.diff
-#      fi
-
-       # fix path for non-root
-       cd ${S}
-       sed -i -e "s:^\(ASTVARRUNDIR=\).*:\1\$(INSTALL_PREFIX)/var/run/asterisk:" \
-               Makefile
-
-       # fix contrib scripts for non-root
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.7-scripts.diff
-
-       # add initgroups support to asterisk, this is needed
-       # to support supplementary groups for the asterisk
-       # user (start-stop-daemons --chguid breaks realtime priority support)
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.7-initgroups.diff
-
-       # security fix (www.portcullis-security.com/advisory/advisory-05-013.txt)
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.7-manager-cli-segv.patch
-
-       # fix segfault on amd64 and possibly other 64bit systems (#105762)
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
-
-       # security fix, bug #11836
-       epatch ${FILESDIR}/1.0.0/${PN}-1.0.9-vmail.cgi.patch
-}
-
-src_compile() {
-       # build asterisk first...
-       einfo "Building Asterisk..."
-       cd ${S}
-       emake -j1 || die "Make failed"
-
-       # documentation
-       use doc && \
-               emake -j1 DESTDIR=${D} progdocs
-
-       #
-       # add-ons
-       #
-       einfo "Building additional stuff..."
-       cd ${S_ADDONS}
-       emake -j1 || die "Make failed"
-
-       if use resperl; then
-               cd ${S_ADDONS}/res_perl
-               emake -j1 || die "Building embedded perl failed"
-       fi
-}
-
-src_install() {
-       make DESTDIR=${D} install || die "Make install failed"
-       make DESTDIR=${D} samples || die "Make install samples failed"
-
-       # install astconf.h, a lot of external modules need this
-       insinto /usr/include/asterisk
-       doins   astconf.h
-
-       # install addmailbox and astgenkey
-       dosbin contrib/scripts/addmailbox
-       dosbin contrib/scripts/astgenkey
-
-       newinitd ${FILESDIR}/1.0.0/asterisk.rc6.sec asterisk
-       newconfd ${FILESDIR}/1.0.0/asterisk.confd.sec asterisk
-
-       # don't delete these, even if they are empty
-       keepdir /var/spool/asterisk/voicemail/default/1234/INBOX
-       keepdir /var/spool/asterisk/tmp
-       keepdir /var/log/asterisk/cdr-csv
-       keepdir /var/run/asterisk
-
-       # install standard docs...
-       dodoc BUGS CREDITS LICENSE ChangeLog HARDWARE README README.fpm SECURITY
-
-       docinto scripts
-       dodoc contrib/scripts/*
-       docinto firmware/iax
-       dodoc contrib/firmware/iax/*
-
-       # install api docs
-       if use doc; then
-               insinto /usr/share/doc/${PF}/api/html
-               doins doc/api/html/*
-       fi
-
-       insinto /usr/share/doc/${PF}/cgi
-       doins contrib/scripts/vmail.cgi
-       doins images/*.gif
-
-       #
-       # add-ons
-       #
-
-       # install additional modules...
-       einfo "Installing additional modules..."
-       cd ${S_ADDONS}
-       make INSTALL_PREFIX=${D} install || die "Make install failed"
-
-       if use resperl; then
-               perlinfo
-
-               cd ${S_ADDONS}/res_perl
-               make INSTALL_PREFIX=${D} install || die "Installation of perl AST_API failed"
-
-               # move AstApiBase.so to a proper place
-               dodir ${VENDOR_LIB}/auto/AstAPIBase
-               mv ${D}/etc/asterisk/perl/AstAPIBase.so ${D}${VENDOR_LIB}/auto/AstAPIBase
-
-               # move *.pm files to other location
-               dodir ${VENDOR_LIB}/AstAPI
-               dodir ${VENDOR_LIB}/AstAPIBase
-               for x in AstAPI.pm AstConfig.pm LoadFile.pm PerlSwitch.pm WebServer.pm; do
-                       mv ${D}/etc/asterisk/perl/${x} ${D}${VENDOR_LIB}/AstAPI
-                       dosed "s/^use[\t ]\+${x/.pm/};/use AstAPI::${x/.pm/};/" /etc/asterisk/perl/asterisk_i$
-               done
-               mv ${D}/etc/asterisk/perl/AstAPIBase.pm ${D}${VENDOR_LIB}/AstAPIBase
-               dosed "s/^use[\t ]\+AstAPI;/use AstAPI::AstAPI;/" /etc/asterisk/perl/asterisk_init.pm
-               dosed "s/^use[\t ]\+AstAPIBase;/use AstAPIBase::AstAPIBase;/" ${VENDOR_LIB}/AstAPI/AstAPI.pm
-
-               # move apps + htdocs to a proper place
-               dodir /var/lib/asterisk/perl
-               mv ${D}/etc/asterisk/perl/{apps,htdocs} ${D}/var/lib/asterisk/perl
-
-               # fix locations
-               sed -i -e "s:/etc/asterisk/perl:/var/lib/asterisk/perl:" \
-                       ${D}${VENDOR_LIB}/AstAPI/LoadFile.pm ${D}${VENDOR_LIB}/AstAPI/WebServer.pm
-       fi
-}
-
-pkg_preinst() {
-       einfo "Adding asterisk user and group"
-       enewgroup asterisk
-       enewuser asterisk -1 -1 /var/lib/asterisk asterisk
-}
-
-pkg_postinst() {
-       #
-       # Change permissions and ownerships of asterisk
-       # directories and files
-       #
-       einfo "Fixing permissions and ownerships"
-       # fix permissions
-       for x in spool run lib log; do
-               chown -R asterisk:asterisk ${ROOT}/var/${x}/asterisk
-               chmod -R u=rwX,g=rX,o=     ${ROOT}/var/${x}/asterisk
-       done
-
-       chown -R root:asterisk ${ROOT}/etc/asterisk
-       chmod -R u=rwX,g=rX,o= ${ROOT}/etc/asterisk
-
-       #
-       # Fix locations for old installations (pre-non-root versions)
-       #
-       if [[ -z "$(grep "/var/run/asterisk" ${ROOT}/etc/asterisk/asterisk.conf)" ]]
-       then
-               einfo "Fixing astrundir in ${ROOT}/etc/asterisk/asterisk.conf"
-               mv -f ${ROOT}/etc/asterisk/asterisk.conf \
-                       ${ROOT}/etc/asterisk/asterisk.conf.bak
-               sed -e "s:^\(astrundir[\t ]=>\).*:\1 /var/run/asterisk:" \
-                       ${ROOT}/etc/asterisk/asterisk.conf.bak >\
-                       ${ROOT}/etc/asterisk/asterisk.conf
-               einfo "Backup has been saved as ${ROOT}/etc/asterisk/asterisk.conf.bak"
-       fi
-
-       #
-       # Some messages
-       #
-       einfo "Asterisk has been installed"
-       einfo ""
-       einfo "to add new Mailboxes use: /usr/sbin/addmailbox"
-       einfo ""
-       einfo "If you want to know more about asterisk, visit these sites:"
-       einfo "http://www.asteriskdocs.org/"
-       einfo "http://www.voip-info.org/wiki-Asterisk"
-       echo
-       einfo "http://asterisk.xvoip.com/"
-       einfo "http://junghanns.net/asterisk/"
-       einfo "http://www.automated.it/guidetoasterisk.htm"
-       echo
-       einfo "Gentoo VoIP IRC Channel:"
-       einfo "#gentoo-voip @ irc.freenode.net"
-
-       #
-       # Warning about security changes...
-       #
-       ewarn "*********************** Important changes **************************"
-       ewarn
-       ewarn "- Asterisk runs as user asterisk, group asterisk by default"
-       ewarn "  Use usermod -G to make the asterisk user a member of additional"
-       ewarn "  groups if necessary."
-       ewarn
-       ewarn "- Make sure the asterisk user is a member of the proper groups if you want it"
-       ewarn "  to have access to hardware devices, e.g. \"audio\" for Alsa and OSS sound or"
-       ewarn "  \"dialout\" for zaptel!"
-       ewarn
-       ewarn "- Permissions of /etc/asterisk have been changed to root:asterisk"
-       ewarn "  750 (rwxr-x--- directories) / 640 (rw-r----- files)"
-       ewarn
-       ewarn "- Permissions of /var/{log,lib,run,spool}/asterisk have been changed"
-       ewarn "  to asterisk:asterisk 750 / 640"
-       ewarn
-       ewarn "- Asterisk's unix socket and pidfile are now in /var/run/astrisk"
-       ewarn
-       ewarn "- Asterisk cannot set the IP ToS bits when run as user,"
-       ewarn "  use something like this to make iptables set them for you:"
-       ewarn "  \"iptables -A OUTPUT -t mangle -p udp -m udp --dport 5060 -j DSCP --set-dscp 0x28\""
-       ewarn "  \"iptables -A OUTPUT -t mangle -p udp -m udp --sport 10000:20000 -j DSCP --set-dscp 0x28\""
-       ewarn "  (taken from voip-info.org comments (see below), thanks andrewid)"
-       ewarn
-       ewarn "For more details:"
-       ewarn "     http://bugs.gentoo.org/show_bug.cgi?id=88732"
-       ewarn "     http://www.voip-info.org/wiki-Asterisk+non-root"
-}
diff --git a/net-misc/asterisk/files/1.0.0/asterisk-1.0.1-linux26.diff b/net-misc/asterisk/files/1.0.0/asterisk-1.0.1-linux26.diff
deleted file mode 100644 (file)
index c4314d8..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
---- asterisk-1.0.1/channels/chan_phone.c.orig  2004-10-24 20:24:06.646210032 +0200
-+++ asterisk-1.0.1/channels/chan_phone.c       2004-10-24 20:26:05.699111240 +0200
-@@ -33,6 +33,11 @@
- #include <sys/ioctl.h>
- #include <linux/telephony.h>
- /* Still use some IXJ specific stuff */
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+/* required to compile on 2.6 */
-+#include <linux/compiler.h>
-+#endif
- #include <linux/ixjuser.h>
- #include "DialTone.h"
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.5-r3 b/net-misc/asterisk/files/digest-asterisk-1.0.5-r3
deleted file mode 100644 (file)
index 2d91497..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 efabd43ac70ada3bdc97a57027c670a3 asterisk-1.0.5.tar.gz 9586778
-MD5 22e51b14b4712ad9179a085f9738ec08 asterisk-addons-1.0.4.tar.gz 73516
diff --git a/net-misc/asterisk/files/digest-asterisk-1.0.6-r2 b/net-misc/asterisk/files/digest-asterisk-1.0.6-r2
deleted file mode 100644 (file)
index 3632af5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c16efa9a64564763a0d9e3e1e9350c8d asterisk-1.0.6.tar.gz 9589123
-MD5 b51cc29a7e1f748c46395589c9d22291 asterisk-addons-1.0.6.tar.gz 73631
-MD5 b07d5f949b90677a2925ba2dd50593cb bristuff-0.2.0-RC7k.tar.gz 114265
index a9564dd0fe8300066d4067c8db22425e79c06b1c..161cac6a079e81a41d49877253e7d780f9b8a6cf 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/zaptel
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.70 2006/02/02 01:14:58 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.71 2006/02/28 02:20:53 stkn Exp $
+
+  28 Feb 2006; Stefan Knoblich <stkn@gentoo.org>
+  -files/zaptel-bristuff-0.2.0-RC7k.patch,
+  -files/zaptel-bristuff-0.2.0-RC8l.patch, -files/zaptel-1.0.3-gentoo.diff,
+  -zaptel-1.0.4-r1.ebuild, -zaptel-1.0.6-r1.ebuild,
+  -zaptel-1.0.9_p1-r1.ebuild:
+  Removed old 1.0.x versions.
 
 *zaptel-1.2.3 (02 Feb 2006)
 
index 48ca3ab6cd5f6a79c0ffeda9b7223f771269dcf9..a5e42f8446601d2c273e79cc1f2f90075874c506 100644 (file)
@@ -1,10 +1,7 @@
 MD5 a891adbf8ee71bf54379a8cd50171f74 ChangeLog 13205
 MD5 5d92c84f7e556e1552efc5531483a727 files/digest-zaptel-1.0.10 136
-MD5 051e2ff3f1222e2b551a70e9cd1b31f0 files/digest-zaptel-1.0.4-r1 64
-MD5 0c81001d4c9efeeffeb1332580fb4cdc files/digest-zaptel-1.0.6-r1 212
 MD5 9be11ef13f32ceaffef87920fe47a93e files/digest-zaptel-1.0.7-r1 212
 MD5 f46e4409c0bb701f8a6214e793de72a2 files/digest-zaptel-1.0.8 212
-MD5 3a4f554056143ac54f033cc3356821b5 files/digest-zaptel-1.0.9_p1-r1 214
 MD5 69d0c3831715ccac6422b13a99fc6557 files/digest-zaptel-1.0.9_p2 214
 MD5 f574df759efe80013bc3e7fa04d95232 files/digest-zaptel-1.2.0 136
 MD5 a43d347e67130e0ab4f15e17b34c8ba0 files/digest-zaptel-1.2.1 216
@@ -12,7 +9,6 @@ MD5 cd2c0020b56060f6ba55d0b9a2d04a00 files/digest-zaptel-1.2.3 217
 MD5 24ffa9ff867ef807083a53f61465fe02 files/zaptel-1.0.10-devfs26.diff 6026
 MD5 64804093a66dad967c34de55d3f0633a files/zaptel-1.0.10-gentoo.diff 5489
 MD5 699723eb0b0ad059702af4fc4de7bf95 files/zaptel-1.0.10-ukcid.patch 3787
-MD5 e5a799243335f31a494bb4f90edbb9e4 files/zaptel-1.0.3-gentoo.diff 3456
 MD5 d40a84eeea5866a3afbac2603e970e7b files/zaptel-1.0.4-experimental-devfs26.diff 5982
 MD5 090668aabb8e77cfd0d83835f52bd105 files/zaptel-1.0.4-gcc34.patch 821
 MD5 8471d7eb15aebff9c72f67861cb1ad88 files/zaptel-1.0.7-gentoo.diff 4459
@@ -25,10 +21,8 @@ MD5 e6c7407f2478a1836a087eec78ecd69d files/zaptel-1.2.0-gentoo.diff 4626
 MD5 699723eb0b0ad059702af4fc4de7bf95 files/zaptel-1.2.0-ukcid.patch 3787
 MD5 bc9d66166d440e69b69286ef26b4c52d files/zaptel-1.2.1-gentoo.diff 4756
 MD5 51c21f33dde21f00000ccf671ac0ebff files/zaptel-1.2.2-gentoo.diff 7740
-MD5 74863c2b19f217f2f23daa1cd617c4f9 files/zaptel-bristuff-0.2.0-RC7k.patch 6065
 MD5 cce31b4380f9c62e91293dff1523d5e0 files/zaptel-bristuff-0.2.0-RC8g.patch 5551
 MD5 d893c36bffff825ab0e6d48e1ad0acea files/zaptel-bristuff-0.2.0-RC8h.patch 6064
-MD5 f06df1defd75000b5fdfa7f81b4ef78b files/zaptel-bristuff-0.2.0-RC8l.patch 5551
 MD5 f5d81a19c52c5e88fefed12251674134 files/zaptel-bristuff-0.2.0-RC8n.patch 6064
 MD5 5ebdd425fca1594698e4f21e44c5e055 files/zaptel-bristuff-0.2.0-RC8q.patch 6080
 MD5 fae1145da422b8838c2a6ac3405dc4c4 files/zaptel.confd 371
@@ -37,11 +31,8 @@ MD5 a1ef57fe463da11030f2e18d87535466 files/zaptel.rc6 972
 MD5 3bff3fd5d8dc52513ceeac546e1e11bf files/zaptel.udevd 358
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
 MD5 a937510da057c2f6c0ab67872b1086fe zaptel-1.0.10.ebuild 6955
-MD5 1ab383ffeab849e778401125f478fc6d zaptel-1.0.4-r1.ebuild 4417
-MD5 ac774e9b1e15c4e3060c325560be97d3 zaptel-1.0.6-r1.ebuild 6217
 MD5 276ca202b6c1471af85d43ce0eb6b94f zaptel-1.0.7-r1.ebuild 6517
 MD5 6263a968f86b50a23db0b3bcaf19b0ae zaptel-1.0.8.ebuild 6370
-MD5 a9b97edfc9559f48e71f9f232590143f zaptel-1.0.9_p1-r1.ebuild 6641
 MD5 f0c8a8a514efa543a36618d72d4ade3d zaptel-1.0.9_p2.ebuild 6641
 MD5 a170d2a6dba63bc4de86eb9766c8d8f3 zaptel-1.2.0.ebuild 9102
 MD5 5f7d588d0581d344b87cc078bf54af1f zaptel-1.2.1.ebuild 9125
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.4-r1 b/net-misc/zaptel/files/digest-zaptel-1.0.4-r1
deleted file mode 100644 (file)
index 7aab20d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef189a00c823b3739cc706fe290433a2 zaptel-1.0.4.tar.gz 316205
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.6-r1 b/net-misc/zaptel/files/digest-zaptel-1.0.6-r1
deleted file mode 100644 (file)
index cfa408f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4f6b2627b45537774ac1aba3c17624c6 zaptel-1.0.6.tar.gz 316568
-MD5 b07d5f949b90677a2925ba2dd50593cb bristuff-0.2.0-RC7k.tar.gz 114265
-MD5 510ab7103516fd574fd5f38db2a08c81 zaphfc_0.2.0-RC7j_florz-4.diff.gz 10204
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.9_p1-r1 b/net-misc/zaptel/files/digest-zaptel-1.0.9_p1-r1
deleted file mode 100644 (file)
index 5d8fadf..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f29205a100d2f7bede64aaf039577677 zaptel-1.0.9.1.tar.gz 326603
-MD5 a6b5c61c16b35f02c616c8abadb9999d bristuff-0.2.0-RC8n.tar.gz 143979
-MD5 717f869f45ec20ceda216285cd90455a zaphfc_0.2.0-RC8j_florz-8.diff.gz 10559
diff --git a/net-misc/zaptel/files/zaptel-1.0.3-gentoo.diff b/net-misc/zaptel/files/zaptel-1.0.3-gentoo.diff
deleted file mode 100644 (file)
index ef12475..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
---- zaptel-1.0.3/Makefile.orig 2004-12-19 00:45:36.697309064 +0100
-+++ zaptel-1.0.3/Makefile      2004-12-19 00:48:07.578371656 +0100
-@@ -19,7 +19,7 @@
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS+=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
- LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
--KFLAGS+=-I/usr/src/linux-2.4/include -O6
-+KFLAGS+=-I/usr/src/linux/include -O6
- KFLAGS+=-DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I/usr/src/linux/drivers/net \
-       -Wall -I. -Wstrict-prototypes -fomit-frame-pointer -I/usr/src/linux/drivers/net/wan -I /usr/src/linux/include -I/usr/src/linux/include/net
- KFLAGS+=$(shell [ -f $(KINCLUDES)/linux/modversions.h ] && echo "-DMODVERSIONS -include $(KINCLUDES)/linux/modversions.h")
-@@ -39,7 +39,8 @@
- CFLAGS+=-DZAPTEL_CONFIG=\"$(CONFIG_FILE)\"
- BUILDVER=$(shell if uname -r | grep -q ^2.6; then echo "linux26"; else echo "linux24"; fi)
--MODCONF=$(shell if [ -d $(ROOT_PREFIX)/etc/modprobe.d ]; then echo "$(ROOT_PREFIX)/etc/modprobe.d/zaptel"; elif [ -d $(ROOT_PREFIX)/etc/modutils ]; then echo "$(ROOT_PREFIX)/etc/modutils/zaptel"; elif [ -f $(ROOT_PREFIX)/etc/modprobe.conf ]; then echo "$(ROOT_PREFIX)/etc/modprobe.conf"; elif [ -f $(ROOT_PREFIX)/etc/modules.conf ]; then echo "$(ROOT_PREFIX)/etc/modules.conf"; else echo $(ROOT_PREFIX)/etc/conf.modules ; fi)
-+# Gentoo uses /etc/modules.d/zaptel
-+MODCONF=$(INSTALL_PREFIX)/etc/modules.d/zaptel
- ifeq (${BUILDVER},linux24)
- #We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4
-@@ -286,7 +287,7 @@
-       install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
-       install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
-       ( cd $(INSTALL_PREFIX)/usr/lib ; rm -f libtonezone.so ; ln -sf $(LIBTONEZONE) libtonezone.so )
--      [ `id -u` = 0 ] && /sbin/ldconfig || :
-+      if [ ! -d `dirname $(MODCONF)` ]; then install -d -m 755 `dirname $(MODCONF)` ; fi
-       if [ -f $(MODCONF) ]; then mv -f $(MODCONF) $(MODCONF).bak ; fi
-       cat $(MODCONF).bak | grep -v "alias char-major-250" | \
-       grep -v "post-install torisa /sbin/ztcfg" | \
-@@ -298,23 +299,7 @@
-       if ! grep "alias char-major-196" $(MODCONF); then \
-               echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
-       fi
--              
--      for x in $(MODULES); do \
--              if ! grep "post-install $$x" $(MODCONF); then \
--                      if ! grep "install $$x " $(MODCONF); then \
--                              if [ "$$x" != "zaptel" ] ; then \
--                                      if [ -f zaptel.ko ]; then echo "install $$x /sbin/modprobe --ignore-install $$x && /sbin/ztcfg" >> $(MODCONF); \
--                                      else echo "post-install $$x /sbin/ztcfg" >> $(MODCONF); \
--                                      fi; \
--                              fi; \
--                      fi; \
--              fi; \
--      done
--      if [ -d /etc/modutils ]; then \
--              /sbin/update-modules ; \
--      fi
--      [ `id -u` = 0 ] && /sbin/depmod -a || :
-       [ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
- config:
---- zaptel-1.0.3/Makefile.orig 2004-12-19 00:58:31.599506024 +0100
-+++ zaptel-1.0.3/Makefile      2004-12-19 01:00:45.109209464 +0100
-@@ -15,7 +15,7 @@
- HOSTCC=gcc
- KINCLUDES=$(shell if [ -d /usr/src/linux-2.4/include ]; then echo /usr/src/linux-2.4/include ; else echo /usr/src/linux/include ; fi)
--CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-+CFLAGS+=-I. -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- CFLAGS+=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
- LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
diff --git a/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC7k.patch b/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC7k.patch
deleted file mode 100644 (file)
index b622ba8..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-diff -ur zaptel-1.0.6.orig/Makefile zaptel-1.0.6/Makefile
---- zaptel-1.0.6.orig/Makefile 2005-02-07 05:20:33.000000000 +0100
-+++ zaptel-1.0.6/Makefile      2005-02-28 10:58:47.381479600 +0100
-@@ -334,7 +334,7 @@
-       
- clean:
-       rm -f torisatool makefw tor2fw.h
--      rm -f zttool
-+      rm -f zttool ztspeed zttest ztmonitor
-       rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
-       rm -f $(TZOBJS) $(LIBTONEZONE) *.lo
-       rm -f *.ko *.mod.c .*o.cmd
-@@ -342,3 +342,4 @@
-       rm -f libtonezone*
-       rm -f tor2ee
-       rm -f core
-+      rm -rf .tmp_versions
-diff -ur zaptel-1.0.6.orig/zaptel.c zaptel-1.0.6/zaptel.c
---- zaptel-1.0.6.orig/zaptel.c 2005-01-17 02:58:09.000000000 +0100
-+++ zaptel-1.0.6/zaptel.c      2005-02-28 10:58:47.389478384 +0100
-@@ -4775,11 +4775,40 @@
-                                       *(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
-                               }
-                               bytes -= left;
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+                      } else if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+                          /*
-+                           * Let's get this right, we want to transmit complete frames only.
-+                           * The card driver will do the dirty HDLC work for us.
-+                           * txb (transmit buffer) is supposed to be big enough to store one frame
-+                           * we will make this as big as the D fifo (1KB or 2KB)
-+                           */
-+
-+                          /* there are 'left' bytes in the user buffer left to transmit */
-+                          left = ms->writen[ms->outwritebuf] - ms->writeidx[ms->outwritebuf] - 2;
-+                          if (left > ms->maxbytes2transmit) {
-+                              memcpy(txb, buf + ms->writeidx[ms->outwritebuf], ms->maxbytes2transmit);
-+                              ms->writeidx[ms->outwritebuf] += ms->maxbytes2transmit;
-+                              txb += ms->maxbytes2transmit;
-+                              ms->bytes2transmit = ms->maxbytes2transmit;
-+                              ms->eoftx = 0;
-+                          } else {
-+                              memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
-+                              ms->writeidx[ms->outwritebuf] += left + 2;
-+                              txb += left;
-+                              ms->bytes2transmit = left;
-+                              ms->eoftx = 1;
-+                          }
-+                          bytes = 0;
-+#endif
-                       } else {
-                               memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
-                               ms->writeidx[ms->outwritebuf]+=left;
-                               txb += left;
-                               bytes -= left;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+                              ms->bytes2transmit=ZT_CHUNKSIZE;
-+#endif
-                       }
-                       /* Check buffer status */
-                       if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
-@@ -4824,6 +4853,17 @@
-                               /* Transmit a flag if this is an HDLC channel */
-                               if (ms->flags & ZT_FLAG_HDLC)
-                                       fasthdlc_tx_frame_nocheck(&ms->txhdlc);
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+                              if(ms->flags & ZT_FLAG_BRIDCHAN) { 
-+                      //          if (ms->bytes2transmit > 0) {
-+                                      // txb += 2;
-+                                      // ms->bytes2transmit -= 2;
-+                          bytes=0;
-+                                      ms->eoftx = 1;
-+//                                    printk(KERN_CRIT "zaptel EOF(%d) bytes2transmit %d\n",ms->eoftx,ms->bytes2transmit);
-+                      //          }
-+                              }
-+#endif
- #ifdef CONFIG_ZAPATA_NET
-                               if (ms->flags & ZT_FLAG_NETDEV)
-                                       netif_wake_queue(ztchan_to_dev(ms));
-@@ -4834,7 +4874,7 @@
-                                       tasklet_schedule(&ms->ppp_calls);
-                               }
- #endif
--                      }
-+                      } 
-               } else if (ms->curtone && !(ms->flags & ZT_FLAG_PSEUDO)) {
-                       left = ms->curtone->tonesamples - ms->tonep;
-                       if (left > bytes)
-@@ -4872,8 +4912,17 @@
-               } else if (ms->flags & ZT_FLAG_CLEAR) {
-                       /* Clear channels should idle with 0xff for the sake
-                       of silly PRI's that care about idle B channels */
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+      //              ms->bytes2transmit=0;
-+#endif
-                       memset(txb, 0xff, bytes);
-                       bytes = 0;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+              } else if(ms->flags & ZT_FLAG_BRIDCHAN) { 
-+                  // ms->bytes2transmit = ZT_CHUNKSIZE - bytes;
-+                  bytes = 0;
-+                  if (ms->bytes2transmit > 0) printk(KERN_CRIT "bytes2transmit %d\n",ms->bytes2transmit); 
-+#endif
-               } else {
-                       memset(txb, ZT_LIN2X(0, ms), bytes);    /* Lastly we use silence on telephony channels */
-                       bytes = 0;
-@@ -5533,6 +5582,13 @@
-       int left, x;
-       int bytes = ZT_CHUNKSIZE;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+      if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+          bytes = ms->bytes2receive;
-+          if (bytes < 1) return;
-+//        printk(KERN_CRIT "bytes2receive %d\n",ms->bytes2receive);
-+      }
-+#endif
-       while(bytes) {
- #if defined(CONFIG_ZAPATA_NET)  || defined(CONFIG_ZAPATA_PPP)
-@@ -5591,6 +5647,19 @@
-                                               }
-                                       }
-                               }
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+                      } else if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+                          memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-+                          rxb += left;
-+                          ms->readidx[ms->inreadbuf] += left;
-+                          bytes -= left;
-+                          if (ms->eofrx == 1) {
-+                              eof=1;
-+                          }
-+//                        printk(KERN_CRIT "receiving %d bytes\n",ms->bytes2receive);
-+                          ms->bytes2receive = 0;
-+                          ms->eofrx = 0;
-+#endif
-                       } else {
-                               /* Not HDLC */
-                               memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-diff -ur zaptel-1.0.6.orig/zaptel.h zaptel-1.0.6/zaptel.h
---- zaptel-1.0.6.orig/zaptel.h 2004-09-27 21:50:03.000000000 +0200
-+++ zaptel-1.0.6/zaptel.h      2005-02-28 10:58:47.392477928 +0100
-@@ -932,6 +932,13 @@
-       int do_ppp_error;
-       struct sk_buff_head ppp_rq;
- #endif
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+      int bytes2receive;
-+      int maxbytes2transmit; /* size of the tx buffer in the card driver */
-+      int bytes2transmit;
-+      int eofrx;
-+      int eoftx;
-+#endif
-       spinlock_t lock;
-       char name[40];          /* Name */
-       /* Specified by zaptel */
-@@ -1006,7 +1013,7 @@
-       int             txbufpolicy;                    /* Buffer policy */
-       int             rxbufpolicy;                    /* Buffer policy */
-       int             txdisable;                              /* Disable transmitter */
--      int     rxdisable;                              /* Disable receiver */
-+      int             rxdisable;                              /* Disable receiver */
-       
-       
-       /* Tone zone stuff */
-@@ -1169,6 +1176,10 @@
- #define ZT_FLAG_T1PPP                 (1 << 15)
- #define ZT_FLAG_SIGFREEZE             (1 << 16)       /* Freeze signalling */
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+#define ZT_FLAG_BRIDCHAN              (1 << 17)
-+#endif
-+
- struct zt_span {
-       spinlock_t lock;
-       void *pvt;                      /* Private stuff */
-diff -ur zaptel-1.0.6.orig/zconfig.h zaptel-1.0.6/zconfig.h
---- zaptel-1.0.6.orig/zconfig.h        2005-01-02 01:19:57.000000000 +0100
-+++ zaptel-1.0.6/zconfig.h     2005-02-28 10:58:47.393477776 +0100
-@@ -127,4 +127,10 @@
-  */
- /* #define TDM_REVH_MATCHALL */
-+/*
-+ * Uncomment the following for BRI D channels
-+ *
-+ */
-+#define CONFIG_ZAPATA_BRI_DCHANS
-+
- #endif
diff --git a/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8l.patch b/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8l.patch
deleted file mode 100644 (file)
index 3b20372..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-diff -ur zaptel-1.0.9.orig/zaptel.c zaptel-1.0.9/zaptel.c
---- zaptel-1.0.9.orig/zaptel.c 2005-06-15 23:31:22.000000000 +0200
-+++ zaptel-1.0.9/zaptel.c      2005-07-03 13:36:31.000000000 +0200
-@@ -4851,11 +4851,40 @@
-                                       *(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
-                               }
-                               bytes -= left;
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+                      } else if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+                          /*
-+                           * Let's get this right, we want to transmit complete frames only.
-+                           * The card driver will do the dirty HDLC work for us.
-+                           * txb (transmit buffer) is supposed to be big enough to store one frame
-+                           * we will make this as big as the D fifo (1KB or 2KB)
-+                           */
-+
-+                          /* there are 'left' bytes in the user buffer left to transmit */
-+                          left = ms->writen[ms->outwritebuf] - ms->writeidx[ms->outwritebuf] - 2;
-+                          if (left > ms->maxbytes2transmit) {
-+                              memcpy(txb, buf + ms->writeidx[ms->outwritebuf], ms->maxbytes2transmit);
-+                              ms->writeidx[ms->outwritebuf] += ms->maxbytes2transmit;
-+                              txb += ms->maxbytes2transmit;
-+                              ms->bytes2transmit = ms->maxbytes2transmit;
-+                              ms->eoftx = 0;
-+                          } else {
-+                              memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
-+                              ms->writeidx[ms->outwritebuf] += left + 2;
-+                              txb += left;
-+                              ms->bytes2transmit = left;
-+                              ms->eoftx = 1;
-+                          }
-+                          bytes = 0;
-+#endif
-                       } else {
-                               memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
-                               ms->writeidx[ms->outwritebuf]+=left;
-                               txb += left;
-                               bytes -= left;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+                              ms->bytes2transmit=ZT_CHUNKSIZE;
-+#endif
-                       }
-                       /* Check buffer status */
-                       if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
-@@ -4900,6 +4929,17 @@
-                               /* Transmit a flag if this is an HDLC channel */
-                               if (ms->flags & ZT_FLAG_HDLC)
-                                       fasthdlc_tx_frame_nocheck(&ms->txhdlc);
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+                              if(ms->flags & ZT_FLAG_BRIDCHAN) { 
-+                      //          if (ms->bytes2transmit > 0) {
-+                                      // txb += 2;
-+                                      // ms->bytes2transmit -= 2;
-+                          bytes=0;
-+                                      ms->eoftx = 1;
-+//                                    printk(KERN_CRIT "zaptel EOF(%d) bytes2transmit %d\n",ms->eoftx,ms->bytes2transmit);
-+                      //          }
-+                              }
-+#endif
- #ifdef CONFIG_ZAPATA_NET
-                               if (ms->flags & ZT_FLAG_NETDEV)
-                                       netif_wake_queue(ztchan_to_dev(ms));
-@@ -4910,7 +4950,7 @@
-                                       tasklet_schedule(&ms->ppp_calls);
-                               }
- #endif
--                      }
-+                      } 
-               } else if (ms->curtone && !(ms->flags & ZT_FLAG_PSEUDO)) {
-                       left = ms->curtone->tonesamples - ms->tonep;
-                       if (left > bytes)
-@@ -4948,8 +4988,17 @@
-               } else if (ms->flags & ZT_FLAG_CLEAR) {
-                       /* Clear channels should idle with 0xff for the sake
-                       of silly PRI's that care about idle B channels */
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+      //              ms->bytes2transmit=0;
-+#endif
-                       memset(txb, 0xff, bytes);
-                       bytes = 0;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+              } else if(ms->flags & ZT_FLAG_BRIDCHAN) { 
-+                  // ms->bytes2transmit = ZT_CHUNKSIZE - bytes;
-+                  bytes = 0;
-+                  if (ms->bytes2transmit > 0) printk(KERN_CRIT "bytes2transmit %d\n",ms->bytes2transmit); 
-+#endif
-               } else {
-                       memset(txb, ZT_LIN2X(0, ms), bytes);    /* Lastly we use silence on telephony channels */
-                       bytes = 0;
-@@ -5648,6 +5697,13 @@
-       int left, x;
-       int bytes = ZT_CHUNKSIZE;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+      if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+          bytes = ms->bytes2receive;
-+          if (bytes < 1) return;
-+//        printk(KERN_CRIT "bytes2receive %d\n",ms->bytes2receive);
-+      }
-+#endif
-       while(bytes) {
- #if defined(CONFIG_ZAPATA_NET)  || defined(CONFIG_ZAPATA_PPP)
-@@ -5706,6 +5762,19 @@
-                                               }
-                                       }
-                               }
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+                      } else if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+                          memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-+                          rxb += left;
-+                          ms->readidx[ms->inreadbuf] += left;
-+                          bytes -= left;
-+                          if (ms->eofrx == 1) {
-+                              eof=1;
-+                          }
-+//                        printk(KERN_CRIT "receiving %d bytes\n",ms->bytes2receive);
-+                          ms->bytes2receive = 0;
-+                          ms->eofrx = 0;
-+#endif
-                       } else {
-                               /* Not HDLC */
-                               memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-diff -ur zaptel-1.0.9.orig/zaptel.h zaptel-1.0.9/zaptel.h
---- zaptel-1.0.9.orig/zaptel.h 2005-06-15 23:31:22.000000000 +0200
-+++ zaptel-1.0.9/zaptel.h      2005-07-03 13:36:31.000000000 +0200
-@@ -956,6 +956,13 @@
-       int do_ppp_error;
-       struct sk_buff_head ppp_rq;
- #endif
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+      int bytes2receive;
-+      int maxbytes2transmit; /* size of the tx buffer in the card driver */
-+      int bytes2transmit;
-+      int eofrx;
-+      int eoftx;
-+#endif
-       spinlock_t lock;
-       char name[40];          /* Name */
-       /* Specified by zaptel */
-@@ -1030,7 +1037,7 @@
-       int             txbufpolicy;                    /* Buffer policy */
-       int             rxbufpolicy;                    /* Buffer policy */
-       int             txdisable;                              /* Disable transmitter */
--      int     rxdisable;                              /* Disable receiver */
-+      int             rxdisable;                              /* Disable receiver */
-       
-       
-       /* Tone zone stuff */
-@@ -1193,6 +1200,10 @@
- #define ZT_FLAG_T1PPP                 (1 << 15)
- #define ZT_FLAG_SIGFREEZE             (1 << 16)       /* Freeze signalling */
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS) 
-+#define ZT_FLAG_BRIDCHAN              (1 << 17)
-+#endif
-+
- struct zt_span {
-       spinlock_t lock;
-       void *pvt;                      /* Private stuff */
-diff -ur zaptel-1.0.9.orig/zconfig.h zaptel-1.0.9/zconfig.h
---- zaptel-1.0.9.orig/zconfig.h        2005-01-02 01:19:57.000000000 +0100
-+++ zaptel-1.0.9/zconfig.h     2005-07-03 13:36:31.000000000 +0200
-@@ -127,4 +127,10 @@
-  */
- /* #define TDM_REVH_MATCHALL */
-+/*
-+ * Uncomment the following for BRI D channels
-+ *
-+ */
-+#define CONFIG_ZAPATA_BRI_DCHANS
-+
- #endif
diff --git a/net-misc/zaptel/zaptel-1.0.4-r1.ebuild b/net-misc/zaptel/zaptel-1.0.4-r1.ebuild
deleted file mode 100644 (file)
index 6e79bc5..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.4-r1.ebuild,v 1.4 2005/09/15 02:38:26 stkn Exp $
-
-IUSE="devfs26"
-
-inherit toolchain-funcs eutils linux-info
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-DEPEND="virtual/libc
-       virtual/linux-sources
-       >=dev-libs/newt-0.50.0"
-
-pkg_setup() {
-       local pause_sec=0
-       linux-info_pkg_setup
-
-       if ! linux_chkconfig_present PPP ; then
-               einfo ""
-               einfo "PPP support isn't enabled or available as a module."
-               einfo ""
-
-               einfo "If you aren't using PPP (eg. you're using voice ISDN"
-               einfo "or non-PPP data), then this is okay."
-
-               einfo "Otherwise, if you want to use PPP over your hardware"
-               einfo "please quit now and reconfigure your kernel to include"
-               einfo "CONFIG_PPP, CONFIG_PPP_ASYNC, CONFIG_PPP_DEFLATE"
-               einfo "and CONFIG_PPPOE."
-               einfo ""
-               pause_sec=10
-       fi
-
-       # show an nice warning message about zaptel not supporting devfs on 2.6
-       if kernel_is 2 6 && linux_chkconfig_present DEVFS_FS ; then
-               echo
-               einfo "You're using a 2.6 kernel with DEVFS."
-               einfo "The Zaptel drivers won't work unless you either:"
-               einfo "   * switch to udev"
-               einfo "   * write a script that re-creates the necessary device nodes for you"
-               einfo "   * enable the devfs26 useflag (see below)"
-               einfo ""
-               einfo "There's an experimental patch which adds devfs support when using linux-2.6, but:"
-               einfo "  1. It's an ugly hack atm and needs a cleanup..."
-               einfo "  2. I was only abled to test loding / unloading with the ztd-eth driver..."
-               einfo "  3. I _really_ don't know if it works with real hardware..."
-               einfo "  4. It disables udev support to avoid conflicts"
-               eerror "  5. And more important: This is not officially supported by Digium / the Asterisk project!"
-               einfo ""
-               einfo "If you're still interested, abort now (ctrl+c) and enable the devfs26 USE-flag"
-               einfo "Feedback and bug-reports should go to: stkn@gentoo.org"
-               einfo "You have been warned!"
-               echo
-               pause_sec=$(($pause_sec + 20))
-       fi
-
-       # wait once, not multiple times
-       if [[ $pause_sec -gt 0 ]]; then
-               einfo "Sleeping $pause_sec seconds"
-               epause $pause_sec
-       fi
-}
-
-src_unpack() {
-       unpack ${A}
-
-       cd ${S}
-       # >= 1.0.3 requires new patch (-modulesd patch renamed to -gentoo)
-       epatch ${FILESDIR}/${PN}-1.0.3-gentoo.diff
-
-       # remove all from install target
-       sed -i -e "s#^\(install:\)[ \t]\+all[ \t]\+\(.*\)#\1 \2#" Makefile
-
-       # enable ztdummy...
-       sed -i -e "s:#\( ztdummy.*\):\1:" Makefile
-
-       # devfs support
-       if use devfs26; then
-               einfo "Enabling experimental devfs support for linux-2.6..."
-               epatch ${FILESDIR}/${PN}-1.0.4-experimental-devfs26.diff
-
-               # disable udev
-               sed -i -e "s:#define[\t ]\+\(CONFIG_ZAP_UDEV\):#undef \1:" \
-                       zconfig.h
-       fi
-
-       # apply patch for gcc-3.4.x if that's the compiler in use...
-       # fixes (#76707)
-       if use x86 && [[ `gcc-fullversion` = "3.4.3" ]]; then
-               epatch ${FILESDIR}/${P}-gcc34.patch
-       fi
-}
-
-src_compile() {
-       make ARCH=$(tc-arch-kernel) || die
-}
-
-src_install() {
-       make INSTALL_PREFIX=${D} install || die
-
-       dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-       dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-       # additional tools
-       dobin ztmonitor ztspeed zttest
-
-       # install init script
-       newinitd ${FILESDIR}/zaptel.rc6 zaptel
-       newconfd ${FILESDIR}/zaptel.confd zaptel
-
-       # install devfsd rule file
-       insinto /etc/devfs.d
-       newins ${FILESDIR}/zaptel.devfsd zaptel
-
-       # install udev rule file
-       insinto /etc/udev/rules.d
-       newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-       # fix permissions if there's no udev / devfs around
-       if [[ -d ${D}/dev/zap ]]; then
-               chown -R root:dialout   ${D}/dev/zap
-               chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-       fi
-}
-
-pkg_postinst() {
-       if use devfs26; then
-               ewarn "*** Warning! ***"
-               ewarn "Devfs support for linux-2.6 is experimental and not"
-               ewarn "supported by digium or the asterisk project!"
-               echo
-               ewarn "Send bug-reports to: stkn@gentoo.org"
-       fi
-
-       echo
-       einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-
-       # fix permissions if there's no udev / devfs around
-       if [[ -d ${ROOT}/dev/zap ]]; then
-               chown -R root:dialout   ${ROOT}/dev/zap
-               chmod -R u=rwX,g=rwX,o= ${ROOT}/dev/zap
-       fi
-}
diff --git a/net-misc/zaptel/zaptel-1.0.6-r1.ebuild b/net-misc/zaptel/zaptel-1.0.6-r1.ebuild
deleted file mode 100644 (file)
index 886da38..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.6-r1.ebuild,v 1.5 2005/09/15 02:38:26 stkn Exp $
-
-IUSE="devfs26 bri florz"
-
-inherit toolchain-funcs eutils linux-mod
-
-BRI_VERSION="0.2.0-RC7k"
-FLORZ_VERSION="0.2.0-RC7j_florz-4"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz
-        bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-        florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-DEPEND="virtual/libc
-       virtual/linux-sources
-       >=dev-libs/newt-0.50.0"
-
-pkg_setup() {
-       linux-mod_pkg_setup
-
-       # show an nice warning message about zaptel not supporting devfs on 2.6
-       if kernel_is 2 6 && linux_chkconfig_present DEVFS_FS ; then
-               echo
-               einfo "You're using a 2.6 kernel with DEVFS."
-               einfo "The Zaptel drivers won't work unless you either:"
-               einfo "   * switch to udev"
-               einfo "   * write a script that re-creates the necessary device nodes for you"
-               einfo "   * enable the devfs26 useflag (see below)"
-               einfo ""
-               einfo "There's an experimental patch which adds devfs support when using linux-2.6, but:"
-               einfo "  1. It's an ugly hack atm and needs a cleanup..."
-               einfo "  2. I was only abled to test loding / unloading with the ztd-eth driver..."
-               einfo "  3. I _really_ don't know if it works with real hardware..."
-               einfo "  4. It disables udev support to avoid conflicts"
-               eerror "  5. And more important: This is not officially supported by Digium / the Asterisk project!"
-               einfo ""
-               einfo "If you're still interested, abort now (ctrl+c) and enable the devfs26 USE-flag"
-               einfo "Feedback and bug-reports should go to: stkn@gentoo.org"
-               einfo "You have been warned!"
-               echo
-               einfo "Sleeping 20 Seconds..."
-               epause 20
-       fi
-}
-
-src_unpack() {
-       unpack ${A}
-
-       cd ${S}
-       # >= 1.0.3 requires new patch (-modulesd patch renamed to -gentoo)
-       epatch ${FILESDIR}/${PN}-1.0.3-gentoo.diff
-
-       # remove all from install target
-       sed -i -e "s#^\(install:\)[ \t]\+all[ \t]\+\(.*\)#\1 \2#" Makefile
-
-       # enable ztdummy...
-       sed -i -e "s:#\( ztdummy.*\):\1:" Makefile
-
-       # devfs support
-       if use devfs26; then
-               einfo "Enabling experimental devfs support for linux-2.6..."
-               epatch ${FILESDIR}/${PN}-1.0.4-experimental-devfs26.diff
-
-               # disable udev
-               sed -i -e "s:#define[\t ]\+\(CONFIG_ZAP_UDEV\):#undef \1:" \
-                       zconfig.h
-       fi
-
-       # apply patch for gcc-3.4.x if that's the compiler in use...
-       # fixes (#76707)
-       if use x86 && [[ `gcc-fullversion` = "3.4.3" ]]; then
-               epatch ${FILESDIR}/${PN}-1.0.4-gcc34.patch
-       fi
-
-       # try to apply bristuff patch
-       if use bri; then
-               einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-               epatch ${FILESDIR}/zaptel-bristuff-${BRI_VERSION}.patch
-
-               cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-               if use florz; then
-                       einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-                       epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-               fi
-
-               # patch includes
-               sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-                       qozap/qozap.c \
-                       zaphfc/zaphfc.c
-
-               # patch makefiles
-               sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-                       -e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-                       -e "s:linux-2.6:linux:g" \
-                       qozap/Makefile \
-                       zaphfc/Makefile
-
-               sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-                       zaphfc/Makefile
-       fi
-
-       # replace `uname -r` with ${KV_FULL} in all Makefiles
-       find ${WORKDIR} -iname "Makefile" -exec sed -i -e "s:\`uname -r\`:${KV_FULL}:g" {} \;
-}
-
-src_compile() {
-       # TODO: bristuff modules
-
-       make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
-
-       if use bri; then
-               cd ${WORKDIR}/bristuff-${BRI_VERSION}
-               make ARCH=$(tc-arch-kernel) -C qozap || die
-               make ARCH=$(tc-arch-kernel) -C zaphfc || die
-       fi
-}
-
-src_install() {
-       make INSTALL_PREFIX=${D} install || die
-
-       dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-       dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-       # additional tools
-       dobin ztmonitor ztspeed zttest
-
-       if use bri; then
-               einfo "Installing bri"
-               cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-               insinto /lib/modules/${KV_FULL}/misc
-               doins qozap/qozap.${KV_OBJ}
-               doins zaphfc/zaphfc.${KV_OBJ}
-
-               # install example configs for octoBRI and quadBRI
-               insinto /etc
-               doins qozap/zaptel.conf.octoBRI
-               newins qozap/zaptel.conf zaptel.conf.quadBRI
-               newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-               insinto /etc/asterisk
-               doins qozap/zapata.conf.octoBRI
-               newins qozap/zapata.conf zapata.conf.quadBRI
-               newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-               docinto bristuff
-               dodoc CHANGES INSTALL
-
-               docinto bristuff/qozap
-               dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-               docinto bristuff/zaphfc
-               dodoc zaphfc/LICENSE zaphfc/*.conf
-       fi
-
-       # install init script
-       newinitd ${FILESDIR}/zaptel.rc6 zaptel
-       newconfd ${FILESDIR}/zaptel.confd zaptel
-
-       # install devfsd rule file
-       insinto /etc/devfs.d
-       newins ${FILESDIR}/zaptel.devfsd zaptel
-
-       # install udev rule file
-       insinto /etc/udev/rules.d
-       newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-       # fix permissions if there's no udev / devfs around
-       if [[ -d ${D}/dev/zap ]]; then
-               chown -R root:dialout   ${D}/dev/zap
-               chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-       fi
-}
-
-pkg_postinst() {
-       linux-mod_pkg_postinst
-
-       if use devfs26; then
-               ewarn "*** Warning! ***"
-               ewarn "Devfs support for linux-2.6 is experimental and not"
-               ewarn "supported by digium or the asterisk project!"
-               echo
-               ewarn "Send bug-reports to: stkn@gentoo.org"
-       fi
-
-       echo
-       einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-       echo
-
-       if use bri; then
-               einfo "Bristuff configs have been merged as:"
-               einfo ""
-               einfo "${ROOT}etc/"
-               einfo "    zaptel.conf.zaphfc"
-               einfo "    zaptel.conf.quadBRI"
-               einfo "    zaptel.conf.octoBRI"
-               einfo ""
-               einfo "${ROOT}etc/asterisk/"
-               einfo "    zapata.conf.zaphfc"
-               einfo "    zapata.conf.quadBRI"
-               einfo "    zapata.conf.octoBRI"
-               echo
-       fi
-
-       # fix permissions if there's no udev / devfs around
-       if [[ -d ${ROOT}/dev/zap ]]; then
-               chown -R root:dialout   ${ROOT}/dev/zap
-               chmod -R u=rwX,g=rwX,o= ${ROOT}/dev/zap
-       fi
-}
diff --git a/net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild b/net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild
deleted file mode 100644 (file)
index de93f2c..0000000
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.9_p1-r1.ebuild,v 1.2 2005/09/15 02:38:26 stkn Exp $
-
-IUSE="devfs26 bri florz rtc"
-
-inherit toolchain-funcs eutils linux-mod
-
-BRI_VERSION="0.2.0-RC8n"
-FLORZ_VERSION="0.2.0-RC8j_florz-8"
-
-MY_PV="${PV/_p/.}"
-
-DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/old/zaptel-${MY_PV}.tar.gz
-        bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
-        florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-DEPEND="virtual/libc
-       virtual/linux-sources
-       >=dev-libs/newt-0.50.0"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-pkg_setup() {
-       linux-mod_pkg_setup
-
-       # show an nice warning message about zaptel not supporting devfs on 2.6
-       if kernel_is 2 6 && linux_chkconfig_present DEVFS_FS ; then
-               echo
-               einfo "You're using a 2.6 kernel with DEVFS."
-               einfo "The Zaptel drivers won't work unless you either:"
-               einfo "   * switch to udev"
-               einfo "   * write a script that re-creates the necessary device nodes for you"
-               einfo "   * enable the devfs26 useflag (see below)"
-               einfo ""
-               einfo "There's an experimental patch which adds devfs support when using linux-2.6, but:"
-               einfo "   1. It disables udev support to avoid conflicts"
-               ewarn "   2. It is not supported by Digium / the Asterisk project!"
-               einfo ""
-               einfo "If you're still interested, abort now (ctrl+c) and enable the devfs26 USE-flag"
-               einfo "Feedback and bug-reports should go to: stkn@gentoo.org"
-               einfo "You have been warned!"
-               echo
-               einfo "Sleeping 20 Seconds..."
-               epause 20
-       fi
-}
-
-src_unpack() {
-       unpack ${A}
-
-       cd ${S}
-       # patch makefile(s) for gentoo
-       epatch ${FILESDIR}/${PN}-1.0.9-gentoo.diff
-
-       # devfs support
-       if use devfs26; then
-               einfo "Enabling experimental devfs support for linux-2.6..."
-               epatch ${FILESDIR}/${PN}-1.0.4-experimental-devfs26.diff
-
-               # disable udev
-               sed -i -e "s:#define[\t ]\+\(CONFIG_ZAP_UDEV\):#undef \1:" \
-                       zconfig.h
-
-               # fix Makefile to not create device nodes for
-               # devfs enabled 2.6 kernels
-               sed -i -e 's:grep udevd:grep -q \"udevd\\|devfsd\":' \
-                       Makefile || die "QA error: No substitution performed"
-       fi
-
-       # apply patch for gcc-3.4.x if that's the compiler in use...
-       # fixes (#76707)
-       if use x86 && [[ `gcc-fullversion` = "3.4.3" ]]; then
-               epatch ${FILESDIR}/${PN}-1.0.4-gcc34.patch
-       fi
-
-       # try to apply bristuff patch
-       if use bri; then
-               einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-               epatch ${FILESDIR}/zaptel-bristuff-${BRI_VERSION}.patch
-
-               cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-               if use florz; then
-                       einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
-
-                       epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
-               fi
-
-               # patch includes
-               sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
-                       qozap/qozap.c \
-                       zaphfc/zaphfc.c \
-                       cwain/cwain.c
-
-               # patch makefiles
-               sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
-                       -e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
-                       -e "s:linux-2.6:linux:g" \
-                       qozap/Makefile \
-                       zaphfc/Makefile \
-                       cwain/Makefile
-
-               sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
-                       zaphfc/Makefile
-       fi
-
-       # replace `uname -r` with ${KV_FULL} in all Makefiles
-       find ${WORKDIR} -iname "Makefile" -exec sed -i -e "s:\`uname -r\`:${KV_FULL}:g" {} \;
-
-       cd ${S}
-       #######################################################################
-       # apply other patches here,
-       # make sure they work with things that have been added before!
-       #
-
-       # apply x86 rtc patch for ztdummy (http://bugs.digium.com/view.php?id=4301)
-       # this won't have any effect on non-x86 systems...
-       if use rtc; then
-               if use x86 || use amd64; then
-                       epatch ${FILESDIR}/${PN}-1.0.9-rtc.patch
-               else
-                       ewarn "RTC is unsupported on your arch, skipping patch"
-               fi
-       fi
-}
-
-src_compile() {
-       make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
-
-       if use bri; then
-               cd ${WORKDIR}/bristuff-${BRI_VERSION}
-               make ARCH=$(tc-arch-kernel) -C qozap  || die
-               make ARCH=$(tc-arch-kernel) -C zaphfc || die
-               make ARCH=$(tc-arch-kernel) -C cwain  || die
-       fi
-}
-
-src_install() {
-       make INSTALL_PREFIX=${D} install || die
-
-       dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-       dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
-
-       # additional tools
-       dobin ztmonitor ztspeed zttest
-
-       if use bri; then
-               einfo "Installing bri"
-               cd ${WORKDIR}/bristuff-${BRI_VERSION}
-
-               insinto /lib/modules/${KV_FULL}/misc
-               doins qozap/qozap.${KV_OBJ}
-               doins zaphfc/zaphfc.${KV_OBJ}
-               doins cwain/cwain.${KV_OBJ}
-
-               # install example configs for octoBRI and quadBRI
-               insinto /etc
-               doins qozap/zaptel.conf.octoBRI
-               newins qozap/zaptel.conf zaptel.conf.quadBRI
-               newins zaphfc/zaptel.conf zaptel.conf.zaphfc
-
-               insinto /etc/asterisk
-               doins qozap/zapata.conf.octoBRI
-               newins qozap/zapata.conf zapata.conf.quadBRI
-               newins zaphfc/zapata.conf zapata.conf.zaphfc
-
-               docinto bristuff
-               dodoc CHANGES INSTALL
-
-               docinto bristuff/qozap
-               dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
-
-               docinto bristuff/zaphfc
-               dodoc zaphfc/LICENSE zaphfc/*.conf
-
-               docinto bristuff/cwain
-               dodoc cwain/TODO cwain/LICENSE
-       fi
-
-       # install init script
-       newinitd ${FILESDIR}/zaptel.rc6 zaptel
-       newconfd ${FILESDIR}/zaptel.confd zaptel
-
-       # install devfsd rule file
-       insinto /etc/devfs.d
-       newins ${FILESDIR}/zaptel.devfsd zaptel
-
-       # install udev rule file
-       insinto /etc/udev/rules.d
-       newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
-
-       # fix permissions if there's no udev / devfs around
-       if [[ -d ${D}/dev/zap ]]; then
-               chown -R root:dialout   ${D}/dev/zap
-               chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
-       fi
-}
-
-pkg_postinst() {
-       linux-mod_pkg_postinst
-
-       if use devfs26; then
-               ewarn "*** Warning! ***"
-               ewarn "Devfs support for linux-2.6 is experimental and not"
-               ewarn "supported by digium or the asterisk project!"
-               echo
-               ewarn "Send bug-reports to: stkn@gentoo.org"
-       fi
-
-       echo
-       einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
-       echo
-
-       if use bri; then
-               einfo "Bristuff configs have been merged as:"
-               einfo ""
-               einfo "${ROOT}etc/"
-               einfo "    zaptel.conf.zaphfc"
-               einfo "    zaptel.conf.quadBRI"
-               einfo "    zaptel.conf.octoBRI"
-               einfo ""
-               einfo "${ROOT}etc/asterisk/"
-               einfo "    zapata.conf.zaphfc"
-               einfo "    zapata.conf.quadBRI"
-               einfo "    zapata.conf.octoBRI"
-               echo
-       fi
-
-       # fix permissions if there's no udev / devfs around
-       if [[ -d ${ROOT}/dev/zap ]]; then
-               chown -R root:dialout   ${ROOT}/dev/zap
-               chmod -R u=rwX,g=rwX,o= ${ROOT}/dev/zap
-       fi
-}