diff options
Diffstat (limited to 'net-dialup')
32 files changed, 612 insertions, 514 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/metadata.xml b/net-dialup/openl2tp/metadata.xml index c19954bbe39f..1e52fda2e8ab 100644 --- a/net-dialup/openl2tp/metadata.xml +++ b/net-dialup/openl2tp/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>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> -</maintainer> +<!-- maintainer-needed --> <use> <flag name="client">Enable l2tp client.</flag> <flag name="dmalloc">Enable debugging using <pkg>dev-libs/dmalloc</pkg>.</flag> 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/ppp/files/ppp-2.5.0-openssl-pkgconfig.patch b/net-dialup/ppp/files/ppp-2.5.0-openssl-pkgconfig.patch new file mode 100644 index 000000000000..893b623a4ea5 --- /dev/null +++ b/net-dialup/ppp/files/ppp-2.5.0-openssl-pkgconfig.patch @@ -0,0 +1,79 @@ +https://bugs.gentoo.org/905442 +https://github.com/ppp-project/ppp/pull/438 + +From 9b4bdca70081abbad26277b009ef9c4ab7e276d0 Mon Sep 17 00:00:00 2001 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Thu, 2 Nov 2023 11:26:18 +0530 +Subject: [PATCH] Fix linking error with lld linkers (#438) + +When using lld linker, build fails with + +ld.lld: error: /usr/lib/gcc/x86_64-pc-linux-gnu/12/../../../../lib64/Scrt1.o is incompatible with elf32-i386 +ld.lld: error: /usr/lib/gcc/x86_64-pc-linux-gnu/12/../../../../lib64/crti.o is incompatible with elf32-i386 +ld.lld: error: /usr/lib/llvm/16/bin/../../../../lib/clang/16/lib/linux + +The fix is to check pkg-config first, and not force manual -L /usr/lib. +If pkg-config succeeded, then we don't bother with -L /usr/lib + +Our guess is this what the actual intention was based upon the coments + +if pkg-config is installed and openssl has installed a .pc file, +then use that information and don't search ssldirs + +First found on gentoo linux with llvm profile, please check out Bug: +section of the commit for more info and a complete build log. + +Bug: https://bugs.gentoo.org/905442 + +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +Co-authored-by: Sam James <sam@gentoo.org> +--- + m4/ax_check_openssl.m4 | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4 +index 8ae39cae6..39154c856 100644 +--- a/m4/ax_check_openssl.m4 ++++ b/m4/ax_check_openssl.m4 +@@ -55,6 +55,20 @@ AC_DEFUN([AX_CHECK_OPENSSL], [ + ]) + + AS_IF([test "${with_openssl}" != "no"], [ ++ # if pkg-config is installed and openssl has installed a .pc file, ++ # then use that information and don't search ssldirs ++ AC_PATH_PROG([PKG_CONFIG], [pkg-config]) ++ if test x"$PKG_CONFIG" != x""; then ++ OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null` ++ if test $? = 0; then ++ OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null` ++ OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null` ++ found=true ++ fi ++ fi ++ ]) ++ ++ AS_IF([test "${with_openssl}" != "no" && test ! ${found}], [ + OPENSSL_INCLUDES= + for ssldir in $ssldirs; do + AC_MSG_CHECKING([for openssl/ssl.h in $ssldir]) +@@ -69,20 +83,6 @@ AC_DEFUN([AX_CHECK_OPENSSL], [ + AC_MSG_RESULT([no]) + ]) + done]) +- +- AS_IF([test "${with_openssl}" != "no" && test ! ${found}], [ +- # if pkg-config is installed and openssl has installed a .pc file, +- # then use that information and don't search ssldirs +- AC_PATH_PROG([PKG_CONFIG], [pkg-config]) +- if test x"$PKG_CONFIG" != x""; then +- OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null` +- if test $? = 0; then +- OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null` +- OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null` +- found=true +- fi +- fi +- ]) + + AS_IF([test "${with_openssl}" != "no" && test ${found}], [ + diff --git a/net-dialup/ppp/files/ppp-2.5.0-pam-pkgconfig.patch b/net-dialup/ppp/files/ppp-2.5.0-pam-pkgconfig.patch new file mode 100644 index 000000000000..40488fee96b7 --- /dev/null +++ b/net-dialup/ppp/files/ppp-2.5.0-pam-pkgconfig.patch @@ -0,0 +1,81 @@ +https://github.com/ppp-project/ppp/pull/479 + +From c73498fad415d99aa566b11256938272e62b22dd Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Tue, 5 Mar 2024 14:41:10 -0500 +Subject: [PATCH] Use pkg-config to detect PAM when possible + +Signed-off-by: Mike Gilbert <floppym@gentoo.org> +--- + m4/ax_check_pam.m4 | 50 ++++++++++++++++++++-------------------------- + 1 file changed, 22 insertions(+), 28 deletions(-) + +diff --git a/m4/ax_check_pam.m4 b/m4/ax_check_pam.m4 +index b17a7573c..7ebd79b61 100644 +--- a/m4/ax_check_pam.m4 ++++ b/m4/ax_check_pam.m4 +@@ -26,34 +26,28 @@ + AC_DEFUN([AX_CHECK_PAM], [ + AC_ARG_WITH([pam], + [AS_HELP_STRING([--with-pam=DIR], +- [With libpam support, see ftp.redhat.com:/pub/pam])], +- [ +- case "$withval" in +- "" | y | ye | yes) +- pamdirs="/usr/local /usr/lib /usr" +- ;; +- n | no) +- with_pam="no" +- ;; +- *) +- pamdirs="$withval" +- ;; +- esac +- ]) ++ [With libpam support, see ftp.redhat.com:/pub/pam])]) + +- if [ test "x${with_pam}" != "xno" ] ; then +- PAM_LIBS="-lpam" +- for pamdir in $pamdirs; do +- AC_MSG_CHECKING([for pam_appl.h in $pamdir]) +- if test -f "$pamdir/include/security/pam_appl.h"; then +- PAM_CFLAGS="-I$pamdir/include" +- PAM_LDFLAGS="-L$pamdir/lib" +- AC_MSG_RESULT([yes]) +- break +- else +- AC_MSG_RESULT([no]) +- fi +- done ++ AS_IF([test "$with_pam" != "no"], [ ++ AS_CASE(["$with_pam"], ++ [""|yes], [PKG_CHECK_MODULES([PAM], [pam], [pamdirs=], ++ [pamdirs="/usr/local /usr/lib /usr"])], ++ [pamdirs="$with_pam"]) ++ ++ AS_IF([test -n "$pamdirs"], [ ++ PAM_LIBS="-lpam" ++ for pamdir in $pamdirs; do ++ AC_MSG_CHECKING([for pam_appl.h in $pamdir]) ++ if test -f "$pamdir/include/security/pam_appl.h"; then ++ PAM_CFLAGS="-I$pamdir/include" ++ PAM_LDFLAGS="-L$pamdir/lib" ++ AC_MSG_RESULT([yes]) ++ break ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ done ++ ]) + + # try the preprocessor and linker with our new flags, + # being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS +@@ -87,7 +81,7 @@ AC_DEFUN([AX_CHECK_PAM], [ + AC_SUBST([PAM_CFLAGS]) + AC_SUBST([PAM_LIBS]) + AC_SUBST([PAM_LDFLAGS]) +- fi ++ ]) + AM_CONDITIONAL(WITH_LIBPAM, test "x${with_pam}" != "xno") + ]) + diff --git a/net-dialup/ppp/files/ppp-2.5.0-radius-mppe.patch b/net-dialup/ppp/files/ppp-2.5.0-radius-mppe.patch new file mode 100644 index 000000000000..7bb63c964605 --- /dev/null +++ b/net-dialup/ppp/files/ppp-2.5.0-radius-mppe.patch @@ -0,0 +1,167 @@ +https://github.com/ppp-project/ppp/pull/463 +https://bugs.gentoo.org/915686 + +From 77693b89fed6d4110184789f8e7dfd31710f3190 Mon Sep 17 00:00:00 2001 +From: Jaco Kroon <jaco@uls.co.za> +Date: Thu, 23 Nov 2023 14:54:42 +0200 +Subject: [PATCH] radius: fix the MPPE key decryption for the second-half of + the key block. + +During he refactor in commit 4cb90c1 the key material used to decrypt +the second-half of the encrypted block was accidentally updated from: + +MD5(radius_secret + crypt[0..15]); to: + +MD5(radius_secret + crypt[0..15] + salt) + +Which would obviously mismatch. + +This also refactors back into what I believe to be a more readable block +with lower nesting and more comprehensive error reporting. + +Closes: #453 +Signed-off-by: Jaco Kroon <jaco@uls.co.za> +--- + pppd/plugins/radius/radius.c | 115 +++++++++++++++++------------------ + 1 file changed, 55 insertions(+), 60 deletions(-) + +diff --git a/pppd/plugins/radius/radius.c b/pppd/plugins/radius/radius.c +index c73ca0b53..e99bc7511 100644 +--- a/pppd/plugins/radius/radius.c ++++ b/pppd/plugins/radius/radius.c +@@ -897,80 +897,75 @@ radius_setmppekeys2(VALUE_PAIR *vp, REQUEST_INFO *req_info) + memcpy(plain, crypt, 32); + + ctx = PPP_MD_CTX_new(); +- if (ctx) { +- +- if (PPP_DigestInit(ctx, PPP_md5())) { +- +- if (PPP_DigestUpdate(ctx, req_info->secret, strlen(req_info->secret))) { +- +- if (PPP_DigestUpdate(ctx, req_info->request_vector, AUTH_VECTOR_LEN)) { +- +- if (PPP_DigestUpdate(ctx, salt, 2)) { +- +- buflen = sizeof(buf); +- if (PPP_DigestFinal(ctx, buf, &buflen)) { +- +- status = 1; +- } +- } +- } +- } +- } +- +- PPP_MD_CTX_free(ctx); ++ if (!ctx) { ++ error("RADIUS: Error creating PPP_MD_CTX for MS-MPPE-%s-Key attribute", type); ++ return -1; + } + +- if (status) { +- +- for (i = 0; i < 16; i++) { +- plain[i] ^= buf[i]; +- } ++ buflen = sizeof(buf); ++ if (!PPP_DigestInit(ctx, PPP_md5())) { ++ error("RADIUS: Error setting hash algorithm to MD5 for MS-MPPE-%s-Key attribute", type); ++ } else if (!PPP_DigestUpdate(ctx, req_info->secret, strlen(req_info->secret))) { ++ error("RADIUS: Error mixing in radius secret for MS-MPPE-%s-Key attribute", type); ++ } else if (!PPP_DigestUpdate(ctx, req_info->request_vector, AUTH_VECTOR_LEN)) { ++ error("RADIUS: Error mixing in request vector for MS-MPPE-%s-Key attribute", type); ++ } else if (!PPP_DigestUpdate(ctx, salt, 2)) { ++ error("RADIUS: Error mixing in salt for MS-MPPE-%s-Key attribute", type); ++ } else if (!PPP_DigestFinal(ctx, buf, &buflen)) { ++ error("RADIUS: Error finalizing key buffer for MS-MPPE-%s-Key attribute", type); ++ } else { ++ status = 1; ++ } + +- if (plain[0] != 16) { +- error("RADIUS: Incorrect key length (%d) for MS-MPPE-%s-Key attribute", +- (int) plain[0], type); +- return -1; +- } ++ PPP_MD_CTX_free(ctx); + +- status = 0; +- ctx = PPP_MD_CTX_new(); +- if (ctx) { +- +- if (PPP_DigestInit(ctx, PPP_md5())) { ++ if (!status) ++ return -1; + +- if (PPP_DigestUpdate(ctx, req_info->secret, strlen(req_info->secret))) { ++ for (i = 0; i < 16; i++) { ++ plain[i] ^= buf[i]; ++ } + +- if (PPP_DigestUpdate(ctx, crypt, 16)) { ++ if (plain[0] != 16) { ++ error("RADIUS: Incorrect key length (%d) for MS-MPPE-%s-Key attribute", ++ (int) plain[0], type); ++ return -1; ++ } + +- if (PPP_DigestUpdate(ctx, salt, 2)) { ++ status = 0; ++ ctx = PPP_MD_CTX_new(); ++ if (!ctx) { ++ error("RADIUS: Error creating PPP_MD_CTX for MS-MPPE-%s-Key(2) attribute", type); ++ return -1; ++ } + +- buflen = sizeof(buf); +- if (PPP_DigestFinal(ctx, buf, &buflen)) { ++ buflen = sizeof(buf); + +- status = 1; +- } +- } +- } +- } +- } ++ if (!PPP_DigestInit(ctx, PPP_md5())) { ++ error("RADIUS: Error setting hash algorithm to MD5 for MS-MPPE-%s-Key(2) attribute", type); ++ } else if (!PPP_DigestUpdate(ctx, req_info->secret, strlen(req_info->secret))) { ++ error("RADIUS: Error mixing in radius secret for MS-MPPE-%s-Key(2) attribute", type); ++ } else if (!PPP_DigestUpdate(ctx, crypt, 16)) { ++ error("RADIUS: Error mixing in crypt vector for MS-MPPE-%s-Key(2) attribute", type); ++ } else if (!PPP_DigestFinal(ctx, buf, &buflen)) { ++ error("RADIUS: Error finalizing key buffer for MS-MPPE-%s-Key(2) attribute", type); ++ } else { ++ status = 1; ++ } + +- PPP_MD_CTX_free(ctx); +- } ++ PPP_MD_CTX_free(ctx); + +- if (status) { ++ if (!status) ++ return -1; + +- plain[16] ^= buf[0]; /* only need the first byte */ ++ plain[16] ^= buf[0]; /* only need the first byte */ + +- if (vp->attribute == PW_MS_MPPE_SEND_KEY) { +- mppe_set_keys(plain + 1, NULL, 16); +- } else { +- mppe_set_keys(NULL, plain + 1, 16); +- } +- return 0; +- } ++ if (vp->attribute == PW_MS_MPPE_SEND_KEY) { ++ mppe_set_keys(plain + 1, NULL, 16); ++ } else { ++ mppe_set_keys(NULL, plain + 1, 16); + } +- +- return -1; ++ return 0; + } + #endif /* PPP_WITH_MPPE */ + diff --git a/net-dialup/ppp/ppp-2.5.0-r3.ebuild b/net-dialup/ppp/ppp-2.5.0-r3.ebuild deleted file mode 100644 index f1649c66765c..000000000000 --- a/net-dialup/ppp/ppp-2.5.0-r3.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info pam tmpfiles - -PATCH_TARBALL_NAME="${PN}-2.4.9-patches-03" -DESCRIPTION="Point-to-Point Protocol (PPP)" -HOMEPAGE="https://ppp.samba.org/" -SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz - https://raw.githubusercontent.com/ppp-project/ppp/${P}/contrib/pppgetpass/pppgetpass.8" - -LICENSE="BSD GPL-2" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="activefilter atm gtk pam systemd" - -DEPEND=" - dev-libs/openssl:0= - virtual/libcrypt:= - activefilter? ( net-libs/libpcap ) - atm? ( net-dialup/linux-atm ) - gtk? ( x11-libs/gtk+:2 ) - pam? ( sys-libs/pam ) - systemd? ( sys-apps/systemd ) -" -RDEPEND="${DEPEND} - !<net-misc/netifrc-0.7.1-r2" -BDEPEND="virtual/pkgconfig" -PDEPEND="net-dialup/ppp-scripts" - -PATCHES=( - "${FILESDIR}"/ppp-2.5.0-passwordfd-read-early.patch - "${FILESDIR}"/ppp-2.5.0-pidfile.patch -) - -pkg_setup() { - local CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY" - local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)" - local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline" - ERROR_PPP_ASYNC+=" (optional, but highly recommended)" - local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline" - WARNING_PPP_SYNC_TTY+=" (optional; used by 'sync' pppd option)" - if use activefilter ; then - CONFIG_CHECK+=" ~PPP_FILTER" - local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)" - fi - CONFIG_CHECK+=" ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE" - local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)" - local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)" - local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)" - CONFIG_CHECK+=" ~PPPOE ~PACKET" - local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by pppoe plugin)" - local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by pppoe plugin)" - if use atm ; then - CONFIG_CHECK+=" ~PPPOATM" - local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)" - fi - - linux-info_pkg_setup -} - -src_configure() { - local args=( - --localstatedir="${EPREFIX}"/var - --runstatedir="${EPREFIX}"/run - $(use_enable systemd) - $(use_with atm) - $(use_with pam) - $(use_with activefilter pcap) - $(use_with gtk) - --enable-cbcp - ) - econf "${args[@]}" -} - -src_install() { - default - - find "${ED}" -name '*.la' -type f -delete || die - - if use pam; then - pamd_mimic_system ppp auth account session - fi - - insinto /etc/modprobe.d - newins "${FILESDIR}/modules.ppp" ppp.conf - - dosbin scripts/p{on,off,log} - doman scripts/pon.1 - dosym pon.1 /usr/share/man/man1/poff.1 - dosym pon.1 /usr/share/man/man1/plog.1 - - # Adding misc. specialized scripts to doc dir - dodoc -r scripts - - if use gtk ; then - dosbin contrib/pppgetpass/pppgetpass.{gtk,vt} - newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass - else - newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass - fi - - newtmpfiles "${FILESDIR}/pppd.tmpfiles" pppd.conf - - # Missing from upstream tarball - # https://github.com/ppp-project/ppp/pull/412 - #doman contrib/pppgetpass/pppgetpass.8 - doman "${DISTDIR}/pppgetpass.8" -} - -pkg_postinst() { - tmpfiles_process pppd.conf -} diff --git a/net-dialup/ppp/ppp-2.5.0-r4.ebuild b/net-dialup/ppp/ppp-2.5.0-r4.ebuild deleted file mode 100644 index c459aa21366d..000000000000 --- a/net-dialup/ppp/ppp-2.5.0-r4.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info pam tmpfiles - -DESCRIPTION="Point-to-Point Protocol (PPP)" -HOMEPAGE="https://ppp.samba.org/" -SRC_URI=" - https://download.samba.org/pub/ppp/${P}.tar.gz - https://raw.githubusercontent.com/ppp-project/ppp/${P}/contrib/pppgetpass/pppgetpass.8 -" - -LICENSE="BSD GPL-2" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86" -IUSE="activefilter atm gtk pam selinux systemd" - -DEPEND=" - dev-libs/openssl:0= - virtual/libcrypt:= - activefilter? ( net-libs/libpcap ) - atm? ( net-dialup/linux-atm ) - gtk? ( x11-libs/gtk+:2 ) - pam? ( sys-libs/pam ) - systemd? ( sys-apps/systemd ) -" -RDEPEND=" - ${DEPEND} - !<net-misc/netifrc-0.7.1-r2 - selinux? ( sec-policy/selinux-ppp ) -" -BDEPEND="virtual/pkgconfig" -PDEPEND="net-dialup/ppp-scripts" - -PATCHES=( - "${FILESDIR}"/ppp-2.5.0-passwordfd-read-early.patch - "${FILESDIR}"/ppp-2.5.0-pidfile.patch - "${FILESDIR}"/${P}-radiusclient.conf-parsing.patch -) - -pkg_setup() { - local CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY" - local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)" - local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline" - ERROR_PPP_ASYNC+=" (optional, but highly recommended)" - local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline" - WARNING_PPP_SYNC_TTY+=" (optional; used by 'sync' pppd option)" - if use activefilter ; then - CONFIG_CHECK+=" ~PPP_FILTER" - local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)" - fi - CONFIG_CHECK+=" ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE" - local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)" - local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)" - local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)" - CONFIG_CHECK+=" ~PPPOE ~PACKET" - local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by pppoe plugin)" - local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by pppoe plugin)" - if use atm ; then - CONFIG_CHECK+=" ~PPPOATM" - local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)" - fi - - linux-info_pkg_setup -} - -src_configure() { - local args=( - --localstatedir="${EPREFIX}"/var - --runstatedir="${EPREFIX}"/run - $(use_enable systemd) - $(use_with atm) - $(use_with pam) - $(use_with activefilter pcap) - $(use_with gtk) - --enable-cbcp - ) - econf "${args[@]}" -} - -src_install() { - default - - find "${ED}" -name '*.la' -type f -delete || die - - if use pam; then - pamd_mimic_system ppp auth account session - fi - - insinto /etc/modprobe.d - newins "${FILESDIR}/modules.ppp" ppp.conf - - dosbin scripts/p{on,off,log} - doman scripts/pon.1 - dosym pon.1 /usr/share/man/man1/poff.1 - dosym pon.1 /usr/share/man/man1/plog.1 - - # Adding misc. specialized scripts to doc dir - dodoc -r scripts - - if use gtk ; then - dosbin contrib/pppgetpass/pppgetpass.{gtk,vt} - newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass - else - newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass - fi - - newtmpfiles "${FILESDIR}/pppd.tmpfiles" pppd.conf - - # Missing from upstream tarball - # https://github.com/ppp-project/ppp/pull/412 - #doman contrib/pppgetpass/pppgetpass.8 - doman "${DISTDIR}/pppgetpass.8" -} - -pkg_postinst() { - tmpfiles_process pppd.conf -} diff --git a/net-dialup/ppp/ppp-2.5.0-r6.ebuild b/net-dialup/ppp/ppp-2.5.0-r7.ebuild index 17550d021c06..a68b9f331754 100644 --- a/net-dialup/ppp/ppp-2.5.0-r6.ebuild +++ b/net-dialup/ppp/ppp-2.5.0-r7.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit linux-info pam tmpfiles +inherit autotools linux-info pam tmpfiles DESCRIPTION="Point-to-Point Protocol (PPP)" HOMEPAGE="https://ppp.samba.org/" @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="BSD GPL-2" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="activefilter atm gtk pam selinux systemd" DEPEND=" @@ -37,7 +37,10 @@ PDEPEND="net-dialup/ppp-scripts" PATCHES=( "${FILESDIR}"/ppp-2.5.0-passwordfd-read-early.patch "${FILESDIR}"/ppp-2.5.0-pidfile.patch - "${FILESDIR}"/${P}-radiusclient.conf-parsing.patch + "${FILESDIR}"/ppp-2.5.0-radiusclient.conf-parsing.patch + "${FILESDIR}"/ppp-2.5.0-openssl-pkgconfig.patch + "${FILESDIR}"/ppp-2.5.0-pam-pkgconfig.patch + "${FILESDIR}"/ppp-2.5.0-radius-mppe.patch ) pkg_setup() { @@ -68,6 +71,7 @@ pkg_setup() { src_prepare() { default + eautoreconf # Set the right paths in radiusclient.conf sed -e "s:/usr/local/etc:/etc:" \ 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.ebuild b/net-dialup/wvdial/wvdial-1.61-r1.ebuild index 2d5386b307d0..6ab8c7ee055f 100644 --- a/net-dialup/wvdial/wvdial-1.61.ebuild +++ b/net-dialup/wvdial/wvdial-1.61-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit readme.gentoo-r1 DESCRIPTION="Excellent program to automatically configure PPP sessions" @@ -11,15 +12,12 @@ 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} +DEPEND=">=net-libs/wvstreams-4.4" +RDEPEND="${DEPEND} net-dialup/ppp:= " +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${P}-destdir.patch" diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest index d41bb83fe4f3..44643fe065a4 100644 --- a/net-dialup/xl2tpd/Manifest +++ b/net-dialup/xl2tpd/Manifest @@ -1,2 +1 @@ -DIST xl2tpd-1.3.16.tar.gz 531861 BLAKE2B 2f809c8623c1a77ee538014d4ff3389e32e142f8cd6acad1657198323835574dd3d062e5ed6ee81ded5c4a1a65d8e200759ed6013884bb655ca6f5eef5333931 SHA512 d92bd9070c0e78ba1f4f7ee38be9e87d1f869fe240433f2fd7d1c974f1bce1573ab7aeb5922f316e53bd0fd4580b6152d585b1e0e0cd6fb01ef8fa85d9509b16 DIST xl2tpd-1.3.18.tar.gz 534937 BLAKE2B ce745855709ac79d5d6aefbe2fb31a4e799f01c6ad31ad2e436c276933e079116daf32bcdc97b7459e4792aa2bd1ddbb600d798d8b28d1432681ffd319fe0829 SHA512 d1114777de5f3895429409fd5474da91fe9e9c218615eb989c9294de3e4e36dea7d8ea880a9b1b1ca18760e5709c8b8156c80d81401db479eaf215c026c3d861 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.16-r1.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.16-r1.ebuild deleted file mode 100644 index ba9b95f7fef1..000000000000 --- a/net-dialup/xl2tpd/xl2tpd-1.3.16-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ) - -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 -} diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.18-r1.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.18-r1.ebuild index 7a4b224fb5ef..6bc1880d53d6 100644 --- a/net-dialup/xl2tpd/xl2tpd-1.3.18-r1.ebuild +++ b/net-dialup/xl2tpd/xl2tpd-1.3.18-r1.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 @@ -11,7 +11,7 @@ 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" +KEYWORDS="amd64 ~arm arm64 ~loong ~mips ~ppc ppc64 ~riscv x86" IUSE="+kernel" DEPEND=" diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.18.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.18-r2.ebuild index 22e9c14e4623..ece525226f09 100644 --- a/net-dialup/xl2tpd/xl2tpd-1.3.18.ebuild +++ b/net-dialup/xl2tpd/xl2tpd-1.3.18-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 @@ -24,6 +24,11 @@ RDEPEND=" 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 \ |