diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-12-28 01:37:43 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-12-28 01:37:43 +0000 |
commit | e67d5b4ba05349b3bf4229d0cf7d069809c4420e (patch) | |
tree | 0fe2174d8edf159924d772ad279f37faba8d5b6a /net-misc/dahdi-tools | |
parent | 249ae8c1a241b514fc83737660927ee175091346 (diff) |
gentoo auto-resync : 28:12:2023 - 01:37:43
Diffstat (limited to 'net-misc/dahdi-tools')
-rw-r--r-- | net-misc/dahdi-tools/Manifest | 16 | ||||
-rw-r--r-- | net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild | 70 | ||||
-rw-r--r-- | net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild | 74 | ||||
-rw-r--r-- | net-misc/dahdi-tools/dahdi-tools-3.2.0.ebuild | 73 | ||||
-rw-r--r-- | net-misc/dahdi-tools/files/dahdi-autoconf.conf2 | 40 | ||||
-rw-r--r-- | net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4 | 271 | ||||
-rw-r--r-- | net-misc/dahdi-tools/files/dahdi-autoconf.init2 | 225 | ||||
-rw-r--r-- | net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch | 12 | ||||
-rw-r--r-- | net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch | 26 | ||||
-rw-r--r-- | net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch | 40 | ||||
-rw-r--r-- | net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch | 39 | ||||
-rw-r--r-- | net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch | 19 | ||||
-rw-r--r-- | net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch | 61 | ||||
-rw-r--r-- | net-misc/dahdi-tools/files/dahdi.init2 | 36 | ||||
-rw-r--r-- | net-misc/dahdi-tools/metadata.xml | 18 |
15 files changed, 1020 insertions, 0 deletions
diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest new file mode 100644 index 000000000000..edad9f8c668b --- /dev/null +++ b/net-misc/dahdi-tools/Manifest @@ -0,0 +1,16 @@ +AUX dahdi-autoconf.conf2 1067 BLAKE2B f6c64135e4b47ce3eafd4b79b4e02ea8bc4d46ab36e30203cf061a5541fc2bdc9bdb2bf6050bc36c8d1e1b5f2ba07f72e83037eccd86ead45fdc97e8a4a3d767 SHA512 7de2ad496a48da487b0f54b0d3c98681e72ebb86107bdf091c74f410d0e2598fe21e1b876eea81d72ef5250570a67a2ece19de6d003b9bbc3def5fae9173189a +AUX dahdi-autoconf.init-3.1.0-r4 6709 BLAKE2B 53dd72c1390b8be78117df9fb8829ba8c9e0c53800bde17f3dcd9384750bbbc9e883888b53a453da3f222843e09f56a095bcc9a27c0c44a3a232faf2da3a0dc8 SHA512 9ec20697a7b6a3a6a9bbd03687477a9a0b59365996e5018f04bd4798623f83dd69d3bd34f48c104a00a621aa8d12f9254ddc1effc0743ec67b30e6a405e2dacf +AUX dahdi-autoconf.init2 5817 BLAKE2B c8186a6ff1188ed1d91b86db2b6e861297b5927c7a2cc95a95eb656d4149f2d01c2d8b91412e440f76e9fcb3ff530aef00dae04c38763bd84575cadecdfe2692 SHA512 0201e4555a8c3ccaceb4cfe1fe004dada847608ad6d8ad031f788f72b056e0d0ef0bdad653eb2f492ae08444c2094dc00ac73180a4107eaabc5f5258a91fa50d +AUX dahdi-nondigium-blacklist.patch 507 BLAKE2B 5cd8264cfb6792db5fdb92b32dad33a224defb876807d260fbef9f72b943f56f8415a7f082752e261c03982c6b016fe1ce8034d98c6a1aac4cfee7c9d50b3ddb SHA512 4fdb4933e05e07812d1a94efb9bda9038aaadb8a1830cb9ba99d62346f2d007e827771f8de144ef09d6ee5adb1a571ca5ef8ae646c7f62bde8232af30468c2ac +AUX dahdi-tools-3.1.0-cplusplusexternc.patch 695 BLAKE2B 8b3cbe872786017759d11bf5d23e6eb41de29003e047ab7244188e0603df6ea669b870216e15cdf4c77a41f7b4f5d10169853aaf839b6dc4d491c0a23121924b SHA512 eecfdb73558b8f4ea8b5ffb55ced8f863960cb1ee92196995ca69e30df4a55f07f59a0b429cfad40271b71b585130438b11861d3459fab87f02ced7032f57ded +AUX dahdi-tools-3.1.0-execinfo.patch 1194 BLAKE2B da5ebde771ff1cc7099681854d5bc313f66eafadec00399f0d249decc4d1d28844b579d08b76641285df301f21aba8ba9fa1569573001370ed94ca9ffc2c5eb9 SHA512 638c7cf9f6a378bcf0aa5d184a59aac40a8bdaf206180cf3f9d30464d88545aa3d5205f652cf3ed793014d5a3cf5a6d358e623936add6137b65b29cf48136389 +AUX dahdi-tools-3.1.0-fno-common.patch 1030 BLAKE2B ca9f8ce7116656f66107194c7ccec7c99f9b9ada6207b6f8590d5da732a27cb77570ffb53fd43f312cded7e6783322436f18eaba44a8ee5fdb03447a895a77ac SHA512 0841ff6a8f1e551a088c36bfdc44bad185e884b055dc6b8655db489b4957398834c4a25eabaf32269eeecd3aef6d7b891dd87a89af9b15e3d92786ce0151656c +AUX dahdi-tools-3.1.0-parallel-make-no-config.patch 681 BLAKE2B c72cc644d88514c836784511abd9d4c06009218a311dc937b32fe3bcd048ae17439a882ed6a5f159e619eea478d664552e59b7a2ff6b4331c9b44e7ed93033c8 SHA512 d368a0fb5b03618d4adb49c01a6ccb518a67b7e48a209b927878b71b68e4a4a1093574e394970f9d6426bd75b5ca737326f27fc8322654ce39f9b2b272813992 +AUX dahdi-tools-3.2.0-lto.patch 2264 BLAKE2B 1db7cbfc5d7c2ad2c98fb71a054bcb60d7a16a3da2aa5a2a7cb28792c768fa1d724c40f360d1aefe394eec359b4ae48550f2e2c17a520c140a644d96a7ecef8b SHA512 662337c6e770a4b37926bbaa00ef00e7def6ebd3f53e968af1783c65b52309f2dd7c59eef97a799f6aa4b805514e42fd38316db6d0e6a4f556630047ebd2c145 +AUX dahdi.init2 582 BLAKE2B 2e273c929772428586f6800601cc0249a33f61c6aad474c19dd45d9d78a187a9fdd34d1ca26e0eed605fc9630c04b0b0ffd29214a5116749db94bf7609bb078a SHA512 684e8dea54a4f082345100f4d05ca286a085b99c46f0b3fa7300ca5d9a666657afb5405c1f14ac3ba4aba02ce39872e74b9c1cfe6321fd631fa6c39ae38e5ebb +DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694 +DIST dahdi-tools-3.2.0.tar.gz 729392 BLAKE2B 77667a16fd18fa5b6ffd67d9bd267c4ea5e6ff3841938de64704b7e6f1818b23feff196701c62ceb0a56c677614b4c2a4d4d1f4f533020559e8b3b3c12785bf5 SHA512 29df9a768c6db872bd51926dac11178400a03e2e1d0771ae163433ce300af71691f5c7a60f8756c0e6cef8a43f1331944cb4e44393f04a0ff8dee19bc9e7cf16 +EBUILD dahdi-tools-3.1.0-r2.ebuild 2152 BLAKE2B 2c84f625ba1d41d43a69841c8d4dcbe898e1f5c54c54b0a554b3e382c0861fa97b4d027fb63b1b4e4ae2fa7b32dd81389554af2cab3cedfad0c68c2288748537 SHA512 b4e76d483b67390b1a889d868118093d2d5db443d80ded95c0a3424b478a16da934b3911fa451ae7fca380f3a76fad6b821f2ca9ba91f87b27869f15d14b486c +EBUILD dahdi-tools-3.1.0-r4.ebuild 2193 BLAKE2B 35da5b37f60762dd1205f03b17b3c8da70b1564fb4d3fa8e93e63db5134c67a279751177dcee790b6c7ca6bce9d4bae883ac64a1cf69e894e172ef10dfbf27de SHA512 8b231fd5c0bc78b6521843dae2ee87b8ba8c573703f6a245c7a219c7920cf60e86988236c34e0395346d68521b4a6d2c9408efab8f9587a3e4595588560948d5 +EBUILD dahdi-tools-3.2.0.ebuild 2090 BLAKE2B a55354d6a2d8604b846ed7b5da90e9dadcdacdc4988283fb19e6095e32ad6408a21364e72375ebdf610542e8989a728ddf4ee82b24a25078c1c542b8adc5323b SHA512 623d0aad88bd46d17d3b8fd75a94d409939257a10ca342f11e90e7bfb75de1b22679fe8ca813433776124f3123251ce489dc39e5658ee01bfb0a138c6f3779dc +MISC metadata.xml 563 BLAKE2B e5c2a3e3a279ec33e7367437eb6cb3b4a7e9779356dfd8a3631b9c8fe276ccb8de43695419f22e52f5c60a4a9ca6b5603c8192df06ce328dd49bc6f48f91180c SHA512 3e0b8472b24d4c913ed306187eeb84acc9293959f25416257e3079ac9c3e4234560ba750233110f6c57612f7ad6d3a3a18254209625f3c13396770f0a14f1f9e diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild new file mode 100644 index 000000000000..49903c27e61a --- /dev/null +++ b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools bash-completion-r1 perl-functions udev + +DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi" +HOMEPAGE="https://www.asterisk.org" +SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +IUSE="ppp" +PATCHES=( + "${FILESDIR}/dahdi-nondigium-blacklist.patch" + "${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch" + "${FILESDIR}/dahdi-tools-3.1.0-fno-common.patch" + "${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch" + "${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch" +) + +DEPEND="dev-libs/newt + net-misc/dahdi + sys-kernel/linux-headers + virtual/libusb:0 + ppp? ( net-dialup/ppp:= )" +RDEPEND="${DEPEND} + dev-lang/perl:= + dev-perl/CGI" +BDEPEND="dev-lang/perl + sys-apps/file" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)" + sed -re 's/ -Werror($|[[:space:]])//' -i xpp/oct612x/Makefile.in || die "sed to eliminate -Werror failed." + sed -re '/[[:space:]]*-Werror[[:space:]]*\\$/ d' -i xpp/xtalk/Makefile || die "sed to eliminate -Werror failed." +} + +src_install() { + local bashcompdir="$(get_bashcompdir)" + local bashcmd bashcmdtarget + + emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir="$(get_udevdir)/rules.d" install + emake DESTDIR="${ED}" install-config + + dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest + + # install init scripts + newinitd "${FILESDIR}"/dahdi.init2 dahdi + newinitd "${FILESDIR}"/dahdi-autoconf.init2 dahdi-autoconf + newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf + + bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" || + die "Error parsing dahdi bash completion file for commands") + + rm "${ED}"/usr/$(get_libdir)/libtonezone.a || die "Unable to remove static libs from install." + # Delete *if* the libtool file exists, bug #778380 + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + udev_reload +} diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild new file mode 100644 index 000000000000..4ccf762c64d7 --- /dev/null +++ b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools bash-completion-r1 perl-functions udev + +DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi" +HOMEPAGE="https://www.asterisk.org" +SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="ppp" +PATCHES=( + "${FILESDIR}/dahdi-nondigium-blacklist.patch" + "${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch" + "${FILESDIR}/dahdi-tools-3.1.0-fno-common.patch" + "${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch" + "${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch" +) + +DEPEND="dev-libs/newt + net-misc/dahdi + sys-kernel/linux-headers + virtual/libusb:0 + ppp? ( net-dialup/ppp:= )" +RDEPEND="${DEPEND} + dev-lang/perl:= + dev-perl/CGI" +BDEPEND="dev-lang/perl + sys-apps/file" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)" + sed -re 's/ -Werror($|[[:space:]])//' -i xpp/oct612x/Makefile.in || die "sed to eliminate -Werror failed." + sed -re '/[[:space:]]*-Werror[[:space:]]*\\$/ d' -i xpp/xtalk/Makefile || die "sed to eliminate -Werror failed." +} + +src_install() { + local bashcompdir="$(get_bashcompdir)" + local bashcmd bashcmdtarget + + emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir="$(get_udevdir)/rules.d" install + emake DESTDIR="${ED}" install-config + + dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest + + # install init scripts + newinitd "${FILESDIR}"/dahdi.init2 dahdi + newinitd "${FILESDIR}"/dahdi-autoconf.init-3.1.0-r4 dahdi-autoconf + newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf + + bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" || + die "Error parsing dahdi bash completion file for commands") + + rm "${ED}"/usr/$(get_libdir)/libtonezone.a || die "Unable to remove static libs from install." + # Delete *if* the libtool file exists, bug #778380 + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/net-misc/dahdi-tools/dahdi-tools-3.2.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.2.0.ebuild new file mode 100644 index 000000000000..773d22263bd4 --- /dev/null +++ b/net-misc/dahdi-tools/dahdi-tools-3.2.0.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools bash-completion-r1 perl-functions udev + +DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi" +HOMEPAGE="https://www.asterisk.org" +SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="ppp" +PATCHES=( + "${FILESDIR}/dahdi-nondigium-blacklist.patch" + "${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch" + "${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch" + "${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch" + "${FILESDIR}/dahdi-tools-3.2.0-lto.patch" +) + +DEPEND="dev-libs/newt + net-misc/dahdi + sys-kernel/linux-headers + virtual/libusb:1 + ppp? ( net-dialup/ppp:= )" +RDEPEND="${DEPEND} + dev-lang/perl:= + dev-perl/CGI" +BDEPEND="dev-lang/perl + sys-apps/file" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)" + sed -re 's/ -Werror($|[[:space:]])//' -i xpp/oct612x/Makefile.in || die "sed to eliminate -Werror failed." + sed -re '/[[:space:]]*-Werror[[:space:]]*\\$/ d' -i xpp/xtalk/Makefile || die "sed to eliminate -Werror failed." +} + +src_install() { + local bashcompdir="$(get_bashcompdir)" + local bashcmd bashcmdtarget + + emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir="$(get_udevdir)/rules.d" install + emake DESTDIR="${ED}" install-config + + dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest + + # install init scripts + newinitd "${FILESDIR}"/dahdi.init2 dahdi + newinitd "${FILESDIR}"/dahdi-autoconf.init-3.1.0-r4 dahdi-autoconf + newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf + + bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" || + die "Error parsing dahdi bash completion file for commands") + + # Delete *if* the libtool file exists, bug #778380 + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.conf2 b/net-misc/dahdi-tools/files/dahdi-autoconf.conf2 new file mode 100644 index 000000000000..a46545231911 --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi-autoconf.conf2 @@ -0,0 +1,40 @@ +# Global settings +# Set this to your country code. +DAHDI_ZONE=za +DAHDI_ECHOCAN=oslec # mg2,jpah,kb1,sec,sec2 (there may be more, we recommend oslec) + +# Settings for analog +#Analog signal types, one of: +# ks - KewlStart (recommended, default) +# ls - LoopStart +# gs - GroundStart + +# Signalling to be used on FXO ports +DAHDI_FXO_SIGNALLING=ks + +# Signalling to be used on FXS ports +DAHDI_FXS_SIGNALLING=ks + +# Whether or not to echocan: +DAHDI_FXO_ECHOCAN=yes +DAHDI_FXS_ECHOCAN=yes + +# These settings will be used for BRI cards. +# Known options: B8ZS,AMI,HDB3 +DAHDI_BRI_CODING=AMI + +# Known options: ESF,D4,CCS,CRC4 +DAHDI_BRI_FRAMING=CCS + +# Our experience is that it's not required (still defaults to yes) +DAHDI_BRI_NT_ECHOCAN=yes +DAHDI_BRI_TE_ECHOCAN=yes + +# These settings are for PRI cards. Note that only E1 currently supported. +DAHDI_E1_CPE_ECHOCAN=yes +DAHDI_E1_NET_ECHOCAN=yes + +# PRI will default to CPE mode (remote end provides signalling). +# If you really want to provide signalling set the appropriate spans +# here (eg, set span 1 to NET mode). +#PRI_SPAN_1_NET=yes diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4 b/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4 new file mode 100644 index 000000000000..73ab07b8904f --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4 @@ -0,0 +1,271 @@ +#!/sbin/openrc-run +# Copyright 1999-2011 Ultimate Linux Solutions CC +# Distributed under the terms of the GNU General Public License v2 + +depend() { + before dahdi +} + +dahdi_load_modules() { + local hwlist loc status mod mod_vname pciid desc + + hwlist=$(/usr/sbin/dahdi_hardware) + + if [ -z "${hwlist}" ]; then + einfo "No digium hardware found." + ebegin "Loading module dahdi_dummy" + /sbin/modprobe dahdi_dummy + eend $? + return + fi + + echo "${hwlist}" | while read loc mod pciid desc; do + status="${mod:${#mod}-1:1}" + mod="${mod%[+-]}" + mod_vname="mod_${mod}" + + einfo "Found $desc at $loc (module: $mod)" + + if [ "${status}" = "-" -a "${!mod_vname-notloaded}" = "notloaded" ]; then + ebegin "Loading module $mod" + /sbin/modprobe $mod + eend + + [ $? -eq 0 ] && eval "$mod_vname=loaded" + fi + done +} + +dahdi_module_unload() { + local mod=$1 s + [ -d /sys/module/${mod} ] || return 0 + + for s in $(find /sys/module/${mod}/holders -type l); do + dahdi_module_unload $(basename $s) + done + + ebegin "Removing dahdi module: $mod" + /sbin/rmmod $mod + eend $? +} + +dahdi_gen_fxo_config() { + local port=$1 + + echo "fxs${DAHDI_FXO_SIGNALLING-ks}=${port}" + [ "${DAHDI_FXO_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}" +} + +dahdi_gen_fxs_config() { + local port=$1 + + echo "fxo${DAHDI_FXO_SIGNALLING-ks}=${port}" + [ "${DAHDI_FXS_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}" +} + +dahdi_gen_bri_te_config() { + span=$1 + port=$2 + basechan=$3 + + echo "span=${span},${port},0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}" + echo "bchan=${basechan}-$(( basechan + 1 ))" + echo "hardhdlc=$(( basechan + 2 ))" + [ "${DAHDI_BRI_TE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))" +} + +dahdi_gen_bri_nt_config() { + span=$1 + port=$2 + basechan=$3 + + echo "span=${span},0,0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}" + echo "bchan=${basechan}-$(( basechan + 1 ))" + echo "hardhdlc=$(( basechan + 2 ))" + [ "${DAHDI_BRI_NT_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))" +} + +dahdi_gen_e1_cpe_config() { + span=$1 + port=$2 + basechan=$3 + + echo "span=${span},${port},0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}" + bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))" + echo "bchan=${bchans}" + echo "dchan=$(( basechan + 15 ))" + [ "${DAHDI_E1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}" +} + +dahdi_gen_e1_net_config() { + span=$1 + port=$2 + basechan=$3 + + echo "span=${span},0,0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}" + bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))" + echo "bchan=${bchans}" + echo "dchan=$(( basechan + 15 ))" + [ "${DAHDI_E1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}" +} + +dahdi_gen_t1_cpe_config() { + span=$1 + port=$2 + basechan=$3 + + echo "span=${span},${port},0,${DAHDI_T1_FRAMING-ESF},${DAHDI_T1_CODING-B8ZS}" + bchans="${basechan}-$(( basechan + 22 ))" + echo "bchan=${bchans}" + echo "dchan=$(( basechan + 23 ))" + [ "${DAHDI_T1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}" +} + +dahdi_gen_t1_net_config() { + span=$1 + port=$2 + basechan=$3 + + echo "span=${span},0,0,${DAHDI_T1_FRAMING-ESF},${DAHDI_T1_CODING-B8ZS}" + bchans="${basechan}-$(( basechan + 22 ))" + echo "bchan=${bchans}" + echo "dchan=$(( basechan + 23 ))" + [ "${DAHDI_T1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}" +} + +dahdi_conf_span() { + local span=$1 + local type=$2 + local desc=$3 + local port=$4 + local basechan=$5 + local vname="PRI_SPAN_${span}_NET" + local cfunc="dahdi_gen_" + + # Analog we need to deal with on a port-by-port basis. + [ "${type}" = "analog" ] && return 0 + + echo "" + echo "# ${desc}" + + case "${type}" in + digital-TE) + cfunc="${cfunc}bri_te" + ;; + digital-NT) + cfunc="${cfunc}bri_nt" + ;; + digital-[TE]1) + cfunc="${cfunc}$(echo "${type##*-}" | tr 'TE' 'te')" + # Use CPE by default. Unfortunately there is no easy + # way to detect CPE vs NET as far as I know and specifying + # in a config that you want NET mode seems the sanest way. + if yesno "${vname}"; then + cfunc="${cfunc}_net" + else + cfunc="${cfunc}_cpe" + fi + ;; + *) + echo "# Don't know how to configure this (type=${type})." + echo "# Please file a bug on bugs.gentoo.org and add jaco@uls.co.za as CC." + return 1 + ;; + esac + + "${cfunc}_config" "${span}" "${port}" "${basechan}" +} + +dahdi_gen_config() { + local type manufacturer devicetype basechan aport atype + local span= + local tfile="$(mktemp)" + local sfile="$(mktemp)" + local plocation="" + local isdnport=0 + + /usr/sbin/dahdi_scan > "${sfile}" + exec 3<"${sfile}" + exec 4>"${tfile}" + + echo "# Automatically dahdi-autoconf generated file ($(date))." >&4 + echo "# This file WILL get regenerated whenever you restart dahdi-autoconf." >&4 + + while read LINE <&3; do + case "$LINE" in + \[*\]) + if [ -n "${span}" ]; then + ebegin "Configuring ${manufacturer} ${devicetype} (${name})" + dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >&4 + eend $? + fi + span="${LINE%?}" + span="${span#?}" + ;; + type=*|manufacturer=*|devicetype=*|basechan=*|name=*) + eval "${LINE%%=*}='${LINE#*=}'" + ;; + location=*) + eval "${LINE%%=*}='${LINE#*=}'" + if [ "${location}" = "${plocation}" ]; then + isdnport=$(( isdnport + 1 )) + else + plocation="${location}" + isdnport=1 + fi + ;; + port=*) + # For analog cards only. + aport="${LINE#*=}"; aport="${aport%,*}" + atype="${LINE#*,}" + if [ "${aport}" -eq "${basechan}" ]; then + echo "" >&4 + echo "# ${manufacturer} ${devicetype} (${name})" >&4 + fi + case "${atype}" in + FXO) + dahdi_gen_fxo_config $aport >&4 + ;; + FXS) + dahdi_gen_fxs_config $aport >&4 + ;; + esac + ;; + esac + done + + if [ -n "${span}" ]; then + ebegin "Configuring ${manufacturer} ${devicetype} (${name})" + dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >&4 + eend $? + fi + + echo "" >&4 + echo "loadzone = ${DAHDI_ZONE}" >&4 + echo "defaultzone = ${DAHDI_ZONE}" >&4 + echo "## END OF AUTOCONFIGURED FILE ##" >&4 + + exec 3<&- + exec 4<&- + + rm -f "${sfile}" + [ -r /etc/dahdi/system.conf ] && mv /etc/dahdi/system.conf /etc/dahdi/system.conf.bck + mv "${tfile}" /etc/dahdi/system.conf +} + +start() { + dahdi_load_modules + + if [ ! -r /dev/dahdi/ctl ]; then + eerror "No DAHDI compatible cards detected." + return 1 + fi + + ebegin "Generating DAHDI Configuration" + dahdi_gen_config + eend $? +} + +stop() { + dahdi_module_unload dahdi +} diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.init2 b/net-misc/dahdi-tools/files/dahdi-autoconf.init2 new file mode 100644 index 000000000000..9e3de84bac26 --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi-autoconf.init2 @@ -0,0 +1,225 @@ +#!/sbin/openrc-run +# Copyright 1999-2011 Ultimate Linux Solutions CC +# Distributed under the terms of the GNU General Public License v2 + +depend() { + before dahdi +} + +dahdi_load_modules() { + local hwlist loc status mod mod_vname pciid desc + + hwlist=$(/usr/sbin/dahdi_hardware) + + if [ -z "${hwlist}" ]; then + einfo "No digium hardware found." + ebegin "Loading module dahdi_dummy" + /sbin/modprobe dahdi_dummy + eend $? + return + fi + + echo "${hwlist}" | while read loc mod pciid desc; do + status="${mod:${#mod}-1:1}" + mod="${mod%[+-]}" + mod_vname="mod_${mod}" + + einfo "Found $desc at $loc (module: $mod)" + + if [ "${status}" = "-" -a "${!mod_vname-notloaded}" = "notloaded" ]; then + ebegin "Loading module $mod" + /sbin/modprobe $mod + eend + + [ $? -eq 0 ] && eval "$mod_vname=loaded" + fi + done +} + +dahdi_module_unload() { + local mod=$1 s + [ -d /sys/module/${mod} ] || return 0 + + for s in $(find /sys/module/${mod}/holders -type l); do + dahdi_module_unload $(basename $s) + done + + ebegin "Removing dahdi module: $mod" + /sbin/rmmod $mod + eend $? +} + +dahdi_gen_fxo_config() { + local port=$1 + + echo "fxs${DAHDI_FXO_SIGNALLING-ks}=${port}" + [ "${DAHDI_FXO_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}" +} + +dahdi_gen_fxs_config() { + local port=$1 + + echo "fxo${DAHDI_FXO_SIGNALLING-ks}=${port}" + [ "${DAHDI_FXS_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}" +} + +dahdi_gen_bri_te_config() { + span=$1 + port=$2 + basechan=$3 + + echo "span=${span},${port},0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}" + echo "bchan=${basechan}-$(( basechan + 1 ))" + echo "hardhdlc=$(( basechan + 2 ))" + [ "${DAHDI_BRI_TE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))" +} + +dahdi_gen_bri_nt_config() { + span=$1 + port=$2 + basechan=$3 + + echo "span=${span},0,0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}" + echo "bchan=${basechan}-$(( basechan + 1 ))" + echo "hardhdlc=$(( basechan + 2 ))" + [ "${DAHDI_BRI_NT_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))" +} + +dahdi_gen_e1_cpe_config() { + span=$1 + port=$2 + basechan=$3 + + echo "span=${span},${port},0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}" + bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))" + echo "bchan=${bchans}" + echo "dchan=$(( basechan + 15 ))" + [ "${DAHDI_E1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}" +} + +dahdi_gen_e1_net_config() { + span=$1 + port=$2 + basechan=$3 + + echo "span=${span},0,0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}" + bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))" + echo "bchan=${bchans}" + echo "dchan=$(( basechan + 15 ))" + [ "${DAHDI_E1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}" +} + +dahdi_conf_span() { + local span=$1 + local type=$2 + local desc=$3 + local port=$4 + local basechan=$5 + local vname="" + + # Analog we need to deal with on a port-by-port basis. + [ "${type}" = "analog" ] && return 0 + + echo -e "\n# ${desc}" + case "${type}" in + digital-TE) + dahdi_gen_bri_te_config "${span}" "${port}" "${basechan}" + ;; + digital-NT) + dahdi_gen_bri_nt_config "${span}" "${port}" "${basechan}" + ;; + digital-E1) + # Use CPE by default. Unfortunately there is no easy + # way to detect CPE vs NET as far as I know and specifying + # in a config that you want NET mode seems the sanest way. + vname="PRI_SPAN_${span}_NET" + if [[ "${!vname}" = [Yy][Ee][Ss] ]]; then + dahdi_gen_e1_net_config "${span}" "${port}" "${basechan}" + else + dahdi_gen_e1_cpe_config "${span}" "${port}" "${basechan}" + fi + ;; + *) + echo "# Don't know how to configure this (type=${type})." + echo "# Please file a bug on bugs.gentoo.org and add jaco@uls.co.za as CC." + ;; + esac +} + +dahdi_gen_config() { + local type manufacturer devicetype basechan aport atype + local span= + local tfile="$(mktemp)" + local sfile="$(mktemp)" + local plocation="" + local isdnport=0 + + /usr/sbin/dahdi_scan > "${sfile}" + exec 3<"${sfile}" + + echo "# Automatically dahdi-autoconf generated file ($(date))." >> "${tfile}" + echo "# This file WILL get regenerated whenever you restart dahdi-autoconf." >> "${tfile}" + + while read LINE <&3; do + case "$LINE" in + [[]*[]]) + [ -n "${span}" ] && dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >> "${tfile}" + span="${LINE%?}" + span="${span#?}" + ;; + type=*|manufacturer=*|devicetype=*|basechan=*|name=*) + eval "${LINE%%=*}='${LINE#*=}'" + ;; + location=*) + eval "${LINE%%=*}='${LINE#*=}'" + if [ "${location}" == "${plocation}" ]; then + (( ++isdnport )) + else + plocation="${location}" + isdnport=1 + fi + ;; + port=*) + # For analog cards only. + aport="${LINE#*=}"; aport="${aport%,*}" + atype="${LINE#*,}" + [ "${aport}" -eq "${basechan}" ] && echo -e "\n# ${manufacturer} ${devicetype} (${name})" >> "${tfile}" + case "${atype}" in + FXO) + dahdi_gen_fxo_config $aport >> "${tfile}" + ;; + FXS) + dahdi_gen_fxs_config $aport >> "${tfile}" + ;; + esac + ;; + esac + done + + [ -n "${span}" ] && dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >> "${tfile}" + + echo -e "\nloadzone = ${DAHDI_ZONE}\ndefaultzone = ${DAHDI_ZONE}\n## END OF AUTOCONFIGURED FILE ##" >> "${tfile}" + + exec 3<&- + + rm -f "${sfile}" + mv /etc/dahdi/system.conf /etc/dahdi/system.conf.bck + mv "${tfile}" /etc/dahdi/system.conf +} + +start() { + dahdi_load_modules + + if [ ! -r /dev/dahdi/ctl ]; then + eerror "No DAHDI compatible cards detected." + return 1 + fi + + ebegin "Generating DAHDI Configuration" + dahdi_gen_config + eend $? +} + +stop() { + dahdi_module_unload dahdi +} diff --git a/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch b/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch new file mode 100644 index 000000000000..3df8f166a56c --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch @@ -0,0 +1,12 @@ +diff -uNr dahdi-tools-2.8.0.ORIG/blacklist.sample dahdi-tools-2.8.0/blacklist.sample +--- dahdi-tools-2.8.0/blacklist.sample.ORIG 2009-04-02 10:34:32.000000000 +0200 ++++ dahdi-tools-2.8.0/blacklist.sample 2010-05-24 20:46:05.000000000 +0200 +@@ -14,6 +14,8 @@ + blacklist wcb4xxp + blacklist wcaxx + blacklist wcte43x ++blacklist wcopenpci ++blacklist zaphfc + + # Some mISDN drivers may try to attach to cards supported by DAHDI. If you + # have a card which is *not* supported by DAHDI but supported by one of the diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch new file mode 100644 index 000000000000..37d1402c404f --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch @@ -0,0 +1,26 @@ +diff --git a/./dahdi-tools-3.1.0/xpp/hexfile.h.o b/./dahdi-tools-3.1.0/xpp/hexfile.h +index 33ff50d..3d03f98 100644 +--- a/xpp/hexfile.h ++++ b/xpp/hexfile.h +@@ -70,7 +70,9 @@ struct hexdata { + }; + + +-__BEGIN_DECLS ++#ifdef __cpluplus ++extern "C" { ++#endif + + typedef void (*parse_hexfile_report_func_t)(int level, const char *msg, ...) + #ifdef __GNUC__ +@@ -86,6 +88,9 @@ int dump_hexfile2(struct hexdata *hexdata, const char *outfile, uint8_t maxwidth + void dump_binary(struct hexdata *hexdata, const char *outfile); + void gen_hexline(const uint8_t *data, uint16_t addr, size_t len, FILE *output); + int bsd_checksum(struct hexdata *hexdata); +-__END_DECLS ++ ++#ifdef __cpluplus ++} ++#endif + + #endif diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch new file mode 100644 index 000000000000..b222a85d8cb9 --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch @@ -0,0 +1,40 @@ +--- a/configure.ac 2020-03-28 22:28:35.614340050 +0200 ++++ b/configure.ac 2020-03-28 22:28:55.084181570 +0200 +@@ -161,6 +161,7 @@ + # Checks for header files. + AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h]) + AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h]) ++AC_CHECK_HEADERS([execinfo.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_C_INLINE +--- a/xpp/xtalk/debug.c 2020-03-28 22:41:43.507810560 +0200 ++++ b/xpp/xtalk/debug.c 2020-03-28 22:41:10.538087608 +0200 +@@ -27,8 +27,10 @@ + #include <stdarg.h> + #include <syslog.h> +-#include <execinfo.h> + #include <xtalk/debug.h> + #include <autoconfig.h> ++#ifdef HAVE_EXECINFO_H ++#include <execinfo.h> ++#endif + + int verbose = LOG_INFO; + int debug_mask; +@@ -61,6 +63,7 @@ + /* from glibc info(1) */ + void print_backtrace(FILE *fp) + { ++#ifdef HAVE_EXECINFO_H + void *array[10]; + size_t size; + char **strings; +@@ -71,4 +74,7 @@ + for (i = 0; i < size; i++) + fprintf(fp, "%s\n", strings[i]); + free(strings); ++#else ++ fprintf(fp, "backtrace information only available if execinfo.h is available.\n"); ++#endif + } diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch new file mode 100644 index 000000000000..3ca5bd2aa09b --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch @@ -0,0 +1,39 @@ +diff --git a/xpp/mpptalk.c b/xpp/mpptalk.c +index fdb34f1..8fb3687 100644 +--- a/xpp/mpptalk.c ++++ b/xpp/mpptalk.c +@@ -237,7 +237,7 @@ union XTALK_PDATA(MPP) { + MEMBER(MPP, TWS_PORT_GET_REPLY); + MEMBER(MPP, TWS_PWR_GET); + MEMBER(MPP, TWS_PWR_GET_REPLY); +-} PACKED members; ++} PACKED; + + /* + * Statuses +diff --git a/xpp/xtalk/xtalk_raw.c b/xpp/xtalk/xtalk_raw.c +index 49e47d5..251a502 100644 +--- a/xpp/xtalk/xtalk_raw.c ++++ b/xpp/xtalk/xtalk_raw.c +@@ -48,7 +48,7 @@ CMD_DEF(XTALK, ACK, + + union XTALK_PDATA(XTALK) { + MEMBER(XTALK, ACK); +-} PACKED members; ++} PACKED; + + const struct xtalk_protocol xtalk_raw_proto = { + .name = "XTALK-RAW", +diff --git a/xpp/xtalk/xtalk_sync.c b/xpp/xtalk/xtalk_sync.c +index 18a5cad..ffa79d2 100644 +--- a/xpp/xtalk/xtalk_sync.c ++++ b/xpp/xtalk/xtalk_sync.c +@@ -60,7 +60,7 @@ union XTALK_PDATA(XTALK) { + MEMBER(XTALK, ACK); + MEMBER(XTALK, PROTO_GET); + MEMBER(XTALK, PROTO_GET_REPLY); +-} PACKED members; ++} PACKED; + + const struct xtalk_protocol xtalk_sync_proto = { + .name = "XTALK-SYNC", diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch new file mode 100644 index 000000000000..9575966435e7 --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch @@ -0,0 +1,19 @@ +--- dahdi-tools-3.1.0/Makefile.am.o 2020-01-09 12:23:37.943059915 +0200 ++++ dahdi-tools-3.1.0/Makefile.am 2020-01-09 12:23:58.863036654 +0200 +@@ -1,7 +1,7 @@ + ACLOCAL_AMFLAGS = -I m4 + + LEGACY_MAKE = \ +- $(MAKE) -f $(srcdir)/Makefile.legacy \ ++ +$(MAKE) -f $(srcdir)/Makefile.legacy \ + top_srcdir=$(top_srcdir) \ + srcdir=$(srcdir) + +@@ -131,7 +131,6 @@ + install -m644 init.conf.sample $(DESTDIR)$(dahdiconfdir)/init.conf + install -m644 blacklist.sample $(DESTDIR)$(sysconfdir)/modprobe.d/dahdi-blacklist.conf + install -m644 modprobe.conf.sample $(DESTDIR)$(sysconfdir)/modprobe.d/dahdi.conf +- $(LEGACY_MAKE) config + + dahdiconfdir = @sysconfdir@/dahdi + dahdiconf_DATA = \ diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch new file mode 100644 index 000000000000..75f6c1a93eee --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch @@ -0,0 +1,61 @@ +From bc45d96413902e0ded093908bc3a02410d799e24 Mon Sep 17 00:00:00 2001 +From: Jaco Kroon <jaco@uls.co.za> +Date: Thu, 11 May 2023 17:28:02 +0200 +Subject: [PATCH] Fix compilation with LTO. + +--- + xpp/echo_loader.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/xpp/echo_loader.c b/xpp/echo_loader.c +index 827f6ef..adfb1f4 100644 +--- a/xpp/echo_loader.c ++++ b/xpp/echo_loader.c +@@ -409,7 +409,7 @@ UINT32 Oct6100UserGetTime(tPOCT6100_GET_TIME f_pTime) + struct timeval tv; + unsigned long long total_usecs; + unsigned int mask = ~0; +- ++ + gettimeofday(&tv, 0); + total_usecs = (((unsigned long long)(tv.tv_sec)) * 1000000) + + (((unsigned long long)(tv.tv_usec))); +@@ -564,7 +564,7 @@ UINT32 Oct6100UserDriverReadBurstApi(tPOCT6100_READ_BURST_PARAMS f_pBurstParams) + return cOCT6100_ERR_OK; + } + +-inline int get_ver(struct astribank *astribank) ++static inline int get_ver(struct astribank *astribank) + { + return spi_send(astribank, 0, 0, 1, 1); + } +@@ -647,7 +647,7 @@ UINT32 init_octasic(char *filename, struct astribank *astribank, struct span_spe + /* General parameters */ + OpenChip.fEnableChannelRecording = TRUE; + +- /* Chip ID.*/ ++ /* Chip ID.*/ + OpenChip.ulUserChipId = 1; + + /* Set the max number of accesses to 1024 to speed things up */ +@@ -775,7 +775,7 @@ UINT32 init_octasic(char *filename, struct astribank *astribank, struct span_spe + ChannelOpen.VqeConfig.fRinDcOffsetRemoval = TRUE; + ChannelOpen.VqeConfig.fSinDcOffsetRemoval = TRUE; + +- ChannelOpen.VqeConfig.ulComfortNoiseMode = cOCT6100_COMFORT_NOISE_NORMAL; ++ ChannelOpen.VqeConfig.ulComfortNoiseMode = cOCT6100_COMFORT_NOISE_NORMAL; + /* cOCT6100_COMFORT_NOISE_NORMAL + cOCT6100_COMFORT_NOISE_EXTENDED, + cOCT6100_COMFORT_NOISE_OFF, +@@ -824,7 +824,7 @@ UINT32 init_octasic(char *filename, struct astribank *astribank, struct span_spe + ChannelOpen.VqeConfig.fRinDcOffsetRemoval = TRUE; + ChannelOpen.VqeConfig.fSinDcOffsetRemoval = TRUE; + +- ChannelOpen.VqeConfig.ulComfortNoiseMode = cOCT6100_COMFORT_NOISE_NORMAL; ++ ChannelOpen.VqeConfig.ulComfortNoiseMode = cOCT6100_COMFORT_NOISE_NORMAL; + /* cOCT6100_COMFORT_NOISE_NORMAL + cOCT6100_COMFORT_NOISE_EXTENDED, + cOCT6100_COMFORT_NOISE_OFF, +-- +2.39.3 + diff --git a/net-misc/dahdi-tools/files/dahdi.init2 b/net-misc/dahdi-tools/files/dahdi.init2 new file mode 100644 index 000000000000..d3abf3c4e61e --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi.init2 @@ -0,0 +1,36 @@ +#!/sbin/openrc-run +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need net +} + +checkconfig() { + if [ ! -f /etc/dahdi/system.conf ]; then + eerror "/etc/dahdi/system.conf not found. Nothing to do." + return 1 + fi + + return 0 +} + +start() { + checkconfig || return 1 + + ebegin "Starting DAHDI" + /usr/sbin/dahdi_cfg + eend $? + + if [ $? -eq 0 -a -r /etc/fxotune.conf ]; then + ebegin "Loading DAHDI fxotune.conf" + /usr/sbin/fxotune -s + eend $? + fi +} + +stop() { + ebegin "Stopping DAHDI" + /usr/sbin/dahdi_cfg -s + eend +} diff --git a/net-misc/dahdi-tools/metadata.xml b/net-misc/dahdi-tools/metadata.xml new file mode 100644 index 000000000000..41312228e19d --- /dev/null +++ b/net-misc/dahdi-tools/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>jaco@uls.co.za</email> + <name>Jaco Kroon</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <use> + <flag name="ppp">Enables PPP/DAHDIRAS support</flag> + </use> + <upstream> + <remote-id type="github">asterisk/dahdi-tools</remote-id> + </upstream> +</pkgmetadata> |