diff options
Diffstat (limited to 'net-dialup')
23 files changed, 332 insertions, 244 deletions
diff --git a/net-dialup/accel-ppp/metadata.xml b/net-dialup/accel-ppp/metadata.xml index 1218f07536cb..3b16196c8a63 100644 --- a/net-dialup/accel-ppp/metadata.xml +++ b/net-dialup/accel-ppp/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="ipoe">Build IPoE kernel module</flag> <flag name="libtomcrypt">Support crypto algorithms through <pkg>dev-libs/libtomcrypt</pkg> instead of <pkg>dev-libs/openssl</pkg></flag> diff --git a/net-dialup/cutecom/cutecom-0.60.0_rc1.ebuild b/net-dialup/cutecom/cutecom-0.60.0_rc1.ebuild index 741dd613ef18..96f3fbcdc992 100644 --- a/net-dialup/cutecom/cutecom-0.60.0_rc1.ebuild +++ b/net-dialup/cutecom/cutecom-0.60.0_rc1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/cutecom/cutecom/-/archive/v${MY_PV}/cutecom-v${MY_PV LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="" DEPEND=" diff --git a/net-dialup/dial/dial-1.2-r2.ebuild b/net-dialup/dial/dial-1.2-r2.ebuild index 37302de0f879..9ff829f99715 100644 --- a/net-dialup/dial/dial-1.2-r2.ebuild +++ b/net-dialup/dial/dial-1.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="A simple client for DWUN" HOMEPAGE="http://dwun.sourceforge.net/" -SRC_URI="mirror://sourceforge/dwun/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/dwun/${P}.tar.gz" LICENSE="MIT" SLOT="0" diff --git a/net-dialup/dwun/dwun-0.96e-r6.ebuild b/net-dialup/dwun/dwun-0.96e-r6.ebuild index f7668226daa2..2acd33a674c2 100644 --- a/net-dialup/dwun/dwun-0.96e-r6.ebuild +++ b/net-dialup/dwun/dwun-0.96e-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools toolchain-funcs DESCRIPTION="Dialer Without a Useful Name (DWUN)" HOMEPAGE="http://dwun.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="MIT GPL-2" # GPL-2 only for init script SLOT="0" diff --git a/net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild b/net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild index 4a827010c90a..865e061690cc 100644 --- a/net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild +++ b/net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools flag-o-matic linux-info DESCRIPTION="Tools for ATM" HOMEPAGE="http://linux-atm.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r7.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r7.ebuild deleted file mode 100644 index 015edfdbda9a..000000000000 --- a/net-dialup/lrzsz/lrzsz-0.12.20-r7.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs - -DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols" -HOMEPAGE="https://www.ohse.de/uwe/software/lrzsz.html" -SRC_URI=" - https://www.ohse.de/uwe/releases/${P}.tar.gz - https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-m4-${PV}.tar.bz2 -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="nls" - -DEPEND="nls? ( virtual/libintl )" -BDEPEND="nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${PN}-autotools.patch - "${FILESDIR}"/${PN}-implicit-decl.patch - "${FILESDIR}"/${P}-automake-1.12.patch - "${FILESDIR}"/${P}-automake-1.13.patch - "${FILESDIR}"/${P}-gettext-0.20.patch - "${FILESDIR}"/${P}-AR.patch - "${FILESDIR}"/${P}-configure-clang16.patch - "${FILESDIR}"/${P}-gettext-0.22.patch - "${FILESDIR}"/${P}-disable-nls.patch -) - -DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \ - README{,.cvs,.gettext,.isdn4linux,.tests} THANKS TODO ) - -src_prepare() { - default - - # automake is unhappy if this is missing - >> config.rpath || die - # This is too old. Remove it so automake puts in a newer copy. - rm missing || die - # Autoheader does not like seeing this file. - rm acconfig.h || die - # embed default m4 files in case gettext is not installed - mv "${WORKDIR}"/m4 . || die - - eautoreconf -} - -src_configure() { - tc-export CC - - econf $(use_enable nls) -} - -src_test() { - # Don't use check target. - # See bug #120748 before changing this function. - emake vcheck -} - -src_install() { - default - - local x - for x in {r,s}{b,x,z} ; do - dosym l${x} /usr/bin/${x} - dosym l${x:0:1}z.1 /usr/share/man/man1/${x}.1 - [ "${x:1:1}" = "z" ] || dosym l${x:0:1}z.1 /usr/share/man/man1/l${x}.1 - done -} diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r8.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r8.ebuild index 0e842edb2981..7b098c0c729c 100644 --- a/net-dialup/lrzsz/lrzsz-0.12.20-r8.ebuild +++ b/net-dialup/lrzsz/lrzsz-0.12.20-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="nls" DEPEND="nls? ( virtual/libintl )" diff --git a/net-dialup/mingetty/mingetty-1.08-r3.ebuild b/net-dialup/mingetty/mingetty-1.08-r3.ebuild index 74f1b8f75842..e5ee029f9ba1 100644 --- a/net-dialup/mingetty/mingetty-1.08-r3.ebuild +++ b/net-dialup/mingetty/mingetty-1.08-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="A compact getty program for virtual consoles only" HOMEPAGE="https://sourceforge.net/projects/mingetty" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-dialup/openl2tp/openl2tp-1.8-r2.ebuild b/net-dialup/openl2tp/openl2tp-1.8-r2.ebuild index eefc5286c396..f59cc991ddff 100644 --- a/net-dialup/openl2tp/openl2tp-1.8-r2.ebuild +++ b/net-dialup/openl2tp/openl2tp-1.8-r2.ebuild @@ -7,7 +7,7 @@ inherit linux-info DESCRIPTION="Userspace tools for kernel L2TP implementation" HOMEPAGE="https://sourceforge.net/projects/openl2tp/" -SRC_URI="mirror://sourceforge/openl2tp/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/openl2tp/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-dialup/pptpclient/pptpclient-1.10.0.ebuild b/net-dialup/pptpclient/pptpclient-1.10.0.ebuild index 502695ace3f5..8a6fca4a43d7 100644 --- a/net-dialup/pptpclient/pptpclient-1.10.0.ebuild +++ b/net-dialup/pptpclient/pptpclient-1.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ MY_CMD="pptp-command-20130515" DESCRIPTION="Linux client for PPTP" HOMEPAGE="http://pptpclient.sourceforge.net/" -SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz +SRC_URI="https://downloads.sourceforge.net/pptpclient/${MY_P}.tar.gz https://dev.gentoo.org/~pinkbyte/distfiles/pptpclient/${MY_CMD}.bz2" SLOT="0" diff --git a/net-dialup/radiusclient-ng/radiusclient-ng-0.5.6-r2.ebuild b/net-dialup/radiusclient-ng/radiusclient-ng-0.5.6-r2.ebuild index f64147e4d656..84438ae2febe 100644 --- a/net-dialup/radiusclient-ng/radiusclient-ng-0.5.6-r2.ebuild +++ b/net-dialup/radiusclient-ng/radiusclient-ng-0.5.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools toolchain-funcs DESCRIPTION="RadiusClient NextGeneration - library for RADIUS clients" HOMEPAGE="https://sourceforge.net/projects/radiusclient-ng.berlios/" -SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}.berlios/${P}.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/net-dialup/rp-l2tp/rp-l2tp-0.4-r4.ebuild b/net-dialup/rp-l2tp/rp-l2tp-0.4-r4.ebuild index 6c4a2cdd3db7..ac95494e3a99 100644 --- a/net-dialup/rp-l2tp/rp-l2tp-0.4-r4.ebuild +++ b/net-dialup/rp-l2tp/rp-l2tp-0.4-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools toolchain-funcs DESCRIPTION="User-space implementation of L2TP for Linux and other UNIX systems" HOMEPAGE="https://sourceforge.net/projects/rp-l2tp/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2+ GPL-2" SLOT="0" diff --git a/net-dialup/rp-l2tp/rp-l2tp-0.4-r5.ebuild b/net-dialup/rp-l2tp/rp-l2tp-0.4-r5.ebuild index 550a22d585a9..65dafe8d3fa8 100644 --- a/net-dialup/rp-l2tp/rp-l2tp-0.4-r5.ebuild +++ b/net-dialup/rp-l2tp/rp-l2tp-0.4-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools toolchain-funcs DESCRIPTION="User-space implementation of L2TP for Linux and other UNIX systems" HOMEPAGE="https://sourceforge.net/projects/rp-l2tp/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2+ GPL-2" SLOT="0" diff --git a/net-dialup/sendpage/Manifest b/net-dialup/sendpage/Manifest index bd187e384919..ad721b63df94 100644 --- a/net-dialup/sendpage/Manifest +++ b/net-dialup/sendpage/Manifest @@ -1 +1,2 @@ DIST sendpage-1.001.tar.gz 127130 BLAKE2B a90ff3334fd1f3c112bf852f2858caa2264659c195b11542fb1e67047f19298982b767af555da5aadbb621ed9765dd5d9d80449df445222b2eec20b1fb66366b SHA512 694f7eb8afd3a73d1322d51140b5eb473a3d697613a88d1b90fb0368e9eb25ec4cee8ed018841076fcd8370420d6c9f437f84af873b31cccb36c16f91a01cb3d +DIST sendpage-1.001001.tar.gz 112211 BLAKE2B 42694d745be8ce662bbbcf4fb80ef830b3f1a0d7af65e7c4c8514b60559d831915f77efa1dbd8585747aa4bb54e124a8eb68684b7baddc0fa5587d887f37aa85 SHA512 2f714cabc233176ca8891f7806d86fcd998f7a469446334f9b555d0f3934f8830510db2fa046a08d6fa688028f3bf14e5bb03af8edb9dfe37ab993244f0a3353 diff --git a/net-dialup/sendpage/sendpage-1.1.0-r4.ebuild b/net-dialup/sendpage/sendpage-1.1.0-r4.ebuild index d64a0d18100e..d6be53d2a47a 100644 --- a/net-dialup/sendpage/sendpage-1.1.0-r4.ebuild +++ b/net-dialup/sendpage/sendpage-1.1.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,11 +8,11 @@ inherit perl-module MY_P=${PN}-1.001 DESCRIPTION="Dialup alphapaging software" -HOMEPAGE="https://www.sendpage.org/" +HOMEPAGE="https://sendpage.github.io/" SRC_URI="https://www.sendpage.org/download/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" diff --git a/net-dialup/sendpage/sendpage-1.1.1.ebuild b/net-dialup/sendpage/sendpage-1.1.1.ebuild new file mode 100644 index 000000000000..e16b6e8102c0 --- /dev/null +++ b/net-dialup/sendpage/sendpage-1.1.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit perl-module + +MY_P="${PN}-1.001001" + +DESCRIPTION="Dialup alphapaging software" +HOMEPAGE="https://sendpage.github.io/" +SRC_URI="https://sendpage.github.io/download/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +DEPEND=" + acct-group/sms + acct-user/sendpage + dev-perl/DBI + dev-perl/Device-SerialPort + dev-perl/MailTools + dev-perl/Net-SNPP + dev-perl/Sys-Hostname-Long + dev-perl/Test-MockObject + virtual/perl-libnet +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/1.1.0-makefile.patch ) + +src_install() { + perl-module_src_install + insinto /etc + doins sendpage.cf + newinitd "${FILESDIR}"/sendpage.initd sendpage + diropts -o sendpage -g sms -m0770 + keepdir /var/spool/sendpage + docompress -x /usr/share/doc/${PF}/text/ + docinto text/ + dodoc docs/* +} diff --git a/net-dialup/sercd/sercd-3.0.0-r3.ebuild b/net-dialup/sercd/sercd-3.0.0-r3.ebuild index 70de7d9ff344..730b5f321112 100644 --- a/net-dialup/sercd/sercd-3.0.0-r3.ebuild +++ b/net-dialup/sercd/sercd-3.0.0-r3.ebuild @@ -5,7 +5,7 @@ EAPI=8 DESCRIPTION="RFC2217-compliant serial port redirector" HOMEPAGE="https://sourceforge.net/projects/sercd/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r3.ebuild b/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r3.ebuild deleted file mode 100644 index c8dc23c17618..000000000000 --- a/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r3.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info - -DESCRIPTION="Firmware and configuration instructions for Alcatel SpeedTouch USB modems" -HOMEPAGE="http://www.speedtouch.com/" -SRC_URI="http://www.speedtouch.com/download/drivers/USB/SpeedTouch330_firmware_${PV//./}.zip" - -# Taken from http://www.speedtouch.com/driver_upgrade_lx_3.0.1.2.htm -LICENSE="SpeedTouch-USB-Firmware" -SLOT="0" -KEYWORDS="~amd64 x86" - -RDEPEND="net-dialup/ppp" -DEPEND="app-arch/unzip" - -S="${WORKDIR}" - -src_install() { - local FILE_VER="${PV#*.}" - FILE_VER="${PV%%.*}.${FILE_VER//./}" # {major_ver}.{minor_digits} - - # Extract the "stage 1" portion of the firmware - dd if=KQD6_${FILE_VER} of=speedtch-1.bin.2 \ - ibs=1 obs=991 count=991 skip=36 &> /dev/null \ - || die "Extraction of stage 1 firmware (step 1) failed" - - dd if=ZZZL_${FILE_VER} of=speedtch-1.bin.4 \ - ibs=1 obs=935 count=935 skip=32 &> /dev/null \ - || die "Extraction of stage 1 firmware (step 2) failed" - - # Extract the "stage 2" portion of the firmware - dd if=KQD6_${FILE_VER} of=speedtch-2.bin.2 \ - ibs=1 obs=762650 count=762650 skip=1027 &> /dev/null \ - || die "Extraction of stage 2 firmware (step 1) failed" - - dd if=ZZZL_${FILE_VER} of=speedtch-2.bin.4 \ - ibs=1 obs=775545 count=775545 skip=967 &> /dev/null \ - || die "Extraction of stage 2 firmware (step 2) failed" - - # Copy to the firmware directory - insinto /lib/firmware - insopts -m 600 - doins speedtch-{1,2}.bin.{2,4} - - # Symlinks for other revisions of the modem - pushd "${D}/lib/firmware" >/dev/null || die - for n in 1 2 ; do - for rev in 0 1 ; do - ln -sfn speedtch-${n}.bin.2 speedtch-${n}.bin.${rev} - done - # Seems like a reasonable guess, for revision 3 - ln -sfn speedtch-${stub}${n}.bin.4 speedtch-${n}.bin.3 - done - popd >/dev/null || die - - # Documentation necessary to complete the setup - dodoc "${FILESDIR}/README" -} - -pkg_postinst() { - [[ -e /etc/hotplug/usb.usermap ]] && grep -E -q " 0x06[bB]9 +0x4061 " /etc/hotplug/usb.usermap && \ - ewarn "Please remove the SpeedTouch line from /etc/hotplug/usb.usermap" - - # Check kernel configuration - local CONFIG_CHECK="~FW_LOADER ~NET ~PACKET ~ATM ~NETDEVICES ~USB_DEVICEFS ~USB_ATM ~USB_SPEEDTOUCH \ - ~PPP ~PPPOATM ~PPPOE ~ATM_BR2684" - local WARNING_PPPOATM="CONFIG_PPPOATM:\t is not set (required for PPPoA links)" - local WARNING_PPPOE="CONFIG_PPPOE:\t is not set (required for PPPoE links)" - local WARNING_ATM_BR2684="CONFIG_ATM_BR2684:\t is not set (required for PPPoE links)" - check_extra_config - echo - - # Check user-space for PPPoA support - if ! has_version net-dialup/ppp[atm] ; then - ewarn "Run the following command if connecting via PPPoA protocol:" - ewarn " euse -E atm && emerge net-dialup/ppp" - echo - fi - # Check user-space for PPPoE support - if ! has_version net-dialup/linux-atm ; then - ewarn "Run the following command if connecting via PPPoE protocol:" - ewarn " emerge net-dialup/linux-atm" - echo - fi - - ewarn "To complete the installation, you must read the documentation in" - ewarn " ${ROOT}usr/share/doc/${PF}" -} diff --git a/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r4.ebuild b/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r4.ebuild new file mode 100644 index 000000000000..1431187f2355 --- /dev/null +++ b/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r4.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo linux-info optfeature + +DESCRIPTION="Firmware and configuration instructions for Alcatel SpeedTouch USB modems" +HOMEPAGE="http://www.speedtouch.com/" +SRC_URI="http://www.speedtouch.com/download/drivers/USB/SpeedTouch330_firmware_${PV//./}.zip" +S=${WORKDIR} + +# Taken from http://www.speedtouch.com/driver_upgrade_lx_3.0.1.2.htm +LICENSE="SpeedTouch-USB-Firmware" +SLOT="0" +KEYWORDS="~amd64 x86" + +RDEPEND="net-dialup/ppp" +BDEPEND="app-arch/unzip" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != buildonly ]]; then + local CONFIG_CHECK="~FW_LOADER ~NET ~PACKET ~ATM ~NETDEVICES ~USB_DEVICEFS ~USB_ATM ~USB_SPEEDTOUCH \ + ~PPP ~PPPOATM ~PPPOE ~ATM_BR2684" + local WARNING_PPPOATM="CONFIG_PPPOATM:\t is not set (required for PPPoA links)" + local WARNING_PPPOE="CONFIG_PPPOE:\t is not set (required for PPPoE links)" + local WARNING_ATM_BR2684="CONFIG_ATM_BR2684:\t is not set (required for PPPoE links)" + check_extra_config + fi +} + +src_compile() { + local VER=$(ver_rs 2-4 '') # {major_ver}.{minor_digits} + + # Extract the "stage 1" portion of the firmware + edob -m "Extraction of stage 1 firmware (step 1)" \ + dd if=KQD6_${VER} of="${T}/speedtch-1.bin.2" ibs=1 obs=991 count=991 skip=36 + edob -m "Extraction of stage 1 firmware (step 2)" \ + dd if=ZZZL_${VER} of="${T}/speedtch-1.bin.4" ibs=1 obs=935 count=935 skip=32 + + # Extract the "stage 2" portion of the firmware + edob -m "Extraction of stage 2 firmware (step 1)" \ + dd if=KQD6_${VER} of="${T}/speedtch-2.bin.2" ibs=1 obs=762650 count=762650 skip=1027 + edob -m "Extraction of stage 2 firmware (step 2)" \ + dd if=ZZZL_${VER} of="${T}/speedtch-2.bin.4" ibs=1 obs=775545 count=775545 skip=967 +} + +src_install() { + # Copy to the firmware directory + insinto /lib/firmware + insopts -m 600 + doins "${T}"/speedtch-{1,2}.bin.{2,4} + + # Symlinks for other revisions of the modem + for n in 1 2 ; do + dosym speedtch-${n}.bin.2 /lib/firmware/speedtch-${n}.bin.0 + dosym speedtch-${n}.bin.2 /lib/firmware/speedtch-${n}.bin.1 + # Seems like a reasonable guess, for revision 3 + dosym speedtch-${n}.bin.4 /lib/firmware/speedtch-${n}.bin.3 + done + + # Documentation necessary to complete the setup + dodoc "${FILESDIR}/README" +} + +pkg_postinst() { + [[ -e /etc/hotplug/usb.usermap ]] && grep -E -q " 0x06[bB]9 +0x4061 " /etc/hotplug/usb.usermap && \ + ewarn "Please remove the SpeedTouch line from /etc/hotplug/usb.usermap" + + optfeature "connecting via PPPoA protocol" "net-dialup/ppp[atm]" + optfeature "connecting via PPPoE protocol" "net-dialup/linux-atm" + + ewarn "To complete the installation, you must read the documentation in" + ewarn " ${ROOT}/usr/share/doc/${PF}" +} diff --git a/net-dialup/wvdial/wvdial-1.61-r1.ebuild b/net-dialup/wvdial/wvdial-1.61-r1.ebuild index 1184b267e853..6ab8c7ee055f 100644 --- a/net-dialup/wvdial/wvdial-1.61-r1.ebuild +++ b/net-dialup/wvdial/wvdial-1.61-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://wvstreams.googlecode.com/files/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~hppa ppc sparc x86" DEPEND=">=net-libs/wvstreams-4.4" RDEPEND="${DEPEND} diff --git a/net-dialup/wvdial/wvdial-1.61.ebuild b/net-dialup/wvdial/wvdial-1.61.ebuild deleted file mode 100644 index 2d5386b307d0..000000000000 --- a/net-dialup/wvdial/wvdial-1.61.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit readme.gentoo-r1 - -DESCRIPTION="Excellent program to automatically configure PPP sessions" -HOMEPAGE="https://code.google.com/archive/p/wvstreams/" -SRC_URI="https://wvstreams.googlecode.com/files/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ppc sparc x86" -IUSE="" - -COMMON_DEPEND=">=net-libs/wvstreams-4.4" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" -RDEPEND="${COMMON_DEPEND} - net-dialup/ppp:= -" - -PATCHES=( - "${FILESDIR}/${P}-destdir.patch" - "${FILESDIR}/${P}-as-needed.patch" - "${FILESDIR}/${P}-parallel-make.patch" -) - -DOC_CONTENTS=" - Use wvdialconf to automagically generate a configuration file. - Users have to be member of the dialout AND the uucp group to use - wvdial -" - -src_configure() { - # Hand made configure... - ./configure || die -} - -src_install() { - default - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/net-dialup/xl2tpd/files/xl2tpd-1.3.18-r2-Pass-remotenumber-to-pppd.patch b/net-dialup/xl2tpd/files/xl2tpd-1.3.18-r2-Pass-remotenumber-to-pppd.patch new file mode 100644 index 000000000000..7d491b3c6542 --- /dev/null +++ b/net-dialup/xl2tpd/files/xl2tpd-1.3.18-r2-Pass-remotenumber-to-pppd.patch @@ -0,0 +1,116 @@ +From b81956418ca6590d8c3b1a6758dccc0f2f05eb54 Mon Sep 17 00:00:00 2001 +From: Jaco Kroon <jaco@uls.co.za> +Date: Tue, 18 Oct 2022 12:46:11 +0200 +Subject: [PATCH] Pass remotenumber to pppd. + +By default this will be the IP address of the remote peer, but it could +be the remote's number as provided by way of AVP should the newly added +'trust remotenumber' LNS option be set to yes. + +Signed-off-by: Jaco Kroon <jaco@uls.co.za> +--- + doc/l2tpd.conf.sample | 1 + + doc/xl2tpd.conf.5 | 6 ++++++ + file.c | 17 +++++++++++++++++ + file.h | 1 + + xl2tpd.c | 8 ++++++++ + 5 files changed, 33 insertions(+) + +diff --git a/doc/l2tpd.conf.sample b/doc/l2tpd.conf.sample +index 8f8fcb5..f6f0359 100644 +--- a/doc/l2tpd.conf.sample ++++ b/doc/l2tpd.conf.sample +@@ -47,6 +47,7 @@ + ; rx bps = 10000000 ; Receive tunnel speed + ; tx bps = 10000000 ; Transmit tunnel speed + ; bps = 100000 ; Define both receive and transmit speed in one option ++; trust remotenumber = no ; Trust dialing number AVP? + + ; [lac marko] ; Example VPN LAC definition + ; lns = lns.marko.net ; * Who is our LNS? +diff --git a/doc/xl2tpd.conf.5 b/doc/xl2tpd.conf.5 +index 2b1acbc..173a453 100644 +--- a/doc/xl2tpd.conf.5 ++++ b/doc/xl2tpd.conf.5 +@@ -175,6 +175,12 @@ This will enable the debug for pppd. + .B pass peer + Pass the peer's IP address to pppd as ipparam. Enabled by default. + ++.TP ++.B trust remotenumber ++When this is set to yes xl2tpd will trust the dialing number AVP and provide ++that as the remotenumber to pppd rather than the peer's IP address. Default is ++not trusted. ++ + .TP + .B pppoptfile + Specify the path for a file which contains pppd configuration parameters +diff --git a/file.c b/file.c +index 17dc377..29fcb66 100644 +--- a/file.c ++++ b/file.c +@@ -676,6 +676,22 @@ int set_pass_peer (char *word, char *value, int context, void *item) + return 0; + } + ++int set_trust_remotenumber (char *word, char *value, int context, void *item) ++{ ++ switch (context & ~CONTEXT_DEFAULT) ++ { ++ case CONTEXT_LNS: ++ if (set_boolean (word, value, &(((struct lns *) item)->trust_remotenumber))) ++ return -1; ++ break; ++ default: ++ snprintf (filerr, sizeof (filerr), "'%s' not valid in this context\n", ++ word); ++ return -1; ++ } ++ return 0; ++} ++ + int set_pppoptfile (char *word, char *value, int context, void *item) + { + struct lac *l = (struct lac *) item; +@@ -1611,6 +1627,7 @@ struct keyword words[] = { + {"hostname", &set_hostname}, + {"ppp debug", &set_debug}, + {"pass peer", &set_pass_peer}, ++ {"trust remotenumber", &set_trust_remotenumber}, + {"pppoptfile", &set_pppoptfile}, + {"call rws", &set_rws}, + {"tunnel rws", &set_rws}, +diff --git a/file.h b/file.h +index a2707c2..9d76359 100644 +--- a/file.h ++++ b/file.h +@@ -97,6 +97,7 @@ struct lns + int proxyauth; /* Allow proxy authentication? */ + int debug; /* Debug PPP? */ + int pass_peer; /* Pass peer IP to pppd as ipparam? */ ++ int trust_remotenumber; /* Whether or not to trust remotely supplied "Dialing Number" AVP */ + char pppoptfile[STRLEN]; /* File containing PPP options */ + struct tunnel *t; /* Tunnel of this, if it's ready */ + }; +diff --git a/xl2tpd.c b/xl2tpd.c +index 3195988..b551146 100644 +--- a/xl2tpd.c ++++ b/xl2tpd.c +@@ -495,6 +495,14 @@ int start_pppd (struct call *c, struct ppp_opts *opts) + } + + { ++ stropt[pos++] = strdup("remotenumber"); ++ if (c->dialing[0] && (!c->lns || c->lns->trust_remotenumber)) { ++ /* if a remotenumber is available, and we're a LAC or the remote "dialing number" AVP is trusted */ ++ stropt[pos++] = strdup(c->dialing); ++ } else { ++ stropt[pos++] = strdup(IPADDY(c->container->peer.sin_addr)); ++ } ++ + struct ppp_opts *p = opts; + int maxn_opts = sizeof(stropt) / sizeof(stropt[0]) - 1; + while (p && pos < maxn_opts) +-- +2.44.2 + diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.18-r2.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.18-r2.ebuild new file mode 100644 index 000000000000..ece525226f09 --- /dev/null +++ b/net-dialup/xl2tpd/xl2tpd-1.3.18-r2.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd toolchain-funcs tmpfiles + +DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon" +HOMEPAGE="https://github.com/xelerance/xl2tpd" +SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" +IUSE="+kernel" + +DEPEND=" + net-libs/libpcap + >=sys-kernel/linux-headers-2.6" + +RDEPEND=" + ${DEPEND} + net-dialup/ppp" + +DOCS=( CREDITS README.md BUGS CHANGES TODO doc/README.patents ) + +PATCHES=( + "${FILESDIR}/xl2tpd-1.3.18-r1-close-calls-when-pppd-terminates.patch" + "${FILESDIR}/xl2tpd-1.3.18-r2-Pass-remotenumber-to-pppd.patch" +) + +src_prepare() { + default + sed -e 's:/var/run/:/run/:' -i \ + file.h \ + l2tp.h \ + xl2tpd-control.c \ + doc/l2tp-secrets.5 \ + doc/xl2tpd.8 \ + doc/xl2tpd.conf.5 \ + || die "Error updating /var/run to /run" +} + +src_compile() { + tc-export CC + local OSFLAGS="-DLINUX" + use kernel && OSFLAGS+=" -DUSE_KERNEL" + emake OSFLAGS="${OSFLAGS}" +} + +src_install() { + emake PREFIX=/usr DESTDIR="${D}" install + + newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd + + systemd_dounit "${FILESDIR}"/xl2tpd.service + dotmpfiles "${FILESDIR}"/xl2tpd.conf + + einstalldocs + + insinto /etc/xl2tpd + newins doc/l2tpd.conf.sample xl2tpd.conf + insopts -m 0600 + newins doc/l2tp-secrets.sample l2tp-secrets +} + +pkg_postinst() { + tmpfiles_process xl2tpd.conf +} |