gentoo auto-resync : 12:05:2023 - 05:48:13

4 files changed, 141 insertions, 1 deletions

diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest
index 5b5d19337c3e..edad9f8c668b 100644
--- a/net-misc/dahdi-tools/Manifest
+++ b/net-misc/dahdi-tools/Manifest
@@ -6,8 +6,11 @@ AUX dahdi-tools-3.1.0-cplusplusexternc.patch 695 BLAKE2B 8b3cbe872786017759d11bf
 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
-MISC metadata.xml 474 BLAKE2B 05062875e00c015c39cce4432a8197606dcbe1d40efb3058843c05defedd04304581a449b7a1abeb37ac96c5e6c9559ef9b36f7cbe1123783cc1822a25c5ee78 SHA512 bd60b375dd7863a16f525eb82c7c97d2a93032a93963ab764523fb774692b2ad107cb69eab4eacc695d67316307b91bac8e299a9c3d2689894d9dc174516c2a7
+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.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-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/metadata.xml b/net-misc/dahdi-tools/metadata.xml
index c3fad2fc57e4..41312228e19d 100644
--- a/net-misc/dahdi-tools/metadata.xml
+++ b/net-misc/dahdi-tools/metadata.xml
@@ -12,4 +12,7 @@
   <use>
     <flag name="ppp">Enables PPP/DAHDIRAS support</flag>
   </use>
+  <upstream>
+    <remote-id type="github">asterisk/dahdi-tools</remote-id>
+  </upstream>
 </pkgmetadata>