diff options
Diffstat (limited to 'net-dialup')
43 files changed, 235 insertions, 1541 deletions
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz Binary files differindex b01ac23bae37..9e268eb257b7 100644 --- a/net-dialup/Manifest.gz +++ b/net-dialup/Manifest.gz diff --git a/net-dialup/cutecom/Manifest b/net-dialup/cutecom/Manifest index 202c7f001079..9bf559529b6f 100644 --- a/net-dialup/cutecom/Manifest +++ b/net-dialup/cutecom/Manifest @@ -1,6 +1,4 @@ AUX cutecom-0.51.0-fix-for-qt-5.15.0.patch 615 BLAKE2B a39889b204d87c0812673098985b2d3bad919b10a7d923d589c0b88fa818bce77f5b08d8cf7c221a23f5f61ade8dac36f436c5be99c9b96322a1e4c2ebc4873f SHA512 5cbbb75beb4082be6e1d515b4d37a874d8a507a854e6844b6f0479af02db7575d54020c21e72fc5c2b6670de32b7edad18f7abe4ee69793782acca0ef09e4e05 -DIST cutecom-v0.51.0.tar.bz2 1296457 BLAKE2B 407bbe12fb4303e98589720c3fe9bf96a4112c816e64a3a32227d07a64c1efbb5b33c364d1f3f06ff67c9bc935c0bf62de14849b554508eaffacda1f65e7fad9 SHA512 67857977ab6444509662be4d27059e3c4cb766a69b78d806f4cd3d6cb7306d53094337fb384133a616ae397ac4d4d7c86347285a2d68f88fbf105d73ebd97731 DIST cutecom-v0.60.0-RC1.tar.bz2 1291319 BLAKE2B 8d73a51916d8d3f103ba6215d0bf2865337aa82f95d12be512001abd845cac08f9c9b6fb9022574aff42fef958c90676ae0828d1597879c798bd1ffe4bec68ba SHA512 92a210ab846f452287693add8db52833fd83814f59a2be8de304278dbc711b2a5dc0fdaadf877a588ad023849370151788d1ea678ba777fe0a4a600429669151 -EBUILD cutecom-0.51.0-r1.ebuild 872 BLAKE2B 159a3406cab8fc0d9a64aa0212a17ffddda142867810c33cc21f186eeedc4363fef62ba0555551d0952c1833404c1bfdfde1df996c0deb97705b1d0db01e7ec5 SHA512 3d423abf0842d5f92689bca836a64972ddf00f20cb4cec5176f1dcda1c587f1b60a5ec89551bd0ff761affdae00b6c226d770fd8162955fd7da4851c69d93775 -EBUILD cutecom-0.60.0_rc1.ebuild 791 BLAKE2B 1de867fbac460704e2381f9b3cb1fef3c719452eab2505cea842941401af6782cb85956dda416f9f3bdeb93aaf766041d7db5a01b883e5b0a1bc287c18080e53 SHA512 4fbc1eb143186c5fb231e834c8a930eab105fd3c042eb013e0b951404721c8e2dc32f907088f5e4a33d36e19a5fc48f2c732f38fa9f24971e51608c6a55c8e05 +EBUILD cutecom-0.60.0_rc1.ebuild 781 BLAKE2B 98bedde8008345b3076e55c1594e322a54b06363e19d9e2cf3ba74325b45d8693b24edc71a15cd882f144c31bd1a93d84658c0037028d18d3c73f35df21e76ee SHA512 77392300cd62080c626b1a8309dc06f83eca99cfd3541740d75e0b004c0fdcff54175e9bcb7d4b9514987a9782b07381fc766799a1ea543161ce532f5b869e93 MISC metadata.xml 519 BLAKE2B 14a09fbeb2789be854016914a644aae0d4245a25d21d53d53fac693bdc1f471f1482dbe88fd32407ed6acf00dcfd4b48df9ae2d59f683011ebd20a939cd78cdb SHA512 97136d5cb93a17a515ba2d89b497e3798325a01a763c4ed5ebeb0dd2186b564d0d2040e624192cdb9812b71c3d70c1ba7381939e9eef7153c673d4b0a25f61c7 diff --git a/net-dialup/cutecom/cutecom-0.51.0-r1.ebuild b/net-dialup/cutecom/cutecom-0.51.0-r1.ebuild deleted file mode 100644 index 683af0a6bb22..000000000000 --- a/net-dialup/cutecom/cutecom-0.51.0-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake desktop xdg - -DESCRIPTION="A serial terminal, like minicom, written in Qt" -HOMEPAGE="https://gitlab.com/cutecom/cutecom" -SRC_URI="https://gitlab.com/cutecom/cutecom/-/archive/v${PV}/cutecom-v${PV}.tar.bz2" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="" - -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtserialport:5 - dev-qt/qtwidgets:5" -RDEPEND="${DEPEND} - net-dialup/lrzsz" - -S="${WORKDIR}/cutecom-v${PV}" - -PATCHES=( "${FILESDIR}"/${P}-fix-for-qt-5.15.0.patch ) - -src_prepare() { - cmake_src_prepare - - sed -i \ - -e '/Path/d' \ - -e '/Terminal/s/0/false/' \ - "${PN}.desktop" || die 'sed on desktop file failed' -} - -src_install() { - cmake_src_install - domenu "${PN}.desktop" - doicon "distribution/${PN}.png" -} diff --git a/net-dialup/cutecom/cutecom-0.60.0_rc1.ebuild b/net-dialup/cutecom/cutecom-0.60.0_rc1.ebuild index 96f3fbcdc992..5284edf7cd27 100644 --- a/net-dialup/cutecom/cutecom-0.60.0_rc1.ebuild +++ b/net-dialup/cutecom/cutecom-0.60.0_rc1.ebuild @@ -10,11 +10,11 @@ MY_PV=${PV/_rc/-RC} DESCRIPTION="A serial terminal, like minicom, written in Qt" HOMEPAGE="https://gitlab.com/cutecom/cutecom" SRC_URI="https://gitlab.com/cutecom/cutecom/-/archive/v${MY_PV}/cutecom-v${MY_PV}.tar.bz2" +S="${WORKDIR}/cutecom-v${MY_PV}" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" -IUSE="" +KEYWORDS="amd64 ~arm64 x86" DEPEND=" dev-qt/qtbase:6 @@ -22,8 +22,6 @@ DEPEND=" RDEPEND="${DEPEND} net-dialup/lrzsz" -S="${WORKDIR}/cutecom-v${MY_PV}" - src_prepare() { cmake_src_prepare diff --git a/net-dialup/freeradius-client/Manifest b/net-dialup/freeradius-client/Manifest index 61c71379f291..1068b720257e 100644 --- a/net-dialup/freeradius-client/Manifest +++ b/net-dialup/freeradius-client/Manifest @@ -1,5 +1,5 @@ AUX freeradius-client-1.1.7-ar-configure.in.patch 241 BLAKE2B fc58d9477275ddbe7724adba4cbd7d1f4a5a134ca355aa41375376e056c321e22fe4f355602c0cffa70cb532cfee32f2c0728cea93c9e0d579cceea6425c8147 SHA512 654f142be0ff695ab4b9c8c9fa52e3a448c3d0027b5e7d8e776323e49be0cf268cb7cab82a5dd2ccf067a7089a8ff618296755973af1155ab40034cd93a6bea8 AUX freeradius-client-1.1.7-configure-clang16.patch 464 BLAKE2B 9f86c7afbce923f3fa0b25375d6f17ff3a14d16a8f301d48cf4b5c7ce69472acf7a37c0f29644b5b3dbc3720af876cf54dd12e06f63cd1e4f8d2019b33337681 SHA512 ff2f0375f27ef0f3581ebe6ebaeedd2caab1707c7070cddcbfccb74ecce3d75037a8d88df090db30f4411d0a54892ff84e0a470a7dfe7bbffec8ba08606edcb2 DIST freeradius-client-1.1.7.tar.gz 433141 BLAKE2B 3a1ba65eb8b66d28362fd66a905af0a4e12b67e664da2c64dab87616e3787cded58d0c3bf56705bdb879d41f1a9a984cf5256b06eeb382209caebf748f679e12 SHA512 20e79ec97da79f46b334e1c2880803a692885a4038196a4d016094d349f675e2d0521d921140c5ab06703008619417f7a20d3e90cdfc7b3578faccbd232be0ce -EBUILD freeradius-client-1.1.7-r3.ebuild 1112 BLAKE2B 511f825c0e0b8ba0a6fb6419ea828003112f029c12c4839a44f3349d857981929f4788fa08a7881df3312fac6d6c4ccfcb5a4b44ecf150134ef92fdbe3874bb7 SHA512 3a0860bbb12fb924a28e9e324c6e876389581afd253c76a4e5d11ce315b2ad0e823338f9b1cbce6b3dca30f93564ade9ab8c1dde7efe01a9bc0d53dad956b9a2 -MISC metadata.xml 968 BLAKE2B 4acfd02adf18b713a1387d558a28b3b4a2fdec5da4e77c63e4e46e904d0a810b52a6c6b742e226e33a0d146b51727351bca9a906a24bde881c4dfa86076a24c8 SHA512 c9104ecee243d1f9d5be004b372caf3b384143263e2b963d39dff45a3152d4046dbe758787c9cc83ea6aa76aacbb20ce642a9c778a4a5a4f50ca2f40ac395f40 +EBUILD freeradius-client-1.1.7-r3.ebuild 1263 BLAKE2B 4e05895bc9c60378a8eb14c4e782cba2b7c19caab40c3c45ed62eba48d768cceead44eab7730f7f943c4e27c4de83e64d16cf90a4cefe333417711240407248c SHA512 be5c9d15355d36be011af83b5ac284e89965234a5097b8fe6a114a4d0bb628811efabf49694430ec1904143efe39f30c549e164820b4c6092b3158edaa719e88 +MISC metadata.xml 1061 BLAKE2B cec0716b8c003cff3a87fdef39c3080a6585de910efa520481be630ae84b5d966ed4a44fe3a230a0c83e797b4f0911d0dfecce658c14048f8af524ffcea5979a SHA512 976a6b2497c71be68a0a9a07443382b2a736006060a0addc2f92270db900f710577f82da985e2de21dab62d119200814af6bbe3ec5277a18a914e9a3593fb369 diff --git a/net-dialup/freeradius-client/freeradius-client-1.1.7-r3.ebuild b/net-dialup/freeradius-client/freeradius-client-1.1.7-r3.ebuild index 45d79ae7e6ab..689d7739251d 100644 --- a/net-dialup/freeradius-client/freeradius-client-1.1.7-r3.ebuild +++ b/net-dialup/freeradius-client/freeradius-client-1.1.7-r3.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=7 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="FreeRADIUS Client framework" HOMEPAGE="https://wiki.freeradius.org/project/Radiusclient" @@ -40,6 +40,11 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/927175 + # https://github.com/FreeRADIUS/freeradius-client/issues/128 + filter-lto + local myeconfargs=( $(use_enable scp) $(use_enable shadow) diff --git a/net-dialup/freeradius-client/metadata.xml b/net-dialup/freeradius-client/metadata.xml index f5a1183d463f..2e322b52af0e 100644 --- a/net-dialup/freeradius-client/metadata.xml +++ b/net-dialup/freeradius-client/metadata.xml @@ -17,6 +17,9 @@ shell scripts and a utility to query the status of a (Merit) RADIUS server. </longdescription> + <upstream> + <remote-id type="github">FreeRADIUS/freeradius-client</remote-id> + </upstream> <use> <flag name="scp"> Add service type hints derived from username prefix diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest index 36f458f53198..352126168d34 100644 --- a/net-dialup/freeradius/Manifest +++ b/net-dialup/freeradius/Manifest @@ -4,6 +4,6 @@ AUX radius.conf-r6 599 BLAKE2B 35c97ec8a31577afc89bc4f6d7a1310624bea46c2a12ea3cc AUX radius.init-r4 753 BLAKE2B 18c83f704ac30d14d56ce8a2f5e3176dcd1aab83cc4525b728e3080e81470a9b4124af49459c69070d9c3ed67a95c7593b6d01f0259403fa9ceee43abd541f7c SHA512 8b05604a72a6a0dea3e654f36b13e1ed517d0c277d128475bcca768204d720b3cd9730e5776371818b8deb0f9fd099458bf5a3276ea9b61e3dbacafaaa527892 DIST freeradius-server-3.2.2.tar.bz2 3418998 BLAKE2B 584d1ff79cf3a75c79f5b24f9e47d7c8d8caee0d706eb47bb387300172f0699f904804d963aab8c252a21fe67f7885a47659b8cd9db5292a6d4db087d72e8e38 SHA512 91dc574560a1f75cafa8bc78c0676f0e3dae7154ecbb395e0e1f6738f78d8bcfe1bff122364452798fd0434c4056fd946799b8f29a1141398bf0542a37870689 DIST freeradius-server-3.2.3.tar.bz2 3454869 BLAKE2B 525204331a5b123dac7457c6adb755cbe9794dbff4a536ea665fc7d1cac97553e392b7b598741c2a9dd00c81decd00608499d6f25208e389b9f213f54977de84 SHA512 06767153e262a2baa2d0cc74099bc13c23b33c2316348b5dc8ec0f5834c028571bd09b8c01726a6eabeaab8fdc3050f40bfeba2d5b1c299585d1689abad365ce -EBUILD freeradius-3.2.2.ebuild 8351 BLAKE2B c25c6f717fe8517883441d2dea150349981e543b51a90d7f87b910b434dcecc72fcb6e44624d74f51df57e5537d29a90fd407edf1ef01acb502f9c558b470215 SHA512 8a19033e104314cc78d31ea26db6c55768faa7546a8e6904c2edc5eb7558367019e24e16d8130606c0fdc30496aad9f1278e75f3117f680370bd04e423ee2f24 -EBUILD freeradius-3.2.3.ebuild 8488 BLAKE2B 4af88577f6bbc8aac4b1d497cb5e59ba67219b5c67fcab0ea4e30db42f4cc5a21d5031a156f376f99d8838e53a72c7fd1e011e8861af6713b7b7a71ae17475fe SHA512 715662dea412c37d6d0f24b8fa577807d2d631229d1d8337d7f7e3c91173be2d04ab5cf6a0569e87f40817e793daf0fca4437647afc335c46130c8557c4e736c +EBUILD freeradius-3.2.2.ebuild 8351 BLAKE2B fae2f18f1f250ac37bbf77c38dd5bd490eea23dd12d42f0fc8833314c6529037c9478256e852fcb89a643411e06169e403c329d8c4ff917f3a80571ffc5d4416 SHA512 c7b3cfd2aca4b795bf643ef5d47edb1c5b2eaac9af8557d7cdb7f49763465729cdce819e42d573d7b2c6da5694b6d638405dba3d559ed26b3fea8c96a6680286 +EBUILD freeradius-3.2.3.ebuild 8488 BLAKE2B 710e3b0cca7f6195ccf9ccde322ade89ae68dfefea7be55d5505f605200bd6bf01be4017680aa673c1f7ccb4e93bccad6e406b6b0a487be7681f13855eb8f0af SHA512 debc73f15dcb245fdb3519dc5d7d8b8914c18557e2b8667edd04eb550bb5ddd492884a1f8227b78e4592715001fcf696c744cdb262592fbf5774f0ee298a90aa MISC metadata.xml 547 BLAKE2B fbe65a8fc88ee08561e984bd56da19cb4aaeb4d3f37ce35f97801c58b586e706d5bb0d30d44d5857470991f96ba87d2e45bf2dbbe36060a817b5722af00d3564 SHA512 d743d214deba32cf15adb403fdda4ffc3e7cf742d6e74e9bca9bd7ddad0246e6c9ebe7999722f54d721de847924a3c038b4f4b58e1048db34b7814697a9f785e diff --git a/net-dialup/freeradius/freeradius-3.2.2.ebuild b/net-dialup/freeradius/freeradius-3.2.2.ebuild index dbf8d6f192f4..279b2ed0a2cc 100644 --- a/net-dialup/freeradius/freeradius-3.2.2.ebuild +++ b/net-dialup/freeradius/freeradius-3.2.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) AUTOTOOLS_DEPEND=">=dev-build/autoconf-2.69" inherit autotools pam python-single-r1 systemd diff --git a/net-dialup/freeradius/freeradius-3.2.3.ebuild b/net-dialup/freeradius/freeradius-3.2.3.ebuild index 7353869966e0..609d57cfdeef 100644 --- a/net-dialup/freeradius/freeradius-3.2.3.ebuild +++ b/net-dialup/freeradius/freeradius-3.2.3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) AUTOTOOLS_DEPEND=">=dev-build/autoconf-2.69" inherit autotools pam python-single-r1 systemd diff --git a/net-dialup/isdn-firmware/Manifest b/net-dialup/isdn-firmware/Manifest index f8d1caf3f55c..ed2b108695a2 100644 --- a/net-dialup/isdn-firmware/Manifest +++ b/net-dialup/isdn-firmware/Manifest @@ -1,3 +1,3 @@ DIST i4lfirm-2011.8.29-lp152.8.37.x86_64.rpm 1274484 BLAKE2B 63a698adadeb0fe9e11533cf56d2cd026552e599e0e47dbe07694558af07aedfe51d626c4894c6b0cb59d49e85486de6d408405047be39eb1086361b4129f7eb SHA512 fac70bbe8983cfb02f53880c04e317f52a33b2972fd657b5dd375cb4924cf61efe8da8cb35448d39fc628599da35fa24f3b1275a0f76c1421bbaeab1e17713f9 -EBUILD isdn-firmware-2011.8.29.8.37.ebuild 662 BLAKE2B cec4760fa37b126fce6fa2d8df8d943e6dc23cb3fc1aa15546147c3add63bc3ddfc82a0555db748469216809bc385ce4517d3c521fc65b0f52d548c43b5f8240 SHA512 32eda736553dbb24e6553d4228995ef2c177023b7e5287f3288d462ea1652f4cfe009817e681b4cb57e00467fd7c7cecec2cf73615ff1922fa41352f7e06e32b +EBUILD isdn-firmware-2011.8.29.8.37.ebuild 665 BLAKE2B 152b5c6c67cd66be93a26faed169ff73393baaf1ba70ef3ff101cd630ca14f15bf855dad726dfa6510c22a2ca8756f72cc2449fd3fd74516925279dc2089b6bd SHA512 a91ae0c0a5a3a9f3518fc543c4887eb4eb5cba15ec4f1fadbb700fbd5321b02c3374b6e1fc80402c847d780b3c88511282bbdc8c254a325e23b7d85d0c873d23 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/net-dialup/isdn-firmware/isdn-firmware-2011.8.29.8.37.ebuild b/net-dialup/isdn-firmware/isdn-firmware-2011.8.29.8.37.ebuild index 8cd8bed27ef9..6dba2a61d018 100644 --- a/net-dialup/isdn-firmware/isdn-firmware-2011.8.29.8.37.ebuild +++ b/net-dialup/isdn-firmware/isdn-firmware-2011.8.29.8.37.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=8 @@ -19,7 +19,7 @@ SLOT="0" KEYWORDS="amd64 ppc x86" # Bug #827318 -BDEPEND="app-arch/xz-utils[extra-filters]" +BDEPEND="app-arch/xz-utils[extra-filters(+)]" S="${WORKDIR}/lib/firmware/isdn" diff --git a/net-dialup/lrzsz/Manifest b/net-dialup/lrzsz/Manifest index 887aa09fd596..633ae4e2b893 100644 --- a/net-dialup/lrzsz/Manifest +++ b/net-dialup/lrzsz/Manifest @@ -4,11 +4,12 @@ AUX lrzsz-0.12.20-automake-1.13.patch 454 BLAKE2B 19627ec86b92c5e1dfcd4404408b9a AUX lrzsz-0.12.20-c99.patch 714 BLAKE2B 5e475fd00cc6b49cf4b5a6ba54035fff9eee5a7d476825d127264f6295c4e625c987699a2c88fe806f9373d722c7992ee484a109be21c43847682bb7f272bb45 SHA512 940024654054dfe5a2f9fdb55c893ed58dffbbf98b95716e01691167503c4c6ae0b02ea7e16f1ae166921c1662fa6864ad4da9e50fdc679e77dde519a7e0a4d3 AUX lrzsz-0.12.20-configure-clang16.patch 283 BLAKE2B 93e58683157cb3da035d8974fe35ecd1b8569df44818bfbdd60d6f4e3e406a86d0b0ce41631c648fc0e3aa6640f753f3912f113caaf07a86a2ee8dc3067aadb9 SHA512 92b6cb4a7575413f63e62225b8c0f852a89703a732625ec7d589890546459a61762260547b6acb8efec87447407cec13e493eebd2610c6e2838f6ef66c06e239 AUX lrzsz-0.12.20-disable-nls.patch 616 BLAKE2B c90986a3b3acf8aecfdd0ccbdd07946ee4fd342db26506afbde872f0c9102a04227fe8e563c7f7bf85881884dad4f011a34bd238e070acf0d6e87a3d6ed5eb2f SHA512 df8535ec3035d6120d00d72c5e3fd1d4171d4e506af027dc9af6f7d1a24a09374b3ae2cf576ddef6aa4a49fee299a72a60b8d5503da353d9de95688a48a4f185 +AUX lrzsz-0.12.20-fix-integer-overflow.patch 672 BLAKE2B f6e8315b31bec6785f30de387a1f52a7c2de793e25acaab69ba5f6f2ff88b5308656fa1ada3f22d52eae2c081acb3f3379e847d8d647c6ec9c42ab5a241f4fc9 SHA512 925ee172d25eb10767a37d5e000bd6a650d68d4eb20af96e842931ab986578fd8804c6565c60ef25bcb59d595b5f3064b5ea5d23c607eb53055911e4e4931570 AUX lrzsz-0.12.20-gettext-0.20.patch 850 BLAKE2B f3d810b7335c33f1e28247cd7a68d50f939a8b6b4ad1d15839a22d46460627343c7515b13729c1cebd8b669310210ca985b17671e538deb9b4fcb9c42cbfd04f SHA512 39c140c7cef024604cd0148d32587176b3ab2e50a622bca2f02307bbf89ae62db3928a6defbcc3790bf1e35f30eaf0fa66e43174ff8dca8a86cb01bda4050b15 AUX lrzsz-0.12.20-gettext-0.22.patch 1016 BLAKE2B 415f2b2bbb9311bc306ab43f56df416cd66f4c08d95db81f473f284fa4d0618218ca53c55e1765480f2bfeb29b3d2efe7a78d012e26ef339262470ba556ed105 SHA512 0dbf6dc3e3bf6c91e194f19af6ded6c02fe5ad9ef9467669e4151dcaab15ab934a6b7a7e67c3be12ea7bbfa3f063b3932d5f9ce2e9a72976484e54dea329229a AUX lrzsz-autotools.patch 8725 BLAKE2B 8f499974f0184784d1e800a43e8fdd09b389bb2a2c48ae335708ca25eb2b7130b5554fcbb8217aa3833ffdf2d0756fe091df615351b4c23214e7889dbf2399aa SHA512 4ba98fb4a72d8fcc654741d57992598d56eded61e7b89c54d44edd7a609149e15d9948d777d70bf41137daa0b860c67e1212a3f38519434cb5d44546bfb94909 AUX lrzsz-implicit-decl.patch 428 BLAKE2B c08a244d292be32bb49fff6186cbe847c106dee67b3ea463860d1e6387e159af1b106e5f78ea5bce31c347cb7207c95116243fa515e4daafb23d2cc309776480 SHA512 7dd642aa6701671986e6ab1635935c7a8088ad5ee74131b7c486e2e87d748fc835798d1a8a291e85a80ba3f88328ce4f293a8dafb1ebd9924f1f31fb2bd3a7d7 DIST lrzsz-0.12.20.tar.gz 280938 BLAKE2B 86511ab112da849f5894f18c045f2c8a9dd4c4e97426c1d98c5b91aade6c39e26f4a7e5674e057c9596a240dfd3ef32053fcdc8ee58b33654cf15eec64779b1e SHA512 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12 DIST lrzsz-m4-0.12.20.tar.bz2 23959 BLAKE2B 933e43f80a40478baef77d69f81fcb04947f2d0afb87f777b0c000ea4223408bf3e55d687cf625ab4835fb30e274f7058ff09ee3b51ad90e09723cd3053ee038 SHA512 c8818381f2e5271bc2dd7d469c0a33a6b22d42d3159b41f168223473a8b03322f3ff91a49ce398e3ef5abe7b355d92b83b1429d0c6d450d19985a60e2e1190d4 -EBUILD lrzsz-0.12.20-r8.ebuild 1875 BLAKE2B 8eef9fef193ade5e247f4e51a4179d37838017ec4e14c5a43966fce85bcabd3a01bbd8e7dc4dad2ef578fb4056f3e1e0909fdb6ce382aae2a0192985b943167c SHA512 e73b7f36f01136c97053f80a47e82cf0c9a86087ea0910274fde5dbfac63f9be76de3e8ceaefaf284741ea04669f965abc0f7ec9431c0ef7290a15d26a026b57 +EBUILD lrzsz-0.12.20-r9.ebuild 1922 BLAKE2B acdd6f0b1e06bb18490f0a2e7f8d881a36c5f7043cb2042b529a13de76b447ab957532b0ad109035297833718ffdb7ff98796535f9e6c664882355958cf95ade SHA512 cfd444096f64424b7f4003c1ec1278c3c06bba057eaf299ff8a03520fda6d546e1a423edd2cb472f32c69b7b7d0718f411f903c13ec32867e1a196063fba564b MISC metadata.xml 333 BLAKE2B df605c89da2e450f542b023df0a51e50a6177752593c7b2e97fab91cade3550cb0a93ebade7edcd4e4569853987b57449226709d6fb96643a5057e2e80d986ae SHA512 806f343912c267d02df9ab3715f57a63c6457db97f67c0737114533fb99bf94ab2f8ebe5da839f4b19993d6d705be6efc549783d42100ee49b77e57ffbda7908 diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-fix-integer-overflow.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-fix-integer-overflow.patch new file mode 100644 index 000000000000..771b67dda473 --- /dev/null +++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-fix-integer-overflow.patch @@ -0,0 +1,23 @@ +https://src.fedoraproject.org/rpms/lrzsz/blob/rawhide/f/lrzsz-0.12.20.patch +https://bugs.gentoo.org/797247 + +diff -urN lrzsz-0.12.20/src/zm.c lrzsz-0.12.20.new/src/zm.c +--- lrzsz-0.12.20/src/zm.c Tue Dec 29 09:48:38 1998 ++++ lrzsz-0.12.20.new/src/zm.c Tue Oct 8 12:46:58 2002 +@@ -431,10 +431,12 @@ + VPRINTF(3,("zsdata: %lu %s", (unsigned long) length, + Zendnames[(frameend-ZCRCE)&3])); + crc = 0; +- do { +- zsendline(*buf); crc = updcrc((0377 & *buf), crc); +- buf++; +- } while (--length>0); ++ ++ for( ; length; length--) { ++ zsendline(*buf); crc = updcrc((0377 & *buf), crc); ++ buf++; ++ } ++ + xsendline(ZDLE); xsendline(frameend); + crc = updcrc(frameend, crc); + diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r8.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r9.ebuild index 7b098c0c729c..9e857e1741bb 100644 --- a/net-dialup/lrzsz/lrzsz-0.12.20-r8.ebuild +++ b/net-dialup/lrzsz/lrzsz-0.12.20-r9.ebuild @@ -31,6 +31,7 @@ PATCHES=( "${FILESDIR}"/${P}-gettext-0.22.patch "${FILESDIR}"/${P}-disable-nls.patch "${FILESDIR}"/${P}-c99.patch + "${FILESDIR}"/${P}-fix-integer-overflow.patch ) DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \ diff --git a/net-dialup/openl2tp/Manifest b/net-dialup/openl2tp/Manifest deleted file mode 100644 index a31df6641d2c..000000000000 --- a/net-dialup/openl2tp/Manifest +++ /dev/null @@ -1,25 +0,0 @@ -AUX examples/client.openl2tpd.conf 678 BLAKE2B 2b1388c53757848b07b2ca58714c73ce16b3329db95bf288997c43bdb006766a6ab312931d66f57af6ab2a3eb83c3178b2968879562f06c3a0b68d6524d61220 SHA512 146f26b90a15bd1d61d7993b450297cce4497428ec89d13366548e3b4ce182b8e2d2f80417b0720963b913fb9022bfedc975e96e30c7b18ed80508719663914c -AUX examples/server-radius.openl2tpd.conf 663 BLAKE2B 486a256b55f48fd6c57d24ea0be9c6e7fcfcd57740911213c019971556bc944e543173951f6c4dc052c47b1b9e31556aafd680bf5241c03d01b80f51df141ef0 SHA512 551ab062d6f12fef6afec75f3b79fb0cbe5c86b2313ed274933b8ac5102e111165af437dd4477d7065b97bf4ae47b68269d28f412431a412504e0fe0e2c0da45 -AUX examples/server.openl2tpd.conf 1095 BLAKE2B 04ba732fcba50b6adaec429d604f9b5f95c47afe988cdf890e0732ed59e26caeb13dbb80e559a36a33aa2d686d8531c98d83eb09441576587387597d9e2f19f9 SHA512 a7b7a98169f8a3c9a1db0c8673b06c8b502c5bec9dfeac7b7fdc3401eedf45bc2503d49e5b535273635247d8d179448ab7b1387ac53586c08820f59b489c09af -AUX examples/server.options.openl2tpd 353 BLAKE2B 7fa7e0e08f56bc4f2263226589f128e06f8da4d2fc32d49a8066cdb14155f86a21356478d753c0aa991b52a08077efa144f3010cfd3ca7fec7d167c2df84a47f SHA512 a320ea624105d0d959c993a44a85f14ecdc220e363990b5da5f4f6c5899c2df04cf365dcd43a21865099b74aa1012a54b8b1b4f87c9a6cc75410e67cc7c5c3c7 -AUX openl2tp-1.8-cflags.patch 1011 BLAKE2B 4289d8b24ff783716a6895b8ddd108a43419481d6a4e8e759004519bccd94cf28ee98723c9ce969087c8d1e0427ac9f410ae3dcb89c65d055bac0ae11cd23097 SHA512 570f7f6a710169b6e5a9af48b7a9c0b17a5dced6544d44255712eed11abefedaed748f165d23ed9eb0bf19ae36feee5a1dc2d6dbe0e6ec380d36fa77d5b04115 -AUX openl2tp-1.8-clientip_as_ipparam.patch 8643 BLAKE2B ed0d59a65ccd1a9b05f3eca6c138321b1f4f08cfe5f1e6a511db43ca2774ed15821896d63d390a5fe68e5c97267f1b1946d60460378021a484e0e4b36ae49184 SHA512 a76b0f2f6ac33499104a40e65e8d4686d5d0699d08cbd4ff44f85301708f868bcb9c4d085275fea504c42b1ff88bd1b4439606b282d4e124ecbde627ede8186a -AUX openl2tp-1.8-configure-Makefile.patch 1608 BLAKE2B 6c2a21be9aaabc6e60216c749ba53c41b6c48390d6ceefcb4c09f61bd18b902345c63309edeea88e29462ffb1fad27f20df452c2f44ecc754767e9b6fe78f295 SHA512 e8292cc673dcefc79a3db4704d34854ada22195d3b18d383068682711735c185ef098d4cefddb6d0623dd9125d25beef4b784b00f4162b96bbaae0fd1341e145 -AUX openl2tp-1.8-l2tpconfig.patch 621 BLAKE2B 31e224b78b7727c71657c3c35160e36b213cd9ae8067d4f0248c2ace649c6747d3f1a88cef43dc40daa3bba493e2a7e452fd147c6a581595214abc33b2e2cb44 SHA512 0832c38fc55169dc86e1267ef693852d93ab4cd551e4b4155d66433db551fa22ce2d044505157bd9bb5ad55b1ec357f9cd948af370d608276cbba5cdb96b97b3 -AUX openl2tp-1.8-ldflags.patch 2620 BLAKE2B bbde9a44adfb6b9ca905c88e2c0867541823b8b5adb61286562640a8c6ec9fb1b8fe60242a0a4be561a3a48743ff370115e357f23b4ac6a7bd78dc8e7ffb49ac SHA512 3c7f192c4553cc9ff68b724e9e2121452ed24c6eeb0b23ecd9a3011defc2b0b6d2f26babfdb010464ab60db2094135deed6e44759cb2fe2833c990769a9f900b -AUX openl2tp-1.8-man.patch 1345 BLAKE2B 21db3ec18c62e44090a19e7e2c7f64987ce17abf331ed3a01f05c1ea3dde4e265469e139bb2f67bf0ef6cae4923fc669d8366835c99e753566bab267f55f18a5 SHA512 5e4cd2efc1b4edf479446a9f865f987542b38c96396fe4b107fdf3423b099818a1a48d84084606650d5bd4cf7ba90ae43f09114f98e35ee41f4d9df139a39e42 -AUX openl2tp-1.8-musl.patch 1384 BLAKE2B bfeaa27eece3ddf87eea990e0c699186b5fd6d249617c2d152274e237f87a4d9d1fb5d01983e99d75957d94ecdc94c109c501a6d1cf8a5a5183db48d9ef0b04c SHA512 8dc0c5afd4efbdce243c4826cb52578d079f62681bc41f2a2f7ad61834992b384c30c1c5b2cf12e4917fdf28f028cc788480ec4d587e2f7398ad4adbca5bb4ad -AUX openl2tp-1.8-native-tc.patch 657 BLAKE2B 2abaed246922347424e2c7ce8809f2ccb817303c5a83a9ea210b8f543e0ab62a2434f0997c0c0accc5ffb92b1f59734b5b95cdd7f72da57b82e39e5c86d0e9cd SHA512 da32092362799e504b991170b757200bd5e81aa356e2ccdfb2123e748c074c111344f43fce33138bb450d9972a3385a42f419e482dedf656e47adfa38a3ccf12 -AUX openl2tp-1.8-optionsfile.patch 10143 BLAKE2B f1044ae2c833e7775b1152d1acd00ea44d57060897827a915dabf2c172b151a8b46d93fce75b10b8844d189ca6514b0bdbf037011edcc2c56433835fed7e844b SHA512 2a0612a6effc0a82323c904c7b51e8eabf96fedbef6024e6d6a5e02daa945c20c95540b6420443854e35ad62acc5d359bfee6e6280f68d51e2c328a34807027f -AUX openl2tp-1.8-parallelbuild.patch 1310 BLAKE2B e379f046111662f21fca21eaa04279413f49d9d806438d38b9ce7b964beba2174caffbc0ae75353df6c4c5e2ffff75cf5c4dc67b409e39762b5eeecc06976330 SHA512 a67e0a0d3fcdd8c4a2ca1a37e88b6eba8f81834b4ce3e0a5f92546ec033f158ca811e9cc5f0396ccf6142df4c4b15679cf53b5b306a3eb3c2389d929d32148a5 -AUX openl2tp-1.8-pppd-2.patch 485 BLAKE2B 587a655b884b92bff9915c8f5d3a38801f843363d0585930192ff0daafff68b2d2855ea19ae7bcdeb92fff8dc191dd22fb945576a44e1ea9ce375860dc68262e SHA512 5c7007a4920d24f9fdf39dd36e3d435708793954c3dbb897969664a03bbd6bf220319a9c794180f91d42130ae177ff18d227a77eaf40a357cfb0d1b81459db47 -AUX openl2tp-1.8-setkey.patch 483 BLAKE2B be8d6d3911426494bbfdc5949762168cc3b0a486e23364a13eb7138e3668d5c533736618109b64f3631d90518745145378d5f749145e6ee209036223e7f44f6e SHA512 da1935e969d8100230434cf6393696563220ecf3785712e1ceb0922e34034624e5a9999671721e530ad74368fab9d89d403677b417934e379fedd5060463e3ab -AUX openl2tp-1.8-strings.patch 3658 BLAKE2B dfb8ebc747b68ea1bde4885fb82b0bef91071d16587d9acb436befe7469a3f0f53812ab1a3d4966c00fd802b111638c186d2636a9a65cef4cc02a1bb583f43a0 SHA512 7d4fd950ad738959ce9190a48f4b3cfa0be4b315ffa080bd437add78fcfba3c7be38a8ee6e8389419fd0def2dff1467f8bdbbc24dccc0a7af88eed737f726441 -AUX openl2tp-1.8-tirpc.patch 2017 BLAKE2B 981a394dda194b4359e9f39148cc8b210cc3e90c826a17af87910b760ff3070d12b46ad865be72dd2fc9c1dc9fccfa543192b6c0924f837322b6e5259c549a60 SHA512 2325e4d2bb43975c244f0e77c607a2864746242cd8fc1ff0ff9b6cf9af3ef93d256b934e1a3465650658e8793e77cb32f1dab734dfb6d45535cb821cf60bec82 -AUX openl2tp-1.8-unused-var.patch 605 BLAKE2B 886f407aebd5b2479068b26550f7c2377baa6d44a8a7187b153a96ba684f3f05d396fb25cff5371487b63b0fa01c12e63878ce419d2acfa861378323db04d117 SHA512 2ac1f04004a06e6a97224a04395a72cc2699e398efaafbdd74773819dc148d8d314ac3e4865722886db53d70eff1a4f021e4a39fb3e5d18011ef1b473ded9ac9 -AUX openl2tp-1.8-werror.patch 1466 BLAKE2B 44003bec2469c04dfa80ee4a87080723f57bb443832eb09fe5f27b8bf3d7e82d3f33f786773a7fb376a7390dc3a60720fcb4567ccc98f36c2bf6a7261e168be8 SHA512 99967159458f9ee806b72372142a5895793daad46b4aa9a6f0876eafc9c89b2016d72883c6c77adee6cebd4126fb9ba463b2b8bf7119456a4ea72d86374fb10d -AUX openl2tpd.confd 717 BLAKE2B 7c92d47880c57c39deee6eebe458f0a1367fff616af3377145a0938e073068630f76245299b4c6886b34c06a975d41996adf05c6c145194e6af00abc66a317a0 SHA512 b120c80c352cfb810f808722a5fbbc63519e07b72f16a1b42f4e577da9a4607b24e8ce82bf25ccd90c69ad640ad929be89c7e1e3fb429c61088ce93ddab2ceb4 -AUX openl2tpd.initd 1788 BLAKE2B cccc7e9f907ccf5abe5dc84d0e3228b8e5a542e6f864325cf5eb7fd2d84e50e0d5cf86ec276a59bef7bf576d52b4b9c00bb34c1ec706dd6ee719030f64ba55e0 SHA512 8f84e847eb9b3f7d6c07bef1d6e8a051a0ded8ec6c4d21be26c55eacdb3d12fce60dce7b4c94d4e9358c4d724c868bf84c2a6262772f8fdfb3e54931cee0ce10 -DIST openl2tp-1.8.tar.gz 491160 BLAKE2B 70c78cd4d7daba600f9a9115025acb38b82adc0a04bbf6e9d46daebf2c7c37cc8fe9df6fa7157a05525e998063f5200a85893bb5b33dbe3e66ca7b6a4d2c7972 SHA512 360f9032b2bb104cfaa41a18fc37005510ab604b31a34a3412563e0de3e8dad946ca61840cd41a19f0202d92d758d812f45479659c9fa4d4e9e13dd226f03fda -EBUILD openl2tp-1.8-r2.ebuild 3511 BLAKE2B fa06063358b4a9a750c0d14b11b98b459a1c238713132b1f913209e12ca14669f781db2ff4ca215c3210acdfb6a39efff4111a61c59e4fd4d0dddb7086174999 SHA512 e91d2e09f12268cab0295278555e1154cd1b9de474d4fef7146930507834d14151f07d332509cbd785811824a56ae659a364716cfe83e010922aef045e0d0695 -MISC metadata.xml 590 BLAKE2B 9ded140ee1a9cffd108ac31a66aad613f106887c9efa7a885df04c73ace8d039a7fbcb5712aa3cee8c5054de3bd94ea8a073a6c8442ccba5b2ff80c9a95fcd12 SHA512 f2d204fdf261d74a8d7e53279018ac09a6c6d8b503cf6f7e44aaae4c9f73ccfd65441f9bc917be103eddd1c300f4faf516d3d3c1d116314b076a7fb3d6f62c44 diff --git a/net-dialup/openl2tp/files/examples/client.openl2tpd.conf b/net-dialup/openl2tp/files/examples/client.openl2tpd.conf deleted file mode 100644 index 6ead75a6296b..000000000000 --- a/net-dialup/openl2tp/files/examples/client.openl2tpd.conf +++ /dev/null @@ -1,30 +0,0 @@ -system modify \ - deny_remote_tunnel_creates=yes \ - tunnel_establish_timeout=60 \ - session_establish_timeout=0 \ - tunnel_persist_pend_timeout=60 \ - session_persist_pend_timeout=60 - -ppp profile modify \ - profile_name=default \ - mtu=1460 \ - mru=1460 \ - auth_peer=no \ - auth_pap=no \ - auth_eap=no \ - auth_mschapv1=no \ - lcp_echo_interval=10 \ - lcp_echo_failure_count=3 \ - default_route=yes - -tunnel create \ - tunnel_name=campus \ - dest_ipaddr=my.l2tp.provider \ - use_udp_checksums=off \ - persist=yes - -session create \ - tunnel_name=campus \ - session_name=campus \ - use_sequence_numbers=no \ - user_name=my_user_name diff --git a/net-dialup/openl2tp/files/examples/server-radius.openl2tpd.conf b/net-dialup/openl2tp/files/examples/server-radius.openl2tpd.conf deleted file mode 100644 index e666fdec6106..000000000000 --- a/net-dialup/openl2tp/files/examples/server-radius.openl2tpd.conf +++ /dev/null @@ -1,28 +0,0 @@ -ppp profile modify \ - profile_name=default \ - local_ipaddr=10.7.2.16 \ - auth_eap=no \ - auth_mschapv1=yes \ - auth_mschapv2=yes \ - use_radius=yes \ - ipcp_retransmit_interval=1 \ - lcp_retransmit_interval=1 \ - lcp_echo_interval=5 \ - chap_max_challenge=3 \ - chap_restart=1 \ - idle_timeout=0 \ - max_connect_time=0 \ - mtu=1460 \ - mru=1460 \ - radius_hint=/etc/radiusclient/radiusclient.conf - -tunnel profile modify \ - profile_name=default \ - src_ipaddr=10.50.0.16 \ - retry_timeout=1 \ - use_udp_checksums=no \ - our_udp_port=1701 - -session profile modify \ - profile_name=default \ - use_sequence_numbers=no diff --git a/net-dialup/openl2tp/files/examples/server.openl2tpd.conf b/net-dialup/openl2tp/files/examples/server.openl2tpd.conf deleted file mode 100644 index e960e14e1a33..000000000000 --- a/net-dialup/openl2tp/files/examples/server.openl2tpd.conf +++ /dev/null @@ -1,36 +0,0 @@ -system modify \
- deny_remote_tunnel_creates=no \
- tunnel_establish_timeout=60 \
- session_establish_timeout=0 \
- tunnel_persist_pend_timeout=60 \
- session_persist_pend_timeout=60
-
-ppp profile modify profile_name=default \
- optionsfile=/etc/ppp/options.openl2tpd \
- local_ipaddr=172.16.17.1 \
- lcp_echo_interval=10 \
- lcp_echo_failure_count=3 \
- auth_eap=no \
- auth_pap=no \
- auth_none=no \
- auth_chap=yes \
- auth_mschapv1=no \
- auth_mschapv2=yes
-
-session profile create profile_name=peer1 \
- ppp_profile_name=peer1
-
-ppp profile create profile_name=peer1 \
- optionsfile=/etc/ppp/options.openl2tpd \
- auth_none=no \
- auth_pap=no \
- auth_chap=yes \
- auth_mschapv1=no \
- auth_mschapv2=yes \
- auth_peer=no \
- dns_ipaddr_pri=172.16.17.1 \
- local_ipaddr=172.16.17.1 \
- remote_ipaddr=172.16.17.6 # ipaddr of peer1
-
-tunnel profile modify profile_name=default \
- our_udp_port=1701
diff --git a/net-dialup/openl2tp/files/examples/server.options.openl2tpd b/net-dialup/openl2tp/files/examples/server.options.openl2tpd deleted file mode 100644 index 411956fab1ac..000000000000 --- a/net-dialup/openl2tp/files/examples/server.options.openl2tpd +++ /dev/null @@ -1,23 +0,0 @@ -# usually placed at /etc/ppp/options.openl2tpd
-name host
-auth
-plugin pppol2tp.so
-refuse-mschap
-require-mschap-v2
-hide-password
-ipcp-accept-local
-ipcp-accept-remote
-lcp-echo-interval 15
-lcp-echo-failure 4
-ms-dns 172.16.17.1
-netmask 255.255.255.0
-nodefaultroute
-proxyarp
-crtscts
-noccp
-nobsdcomp
-nodeflate
-noaccomp
-nopcomp
-novj
-lock
diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-cflags.patch b/net-dialup/openl2tp/files/openl2tp-1.8-cflags.patch deleted file mode 100644 index fe8825766ea9..000000000000 --- a/net-dialup/openl2tp/files/openl2tp-1.8-cflags.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naurd openl2tp-1.8.orig/Makefile openl2tp-1.8/Makefile ---- openl2tp-1.8.orig/Makefile 2018-07-03 04:59:51.000000000 +0900 -+++ openl2tp-1.8/Makefile 2018-07-03 05:00:44.133460163 +0900 -@@ -155,24 +155,23 @@ - endif - - CPPFLAGS= $(CPPFLAGS.l2tptest) $(CPPFLAGS-y) --CFLAGS= -I. -Iusl -Icli -isystem include \ -+CFLAGS+= -I. -Iusl -Icli -isystem include \ - -MMD -Wall -Wno-strict-aliasing \ - $(CPPFLAGS) $(CPPFLAGS.dmalloc) \ - -DSYS_LIBDIR=$(SYS_LIBDIR) - LDFLAGS.l2tpd= -Wl,-E -L. -Lusl -lusl -ldl $(LIBS.dmalloc) -lc - LDFLAGS.l2tpconfig= -Lcli -lcli -lreadline $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc - --OPT_CFLAGS?= -O -- - ifeq ($(L2TP_DEBUG),y) --CFLAGS.optimize= -g --CFLAGS.optimize+= -DDEBUG -+CFLAGS.opt= -g -+CFLAGS.opt+= -DDEBUG - else --CFLAGS.optimize= $(OPT_CFLAGS) -+CFLAGS.opt= $(OPT_CFLAGS) - endif -+CFLAGS.optimize= $(CFLAGS) $(CFLAGS.opt) - export CFLAGS.optimize - --CFLAGS+= $(CFLAGS.optimize) -+CFLAGS+= $(CFLAGS.opt) - - ifeq ($(L2TP_USE_ASYNC_RPC),y) - CPPFLAGS+= -DL2TP_ASYNC_RPC diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-clientip_as_ipparam.patch b/net-dialup/openl2tp/files/openl2tp-1.8-clientip_as_ipparam.patch deleted file mode 100644 index fcea3d110f59..000000000000 --- a/net-dialup/openl2tp/files/openl2tp-1.8-clientip_as_ipparam.patch +++ /dev/null @@ -1,217 +0,0 @@ -diff -brau openl2tp-1.8.o/doc/openl2tp_rpc.4 openl2tp-1.8/doc/openl2tp_rpc.4 ---- openl2tp-1.8.o/doc/openl2tp_rpc.4 2011-06-04 10:02:34.000000000 +0200 -+++ openl2tp-1.8/doc/openl2tp_rpc.4 2011-06-04 21:17:22.000000000 +0200 -@@ -719,6 +719,10 @@ - .B chap_restart - Retransmission timeout for CHAP challenges. Default=3. - .TP -+.B clientip_as_ipparam -+Whether or not to pass the remote client ip (connecting IP) as ipparam to pppd -+(similar to to pptpd). -+.TP - .B pap_max_auth_reqs - Maximum number of PAP authenticate-request transmissions. Default=10. - .TP -diff -brau openl2tp-1.8.o/l2tp_common.c openl2tp-1.8/l2tp_common.c ---- openl2tp-1.8.o/l2tp_common.c 2011-06-04 21:00:45.000000000 +0200 -+++ openl2tp-1.8/l2tp_common.c 2011-06-04 21:19:46.000000000 +0200 -@@ -931,6 +931,7 @@ - if (OPTSTRING_PTR(pp->remote_name) != NULL) { - len += fprintf(file, " remote name for authentication: %s\n", OPTSTRING(pp->remote_name)); - } -+ len += fprintf(file, " clientip as ipparam: %s\n", pp->clientip_as_ipparam ? "YES" : "NO"); - len += fprintf(file, " max connect time: %d, max failure count: %d, idle timeout: %d\n", - pp->max_connect_time, pp->max_failure_count, pp->idle_timeout); - if (pp->asyncmap != 0) { -diff -brau openl2tp-1.8.o/l2tp_config.c openl2tp-1.8/l2tp_config.c ---- openl2tp-1.8.o/l2tp_config.c 2011-06-04 11:43:03.000000000 +0200 -+++ openl2tp-1.8/l2tp_config.c 2011-06-04 21:30:48.000000000 +0200 -@@ -3124,6 +3124,7 @@ - L2TP_PPP_ARGID_REMOTE_NAME, - L2TP_PPP_ARGID_PROXY_ARP, - L2TP_PPP_ARGID_OPTIONSFILE, -+ L2TP_PPP_ARGID_CLIENTIP_AS_IPPARAM, - } l2tp_ppp_arg_ids_t; - - #undef ARG -@@ -3189,7 +3190,8 @@ - ARG(USE_AS_DEFAULT_ROUTE, "default_route", 0, bool, "Use link as default route"), \ - ARG(MULTILINK, "multilink", 0, bool, "Enable PPP multilink connections."), \ - ARG(PROXY_ARP, "proxy_arp", 0, bool, "Use proxy arp."), \ -- ARG(OPTIONSFILE, "optionsfile", 0, string, "ppp options file to use") -+ ARG(OPTIONSFILE, "optionsfile", 0, string, "ppp options file to use"), \ -+ ARG(CLIENTIP_AS_IPPARAM, "clientip_as_ipparam", 0, bool, "Pass the connecting client's IP as ipparam to pppd.") - - - static struct cli_arg_entry l2tp_args_ppp_profile_create[] = { -@@ -3270,6 +3272,7 @@ - FLG(MULTILINK, "multilink", "Enable PPP multilink connections."), \ - FLG(PROXY_ARP, "proxy_arp", "Use proxy arp."), - FLG(OPTIONSFILE, "optionsfile", "ppp options file to use"), -+ FLG(CLIENTIP_AS_IPPARAM, "clientip_as_ipparam", "Pass the connecting client's IP as ipparam to pppd."), - { NULL, }, - }; - -@@ -3500,6 +3503,9 @@ - msg->optionsfile.valid = 1; - msg->flags2 |= L2TP_API_PPP_PROFILE_FLAG_OPTIONSFILE; - break; -+ case L2TP_PPP_ARGID_CLIENTIP_AS_IPPARAM: -+ L2TP_ACT_PARSE_ARG(arg, arg_value, msg->clientip_as_ipparam, msg->flags2, L2TP_API_PPP_PROFILE_FLAG_CLIENTIP_AS_IPPARAM); -+ break; - } - - result = 0; -@@ -3871,6 +3877,9 @@ - case L2TP_PPP_ARGID_OPTIONSFILE: - msg.flags2 |= L2TP_API_PPP_PROFILE_FLAG_OPTIONSFILE; - break; -+ case L2TP_PPP_ARGID_CLIENTIP_AS_IPPARAM: -+ msg.flags2 |= L2TP_API_PPP_PROFILE_FLAG_CLIENTIP_AS_IPPARAM; -+ break; - } - } L2TP_ACT_END(); - -@@ -4883,6 +4892,7 @@ - L2TP_API_PPP_PROFILE_FLAG_REMOTE_NAME | - L2TP_API_PPP_PROFILE_FLAG_PROXY_ARP | - L2TP_API_PPP_PROFILE_FLAG_OPTIONSFILE | -+ L2TP_API_PPP_PROFILE_FLAG_CLIENTIP_AS_IPPARAM | - L2TP_API_PPP_PROFILE_FLAG_AUTH_NONE | - L2TP_API_PPP_PROFILE_FLAG_AUTH_REFUSE_EAP | - L2TP_API_PPP_PROFILE_FLAG_AUTH_REFUSE_MSCHAPV2 | -@@ -5047,6 +5057,9 @@ - if ((cfg->flags2 & L2TP_API_PPP_PROFILE_FLAG_OPTIONSFILE) && (OPTSTRING_PTR(cfg->optionsfile) != NULL)) { - fprintf(file, "\toptionsfile=%s \\\n", OPTSTRING_PTR(cfg->optionsfile)); - } -+ if (cfg->flags2 & L2TP_API_PPP_PROFILE_FLAG_CLIENTIP_AS_IPPARAM) { -+ fprintf(file, "\tclientip_as_ipparam=%s \\\n", Y_OR_N(cfg->clientip_as_ipparam)); -+ } - fprintf(file, "\n"); - } - } -diff -brau openl2tp-1.8.o/l2tp_config_parse.y openl2tp-1.8/l2tp_config_parse.y ---- openl2tp-1.8.o/l2tp_config_parse.y 2011-06-04 11:11:42.000000000 +0200 -+++ openl2tp-1.8/l2tp_config_parse.y 2011-06-04 21:34:04.000000000 +0200 -@@ -155,6 +155,7 @@ - %token BOOL - %token IPADDRESS - %token OPTIONSFILE -+%token CLIENTIP_AS_IPPARAM - - %token INITIAL_RCVD_LCP_CONFREQ - %token CALLING_NUMBER -@@ -1180,6 +1181,11 @@ - OPTSTRING(ppp_profile.optionsfile) = $3.buf; - ppp_profile.optionsfile.valid = 1; - } -+ | CLIENTIP_AS_IPPARAM EQUALS BOOL -+ { -+ ppp_profile.flags2 |= L2TP_API_PPP_PROFILE_FLAG_CLIENTIP_AS_IPPARAM; -+ ppp_profile.clientip_as_ipparam = $3; -+ } - ; - - tunnel_command -diff -brau openl2tp-1.8.o/l2tp_config_token.l openl2tp-1.8/l2tp_config_token.l ---- openl2tp-1.8.o/l2tp_config_token.l 2011-06-04 11:08:31.000000000 +0200 -+++ openl2tp-1.8/l2tp_config_token.l 2011-06-04 21:34:50.000000000 +0200 -@@ -192,6 +192,7 @@ - auth_none { return(AUTH_NOAUTH); } - auth_peer { return(AUTH_PEER); } - optionsfile { return(OPTIONSFILE); } -+clientip_as_ipparam { return(CLIENTIP_AS_IPPARAM); } - - {ws} { } - {linecont} { lineno++; } -diff -brau openl2tp-1.8.o/l2tp_ppp.c openl2tp-1.8/l2tp_ppp.c ---- openl2tp-1.8.o/l2tp_ppp.c 2011-06-04 16:08:25.000000000 +0200 -+++ openl2tp-1.8/l2tp_ppp.c 2011-06-04 21:42:37.000000000 +0200 -@@ -71,6 +71,7 @@ - int auth_refuse_mschapv2:1; - int auth_refuse_eap:1; - char *optionsfile; -+ int clientip_as_ipparam; - }; - - static struct l2tp_ppp_profile *l2tp_ppp_defaults; -@@ -245,6 +246,9 @@ - if (msg->flags2 & L2TP_API_PPP_PROFILE_FLAG_OPTIONSFILE) { - L2TP_SET_OPTSTRING_VAR(profile, optionsfile); - } -+ if (msg->flags2 & L2TP_API_PPP_PROFILE_FLAG_CLIENTIP_AS_IPPARAM) { -+ profile->clientip_as_ipparam = msg->clientip_as_ipparam; -+ } - - out: - return result; -@@ -294,6 +298,7 @@ - profile->chap_interval = l2tp_ppp_defaults->chap_interval; - profile->chap_max_challenge = l2tp_ppp_defaults->chap_max_challenge; - profile->chap_restart = l2tp_ppp_defaults->chap_restart; -+ profile->clientip_as_ipparam = l2tp_ppp_defaults->clientip_as_ipparam; - profile->pap_max_auth_requests = l2tp_ppp_defaults->pap_max_auth_requests; - profile->pap_restart_interval = l2tp_ppp_defaults->pap_restart_interval; - profile->pap_timeout = l2tp_ppp_defaults->pap_timeout; -@@ -553,6 +558,7 @@ - result->chap_interval = profile->chap_interval; - result->chap_max_challenge = profile->chap_max_challenge; - result->chap_restart = profile->chap_restart; -+ result->clientip_as_ipparam = profile->clientip_as_ipparam; - result->pap_max_auth_requests = profile->pap_max_auth_requests; - result->pap_restart_interval = profile->pap_restart_interval; - result->pap_timeout = profile->pap_timeout; -@@ -893,6 +899,9 @@ - } - profile->optionsfile = NULL; - } -+ if (msg.flags2 & L2TP_API_PPP_PROFILE_FLAG_CLIENTIP_AS_IPPARAM) { -+ profile->use_radius = L2TP_API_PPP_PROFILE_DEFAULT_CLIENTIP_AS_IPPARAM; -+ } - - /* Clear all requested flags */ - profile->flags &= ~(msg.flags); -diff -brau openl2tp-1.8.o/l2tp_rpc.x openl2tp-1.8/l2tp_rpc.x ---- openl2tp-1.8.o/l2tp_rpc.x 2011-06-04 11:06:08.000000000 +0200 -+++ openl2tp-1.8/l2tp_rpc.x 2011-06-04 21:45:00.000000000 +0200 -@@ -947,6 +947,7 @@ - const L2TP_API_PPP_PROFILE_FLAG_AUTH_REFUSE_PAP = 131072; - const L2TP_API_PPP_PROFILE_FLAG_AUTH_PEER = 262144; - const L2TP_API_PPP_PROFILE_FLAG_OPTIONSFILE = 524288; -+const L2TP_API_PPP_PROFILE_FLAG_CLIENTIP_AS_IPPARAM = 1048576; - - /* Default values for PPP profile attributes. - * These are used if an explicit value is not provided by the user. -@@ -995,6 +996,7 @@ - const L2TP_API_PPP_PROFILE_DEFAULT_MULTILINK = 0; - const L2TP_API_PPP_PROFILE_DEFAULT_PROXY_ARP = 0; - const L2TP_API_PPP_PROFILE_DEFAULT_OPTIONSFILE = ""; -+const L2TP_API_PPP_PROFILE_DEFAULT_CLIENTIP_AS_IPPARAM = 0; - - enum l2tp_api_ppp_sync_mode { - L2TP_API_PPP_SYNCMODE_SYNC_ASYNC, -@@ -1054,6 +1056,7 @@ - optstring remote_name; - bool proxy_arp; - optstring optionsfile; -+ bool clientip_as_ipparam; - }; - - struct l2tp_api_ppp_profile_list_entry { -diff -brau openl2tp-1.8.o/plugins/ppp_unix.c openl2tp-1.8/plugins/ppp_unix.c ---- openl2tp-1.8.o/plugins/ppp_unix.c 2011-06-04 14:41:43.000000000 +0200 -+++ openl2tp-1.8/plugins/ppp_unix.c 2011-06-04 22:11:54.000000000 +0200 -@@ -295,6 +295,13 @@ - argv[arg++] = "sync"; - } - -+ /* Check if we should pass ipparam */ -+ if (params->flags2 & L2TP_API_PPP_PROFILE_FLAG_CLIENTIP_AS_IPPARAM) { -+ argv[arg++] = "ipparam"; -+ ip.s_addr = l2tp_tunnel_get_peer_addr(ppp->tunnel)->sin_addr.s_addr; -+ argv[arg++] = strdup(inet_ntoa(ip)); -+ } -+ - /* ppp auth options */ - if ((params->flags2 & L2TP_API_PPP_PROFILE_FLAG_AUTH_REFUSE_EAP) && - params->auth_refuse_eap) { diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-configure-Makefile.patch b/net-dialup/openl2tp/files/openl2tp-1.8-configure-Makefile.patch deleted file mode 100644 index f840b2bea841..000000000000 --- a/net-dialup/openl2tp/files/openl2tp-1.8-configure-Makefile.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- openl2tp-1.8/Makefile.orig 2018-03-17 14:24:57.000000000 +0300 -+++ openl2tp-1.8/Makefile 2018-03-17 14:46:34.769800757 +0300 -@@ -1,26 +1,26 @@ - # BEGIN CONFIGURABLE SETTINGS - - # Compile-time features --L2TP_FEATURE_LAC_SUPPORT= y --L2TP_FEATURE_LNS_SUPPORT= y --L2TP_FEATURE_RPC_MANAGEMENT= y --L2TP_FEATURE_LAIC_SUPPORT= y --L2TP_FEATURE_LAOC_SUPPORT= y --L2TP_FEATURE_LNIC_SUPPORT= y --L2TP_FEATURE_LNOC_SUPPORT= y -+L2TP_FEATURE_LAC_SUPPORT ?= y -+L2TP_FEATURE_LNS_SUPPORT ?= y -+L2TP_FEATURE_RPC_MANAGEMENT ?= y -+L2TP_FEATURE_LAIC_SUPPORT ?= y -+L2TP_FEATURE_LAOC_SUPPORT ?= y -+L2TP_FEATURE_LNIC_SUPPORT ?= y -+L2TP_FEATURE_LNOC_SUPPORT ?= y - L2TP_FEATURE_LOCAL_CONF_FILE= y --#L2TP_FEATURE_LOCAL_STAT_FILE= y -+L2TP_FEATURE_LOCAL_STAT_FILE ?= n - - # Define USE_DMALLOC to enable dmalloc memory debugging --# USE_DMALLOC= y -+USE_DMALLOC ?= n - - # Define to include test code. This must be defined to run the - # regression tests --# L2TP_TEST= y -+L2TP_TEST ?= n - - # Define to compile in debug code. Also makes default trace flags - # enable all messages --# L2TP_DEBUG= y -+L2TP_DEBUG ?= n - - # Use asynchronous RPC requests where appropriate - # Affects only L2TP-PPP-IPPOOL interfaces, not management interfaces. -@@ -99,12 +99,14 @@ - - # Build pppd dir only if ppp version is earlier than 2.4.5 since the - # openl2tp plugins were integrated in ppp-2.4.5. --PPPD_SUBDIR=pppd --ifeq ($(PPPD_VERSION),2.4.5) - PPPD_SUBDIR= -+ -+TEST= -+ifeq ($(L2TP_TEST),y) -+TEST=test - endif - --SUBDIRS= usl cli plugins $(PPPD_SUBDIR) test doc -+SUBDIRS= usl cli plugins $(PPPD_SUBDIR) $(TEST) doc - - .PHONY: $(SUBDIRS:%=subdir-%) - diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-l2tpconfig.patch b/net-dialup/openl2tp/files/openl2tp-1.8-l2tpconfig.patch deleted file mode 100644 index bf1644c9a144..000000000000 --- a/net-dialup/openl2tp/files/openl2tp-1.8-l2tpconfig.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur openl2tp-1.7.man//Makefile openl2tp-1.7/Makefile ---- openl2tp-1.7.man//Makefile 2010-09-05 11:02:18.000000000 +0400 -+++ openl2tp-1.7/Makefile 2010-09-05 12:25:51.694863508 +0400 -@@ -314,9 +314,9 @@ - $(INSTALL) openl2tpd $(DESTDIR)/usr/sbin - - install-app: -- $(INSTALL) -d $(DESTDIR)/usr/bin -+ $(INSTALL) -d $(DESTDIR)/usr/sbin - ifeq ($(L2TP_FEATURE_RPC_MANAGEMENT),y) -- $(INSTALL) l2tpconfig $(DESTDIR)/usr/bin -+ $(INSTALL) -m 0500 l2tpconfig $(DESTDIR)/usr/sbin - endif - $(INSTALL) -d $(DESTDIR)$(SYS_LIBDIR)/openl2tp - $(INSTALL) -m 0644 l2tp_rpc.x $(DESTDIR)$(SYS_LIBDIR)/openl2tp/l2tp_rpc.x diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-ldflags.patch b/net-dialup/openl2tp/files/openl2tp-1.8-ldflags.patch deleted file mode 100644 index 7d1efffae922..000000000000 --- a/net-dialup/openl2tp/files/openl2tp-1.8-ldflags.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -Naur openl2tp-1.8.werror/Makefile openl2tp-1.8/Makefile ---- openl2tp-1.8.werror/Makefile 2010-11-28 17:18:02.000000000 +0300 -+++ openl2tp-1.8/Makefile 2010-11-28 17:22:27.950475976 +0300 -@@ -266,10 +266,10 @@ - etags $(wildcard *.c) $(wildcard *.h) - - openl2tpd: $(L2TPD_SRCS.o) -- $(CC) -o $@ $^ $(LDFLAGS.l2tpd) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS.l2tpd) - - l2tpconfig: $(L2TPCONFIG_SRCS.o) -- $(CC) -o $@ $^ $(LDFLAGS.l2tpconfig) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS.l2tpconfig) - - %.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ -diff -Naur openl2tp-1.8.werror/cli/Makefile openl2tp-1.8/cli/Makefile ---- openl2tp-1.8.werror/cli/Makefile 2010-11-28 17:18:27.000000000 +0300 -+++ openl2tp-1.8/cli/Makefile 2010-11-28 17:22:27.950475976 +0300 -@@ -19,7 +19,7 @@ - $(AR) rus $@ $^ - - cli_test: $(CLI_SRCS_TEST.o) libcli.a -- $(CC) -o $@ $(CLI_SRCS_TEST.o) $(LDFLAGS.cli_test) -+ $(CC) $(LDFLAGS) -o $@ $(CLI_SRCS_TEST.o) $(LDFLAGS.cli_test) - - clean: - $(RM) $(CLI_SRCS.o) $(CLI_SRCS_TEST.o) libcli.a cli_test $(wildcard *.d) -diff -Naur openl2tp-1.8.werror/plugins/Makefile openl2tp-1.8/plugins/Makefile ---- openl2tp-1.8.werror/plugins/Makefile 2010-11-22 17:05:29.000000000 +0300 -+++ openl2tp-1.8/plugins/Makefile 2010-11-28 17:22:27.950475976 +0300 -@@ -1,7 +1,7 @@ - CFLAGS := $(CFLAGS.optimize) -MMD -Wall \ - -isystem ../include \ - -I. -I.. -I../usl -fPIC $(EXTRA_CFLAGS) --LDFLAGS := -shared -+LDFLAGS.plugins := -shared - - PLUGINS.c:= ppp_unix.c ppp_null.c ipsec.c event_sock.c - -@@ -21,7 +21,7 @@ - $(RM) $(PLUGINS.so) $(wildcard *.o) $(wildcard *.d) $(SRC.generated) - - %.so: %.c -- $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $< -+ $(CC) $(LDFLAGS) -o $@ $(LDFLAGS.plugins) $(CFLAGS) $< - - install: all - $(INSTALL) -d $(DESTDIR)$(SYS_LIBDIR)/openl2tp -diff -Naur openl2tp-1.8.werror/test/Makefile openl2tp-1.8/test/Makefile ---- openl2tp-1.8.werror/test/Makefile 2007-05-28 18:28:53.000000000 +0400 -+++ openl2tp-1.8/test/Makefile 2010-11-28 17:25:52.871882050 +0300 -@@ -3,7 +3,7 @@ - all: pppd_dummy - - pppd_dummy: pppd_dummy.c -- $(CC) -o $@ $< -+ $(CC) $(LDFLAGS) -o $@ $< - - clean: - -$(RM) pppd_dummy -diff -Naur openl2tp-1.8.werror/usl/Makefile openl2tp-1.8/usl/Makefile ---- openl2tp-1.8.werror/usl/Makefile 2010-11-28 17:18:15.000000000 +0300 -+++ openl2tp-1.8/usl/Makefile 2010-11-28 17:22:27.950475976 +0300 -@@ -26,7 +26,7 @@ - $(AR) rus $@ $^ - - usl_test: $(USL_SRCS_TEST.o) libusl.a -- $(CC) -o $@ $(USL_SRCS_TEST.o) $(LDFLAGS.usl_test) -+ $(CC) $(LDFLAGS) -o $@ $(USL_SRCS_TEST.o) $(LDFLAGS.usl_test) - - clean: - -$(RM) $(USL_SRCS.o) $(USL_SRCS_TEST.o) libusl.a usl_test $(wildcard *.d) diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-man.patch b/net-dialup/openl2tp/files/openl2tp-1.8-man.patch deleted file mode 100644 index 5375e1695851..000000000000 --- a/net-dialup/openl2tp/files/openl2tp-1.8-man.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur openl2tp-1.7.pppd/doc/Makefile openl2tp-1.7/doc/Makefile ---- openl2tp-1.7.pppd/doc/Makefile 2007-05-28 19:53:38.000000000 +0400 -+++ openl2tp-1.7/doc/Makefile 2010-07-31 18:21:56.163449838 +0400 -@@ -11,29 +11,24 @@ - MANSRC+= $(MANSRC.5) - endif - --all: $(MANSRC:%=%.gz) -- --%.gz: % -- gzip --best -c $< > $@ -+all: $(MANSRC) - - clean: -- -$(RM) $(MANSRC:%=%.gz) -+ -$(RM) $(MANSRC) - - install: all - $(INSTALL) -d $(DESTDIR)/usr/share/man/man1 --ifeq ($(L2TP_FEATURE_RPC_MANAGEMENT),y) -- $(INSTALL) $(MANSRC.1:%=%.gz) $(DESTDIR)/usr/share/man/man1 -+ $(INSTALL) $(MANSRC.1) $(DESTDIR)/usr/share/man/man1 --endif - $(INSTALL) -d $(DESTDIR)/usr/share/man/man4 -- $(INSTALL) $(MANSRC.4:%=%.gz) $(DESTDIR)/usr/share/man/man4 -+ $(INSTALL) $(MANSRC.4) $(DESTDIR)/usr/share/man/man4 - ifeq ($(L2TP_FEATURE_LOCAL_CONF_FILE),y) - $(INSTALL) -d $(DESTDIR)/usr/share/man/man5 -- $(INSTALL) $(MANSRC.5:%=%.gz) $(DESTDIR)/usr/share/man/man5 -+ $(INSTALL) $(MANSRC.5) $(DESTDIR)/usr/share/man/man5 - endif - $(INSTALL) -d $(DESTDIR)/usr/share/man/man7 -- $(INSTALL) $(MANSRC.7:%=%.gz) $(DESTDIR)/usr/share/man/man7 -+ $(INSTALL) $(MANSRC.7) $(DESTDIR)/usr/share/man/man7 - $(INSTALL) -d $(DESTDIR)/usr/share/man/man8 -- $(INSTALL) $(MANSRC.8:%=%.gz) $(DESTDIR)/usr/share/man/man8 -+ $(INSTALL) $(MANSRC.8) $(DESTDIR)/usr/share/man/man8 - - TAGS: - diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-musl.patch b/net-dialup/openl2tp/files/openl2tp-1.8-musl.patch deleted file mode 100644 index 437f96f4d6fc..000000000000 --- a/net-dialup/openl2tp/files/openl2tp-1.8-musl.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -u openl2tp-1.8/cli/cli_readline.c openl2tp-1.8/cli/cli_readline.c ---- openl2tp-1.8/cli/cli_readline.c 2020-07-12 11:16:13.583798412 +0300 -+++ openl2tp-1.8/cli/cli_readline.c 2020-07-12 11:35:50.872615494 +0300 -@@ -18,12 +18,15 @@ - * - *****************************************************************************/ - -+#define _GNU_SOURCE -+ - #include <stdio.h> - #include <unistd.h> - #include <sys/types.h> - #include <sys/file.h> - #include <sys/stat.h> --#include <sys/errno.h> -+#include <fcntl.h> -+#include <errno.h> - #include <signal.h> - - #include <readline/readline.h> -@@ -633,7 +636,7 @@ - - static int cli_rl_install_signal_handlers(void) - { -- __sighandler_t handler; -+ sighandler_t handler; - - rl_catch_signals = 0; - rl_clear_signals(); -unchanged: ---- openl2tp-1.8.orig/usl/usl_pid.c 2008-05-08 00:44:20.000000000 +0400 -+++ openl2tp-1.8/usl/usl_pid.c 2020-07-12 10:29:47.047052036 +0300 -@@ -26,6 +26,10 @@ - - #include "usl.h" - -+#ifndef WAIT_ANY -+#define WAIT_ANY (-1) -+#endif -+ - /* We maintain a list of child process pids and functions to call when - * they exit. - */ -unchanged: ---- openl2tp-1.8.orig/l2tp_main.c 2010-02-12 22:09:23.000000000 +0300 -+++ openl2tp-1.8/l2tp_main.c 2020-07-12 10:58:59.343655159 +0300 -@@ -42,7 +42,7 @@ - #include <setjmp.h> - #include <sys/utsname.h> - --#include <wait.h> -+#include <sys/wait.h> - - #include "usl.h" - #include "l2tp_private.h" diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-native-tc.patch b/net-dialup/openl2tp/files/openl2tp-1.8-native-tc.patch deleted file mode 100644 index 9e5ff3411af5..000000000000 --- a/net-dialup/openl2tp/files/openl2tp-1.8-native-tc.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- openl2tp-1.8/Makefile.orig 2020-07-11 10:04:54.485853377 +0300 -+++ openl2tp-1.8/Makefile 2020-07-11 10:21:10.616327547 +0300 -@@ -69,13 +69,13 @@ - - # END CONFIGURABLE SETTINGS - --AS = $(CROSS_COMPILE)as --LD = $(CROSS_COMPILE)ld --CC = $(CROSS_COMPILE)gcc --AR = $(CROSS_COMPILE)ar --NM = $(CROSS_COMPILE)nm --STRIP = $(CROSS_COMPILE)strip --INSTALL = $(CROSS_COMPILE)install -+AS ?= $(CROSS_COMPILE)as -+LD ?= $(CROSS_COMPILE)ld -+CC ?= $(CROSS_COMPILE)gcc -+AR ?= $(CROSS_COMPILE)ar -+NM ?= $(CROSS_COMPILE)nm -+STRIP ?= $(CROSS_COMPILE)strip -+INSTALL ?= $(CROSS_COMPILE)install - - ifneq ($(READLINE_DIR),) - READLINE_LDFLAGS= -L $(READLINE_DIR)/lib diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-optionsfile.patch b/net-dialup/openl2tp/files/openl2tp-1.8-optionsfile.patch deleted file mode 100644 index 45c209fc7750..000000000000 --- a/net-dialup/openl2tp/files/openl2tp-1.8-optionsfile.patch +++ /dev/null @@ -1,306 +0,0 @@ -diff -brau openl2tp-1.8.o/doc/openl2tp_rpc.4 openl2tp-1.8/doc/openl2tp_rpc.4 ---- openl2tp-1.8.o/doc/openl2tp_rpc.4 2010-11-09 16:50:58.000000000 +0200 -+++ openl2tp-1.8/doc/openl2tp_rpc.4 2011-06-04 10:02:34.000000000 +0200 -@@ -774,6 +774,10 @@ - .B local_ip_addr - The IP address to assign to the local end of the PPP link. - .TP -+.B optionsfile -+Passes a file parameter to the pppd daemon, allowing for loading a custom -+options file. See pppd(8) for more details. -+.TP - .B peer_ip_addr - The IP address to assign to the remote (peer) end of the PPP link. - .TP -diff -brau openl2tp-1.8.o/l2tp_common.c openl2tp-1.8/l2tp_common.c ---- openl2tp-1.8.o/l2tp_common.c 2008-01-08 19:23:51.000000000 +0200 -+++ openl2tp-1.8/l2tp_common.c 2011-06-04 21:00:45.000000000 +0200 -@@ -938,6 +938,10 @@ - } - len += fprintf(file, " multilink: %s, proxy arp: %s\n", - pp->multilink ? "YES" : "NO", pp->proxy_arp ? "YES" : "NO"); -+ if (OPTSTRING_PTR(pp->optionsfile) != NULL) { -+ len += fprintf(file, " optionsfile: %s\n", OPTSTRING(pp->optionsfile)); -+ } -+ - len += fprintf(file, " IP parameters:-\n"); - ip_to_string(&local_ip[0], pp->local_ip_addr.s_addr); - ip_to_string(&peer_ip[0], pp->peer_ip_addr.s_addr); -diff -brau openl2tp-1.8.o/l2tp_config.c openl2tp-1.8/l2tp_config.c ---- openl2tp-1.8.o/l2tp_config.c 2010-01-18 12:35:14.000000000 +0200 -+++ openl2tp-1.8/l2tp_config.c 2011-06-04 11:43:03.000000000 +0200 -@@ -3123,6 +3123,7 @@ - L2TP_PPP_ARGID_LOCAL_NAME, - L2TP_PPP_ARGID_REMOTE_NAME, - L2TP_PPP_ARGID_PROXY_ARP, -+ L2TP_PPP_ARGID_OPTIONSFILE, - } l2tp_ppp_arg_ids_t; - - #undef ARG -@@ -3187,7 +3188,8 @@ - ARG(REMOTE_NAME, "remote_name", 0, string, "Name to assume for the remote peer for authentication purposes"), \ - ARG(USE_AS_DEFAULT_ROUTE, "default_route", 0, bool, "Use link as default route"), \ - ARG(MULTILINK, "multilink", 0, bool, "Enable PPP multilink connections."), \ -- ARG(PROXY_ARP, "proxy_arp", 0, bool, "Use proxy arp.") -+ ARG(PROXY_ARP, "proxy_arp", 0, bool, "Use proxy arp."), \ -+ ARG(OPTIONSFILE, "optionsfile", 0, string, "ppp options file to use") - - - static struct cli_arg_entry l2tp_args_ppp_profile_create[] = { -@@ -3267,6 +3269,7 @@ - FLG(USE_AS_DEFAULT_ROUTE, "default_route", "Use link as default route"), \ - FLG(MULTILINK, "multilink", "Enable PPP multilink connections."), \ - FLG(PROXY_ARP, "proxy_arp", "Use proxy arp."), -+ FLG(OPTIONSFILE, "optionsfile", "ppp options file to use"), - { NULL, }, - }; - -@@ -3488,6 +3491,15 @@ - msg->remote_name.valid = 1; - msg->flags2 |= L2TP_API_PPP_PROFILE_FLAG_REMOTE_NAME; - break; -+ case L2TP_PPP_ARGID_OPTIONSFILE: -+ OPTSTRING(msg->optionsfile) = strdup(arg_value); -+ if (OPTSTRING(msg->optionsfile) == NULL) { -+ result = -ENOMEM; -+ goto out; -+ } -+ msg->optionsfile.valid = 1; -+ msg->flags2 |= L2TP_API_PPP_PROFILE_FLAG_OPTIONSFILE; -+ break; - } - - result = 0; -@@ -3856,6 +3868,9 @@ - case L2TP_PPP_ARGID_REMOTE_NAME: - msg.flags2 |= L2TP_API_PPP_PROFILE_FLAG_REMOTE_NAME; - break; -+ case L2TP_PPP_ARGID_OPTIONSFILE: -+ msg.flags2 |= L2TP_API_PPP_PROFILE_FLAG_OPTIONSFILE; -+ break; - } - } L2TP_ACT_END(); - -@@ -4867,6 +4882,7 @@ - L2TP_API_PPP_PROFILE_FLAG_LOCAL_NAME | - L2TP_API_PPP_PROFILE_FLAG_REMOTE_NAME | - L2TP_API_PPP_PROFILE_FLAG_PROXY_ARP | -+ L2TP_API_PPP_PROFILE_FLAG_OPTIONSFILE | - L2TP_API_PPP_PROFILE_FLAG_AUTH_NONE | - L2TP_API_PPP_PROFILE_FLAG_AUTH_REFUSE_EAP | - L2TP_API_PPP_PROFILE_FLAG_AUTH_REFUSE_MSCHAPV2 | -@@ -5028,6 +5044,9 @@ - if (cfg->flags2 & L2TP_API_PPP_PROFILE_FLAG_PROXY_ARP) { - fprintf(file, "\tproxy_arp=%s \\\n", Y_OR_N(cfg->proxy_arp)); - } -+ if ((cfg->flags2 & L2TP_API_PPP_PROFILE_FLAG_OPTIONSFILE) && (OPTSTRING_PTR(cfg->optionsfile) != NULL)) { -+ fprintf(file, "\toptionsfile=%s \\\n", OPTSTRING_PTR(cfg->optionsfile)); -+ } - fprintf(file, "\n"); - } - } -diff -brau openl2tp-1.8.o/l2tp_config_parse.y openl2tp-1.8/l2tp_config_parse.y ---- openl2tp-1.8.o/l2tp_config_parse.y 2010-11-09 16:50:58.000000000 +0200 -+++ openl2tp-1.8/l2tp_config_parse.y 2011-06-04 11:11:42.000000000 +0200 -@@ -154,6 +154,7 @@ - %token QUOTEDSTRING - %token BOOL - %token IPADDRESS -+%token OPTIONSFILE - - %token INITIAL_RCVD_LCP_CONFREQ - %token CALLING_NUMBER -@@ -1167,6 +1168,18 @@ - OPTSTRING(ppp_profile.remote_name) = $3.buf; - ppp_profile.remote_name.valid = 1; - } -+ | OPTIONSFILE EQUALS STRING -+ { -+ ppp_profile.flags2 |= L2TP_API_PPP_PROFILE_FLAG_OPTIONSFILE; -+ OPTSTRING(ppp_profile.optionsfile) = $3.buf; -+ ppp_profile.optionsfile.valid = 1; -+ } -+ | OPTIONSFILE EQUALS QUOTEDSTRING -+ { -+ ppp_profile.flags2 |= L2TP_API_PPP_PROFILE_FLAG_OPTIONSFILE; -+ OPTSTRING(ppp_profile.optionsfile) = $3.buf; -+ ppp_profile.optionsfile.valid = 1; -+ } - ; - - tunnel_command -diff -brau openl2tp-1.8.o/l2tp_config_token.l openl2tp-1.8/l2tp_config_token.l ---- openl2tp-1.8.o/l2tp_config_token.l 2010-11-12 14:31:21.000000000 +0200 -+++ openl2tp-1.8/l2tp_config_token.l 2011-06-04 11:08:31.000000000 +0200 -@@ -191,6 +191,7 @@ - auth_eap { return(AUTH_EAP); } - auth_none { return(AUTH_NOAUTH); } - auth_peer { return(AUTH_PEER); } -+optionsfile { return(OPTIONSFILE); } - - {ws} { } - {linecont} { lineno++; } -diff -brau openl2tp-1.8.o/l2tp_ppp.c openl2tp-1.8/l2tp_ppp.c ---- openl2tp-1.8.o/l2tp_ppp.c 2008-05-07 22:44:20.000000000 +0200 -+++ openl2tp-1.8/l2tp_ppp.c 2011-06-04 16:08:25.000000000 +0200 -@@ -70,6 +70,7 @@ - int auth_refuse_mschap:1; - int auth_refuse_mschapv2:1; - int auth_refuse_eap:1; -+ char *optionsfile; - }; - - static struct l2tp_ppp_profile *l2tp_ppp_defaults; -@@ -241,6 +242,9 @@ - if (msg->flags2 & L2TP_API_PPP_PROFILE_FLAG_REMOTE_NAME) { - L2TP_SET_OPTSTRING_VAR(profile, remote_name); - } -+ if (msg->flags2 & L2TP_API_PPP_PROFILE_FLAG_OPTIONSFILE) { -+ L2TP_SET_OPTSTRING_VAR(profile, optionsfile); -+ } - - out: - return result; -@@ -346,6 +350,14 @@ - } - } - -+ if (l2tp_ppp_defaults->optionsfile != NULL) { -+ profile->optionsfile = strdup(l2tp_ppp_defaults->optionsfile); -+ if (profile->optionsfile == NULL) { -+ *result = -ENOMEM; -+ goto err; -+ } -+ } -+ - /* Override defaults by user-supplied params */ - *result = l2tp_ppp_profile_modify(&msg, profile); - -@@ -379,6 +391,24 @@ - *result = -ENOMEM; - goto out; - err: -+ if (profile->radius_hint != NULL) { -+ free(profile->radius_hint); -+ } -+ if (profile->ip_pool_name != NULL) { -+ free(profile->ip_pool_name); -+ } -+ if (profile->profile_name != NULL) { -+ free(profile->profile_name); -+ } -+ if (profile->local_name != NULL) { -+ free(profile->local_name); -+ } -+ if (profile->remote_name != NULL) { -+ free(profile->remote_name); -+ } -+ if (profile->optionsfile != NULL) { -+ free(profile->optionsfile); -+ } - free(profile); - goto out; - } -@@ -430,6 +460,9 @@ - if (profile->remote_name != NULL) { - free(profile->remote_name); - } -+ if (profile->optionsfile != NULL) { -+ free(profile->optionsfile); -+ } - USL_POISON_MEMORY(profile, 0xe5, sizeof(*profile)); - free(profile); - *result = 0; -@@ -578,6 +611,14 @@ - } - result->remote_name.valid = 1; - } -+ if (profile->optionsfile != NULL) { -+ OPTSTRING(result->optionsfile) = strdup(profile->optionsfile); -+ if (OPTSTRING(result->optionsfile) == NULL) { -+ result->result_code = -ENOMEM; -+ goto out; -+ } -+ result->optionsfile.valid = 1; -+ } - - out: - L2TP_DEBUG(L2TP_API, "%s: flags=%x/%x result=%d", __func__, result->flags, result->flags2, result->result_code); -@@ -598,6 +639,9 @@ - if (OPTSTRING_PTR(msg->remote_name) != NULL) { - free(OPTSTRING(msg->remote_name)); - } -+ if (OPTSTRING_PTR(msg->optionsfile) != NULL) { -+ free(OPTSTRING(msg->optionsfile)); -+ } - if (msg->profile_name != NULL) { - free(msg->profile_name); - } -@@ -843,6 +887,12 @@ - } - profile->remote_name = NULL; - } -+ if (msg.flags2 & L2TP_API_PPP_PROFILE_FLAG_OPTIONSFILE) { -+ if (profile->optionsfile != NULL) { -+ free(profile->optionsfile); -+ } -+ profile->optionsfile = NULL; -+ } - - /* Clear all requested flags */ - profile->flags &= ~(msg.flags); -@@ -937,6 +987,12 @@ - } - l2tp_ppp_defaults->local_name = NULL; - l2tp_ppp_defaults->remote_name = NULL; -+ if (strlen(L2TP_API_PPP_PROFILE_DEFAULT_OPTIONSFILE) > 0) { -+ l2tp_ppp_defaults->optionsfile = strdup(L2TP_API_PPP_PROFILE_DEFAULT_OPTIONSFILE); -+ if (l2tp_ppp_defaults->optionsfile == NULL) { -+ goto nomem; -+ } -+ } - - USL_LIST_HEAD_INIT(&l2tp_ppp_defaults->list); - usl_list_add(&l2tp_ppp_defaults->list, &l2tp_ppp_profile_list); -diff -brau openl2tp-1.8.o/l2tp_rpc.x openl2tp-1.8/l2tp_rpc.x ---- openl2tp-1.8.o/l2tp_rpc.x 2010-11-04 18:30:36.000000000 +0200 -+++ openl2tp-1.8/l2tp_rpc.x 2011-06-04 11:06:08.000000000 +0200 -@@ -946,6 +946,7 @@ - const L2TP_API_PPP_PROFILE_FLAG_AUTH_REFUSE_CHAP = 65536; - const L2TP_API_PPP_PROFILE_FLAG_AUTH_REFUSE_PAP = 131072; - const L2TP_API_PPP_PROFILE_FLAG_AUTH_PEER = 262144; -+const L2TP_API_PPP_PROFILE_FLAG_OPTIONSFILE = 524288; - - /* Default values for PPP profile attributes. - * These are used if an explicit value is not provided by the user. -@@ -993,6 +994,7 @@ - const L2TP_API_PPP_PROFILE_DEFAULT_USE_AS_DEFAULT_ROUTE = 0; - const L2TP_API_PPP_PROFILE_DEFAULT_MULTILINK = 0; - const L2TP_API_PPP_PROFILE_DEFAULT_PROXY_ARP = 0; -+const L2TP_API_PPP_PROFILE_DEFAULT_OPTIONSFILE = ""; - - enum l2tp_api_ppp_sync_mode { - L2TP_API_PPP_SYNCMODE_SYNC_ASYNC, -@@ -1051,6 +1053,7 @@ - optstring local_name; - optstring remote_name; - bool proxy_arp; -+ optstring optionsfile; - }; - - struct l2tp_api_ppp_profile_list_entry { -diff -brau openl2tp-1.8.o/plugins/ppp_unix.c openl2tp-1.8/plugins/ppp_unix.c ---- openl2tp-1.8.o/plugins/ppp_unix.c 2010-11-22 16:03:48.000000000 +0200 -+++ openl2tp-1.8/plugins/ppp_unix.c 2011-06-04 14:41:43.000000000 +0200 -@@ -282,6 +282,11 @@ - } - } - -+ if ((params->flags2 & L2TP_API_PPP_PROFILE_FLAG_OPTIONSFILE) && (OPTSTRING_PTR(params->optionsfile) != NULL)) { -+ argv[arg++] = "file"; -+ argv[arg++] = strdup(OPTSTRING(params->optionsfile)); -+ } -+ - /* By default, use sync mode */ - if (!((params->flags & L2TP_API_PPP_PROFILE_FLAG_SYNC_MODE) && - (params->sync_mode == L2TP_API_PPP_SYNCMODE_ASYNC))) { diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-parallelbuild.patch b/net-dialup/openl2tp/files/openl2tp-1.8-parallelbuild.patch deleted file mode 100644 index 8851f321f27a..000000000000 --- a/net-dialup/openl2tp/files/openl2tp-1.8-parallelbuild.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- openl2tp-1.8/Makefile.orig 2020-07-12 12:53:31.484055262 +0300 -+++ openl2tp-1.8/Makefile 2020-07-12 12:56:45.783822669 +0300 -@@ -197,7 +197,7 @@ - - .PHONY: $(SUBDIRS:%=subdir-%) - --$(SUBDIRS:%=subdir-%): FORCE -+$(SUBDIRS:%=subdir-%): FORCE generated-files - $(MAKE) -C $(@:subdir-%=%) $(MFLAGS) EXTRA_CFLAGS="$(CPPFLAGS)" - - ifeq ($(L2TP_FEATURE_LOCAL_CONF_FILE),y) -@@ -211,7 +211,7 @@ - %.h %.c: %.y - $(YACC) -d -o l2tp_config_parse.c $< - --l2tp_config_token.o: l2tp_config_token.c -+l2tp_config_token.o: l2tp_config_token.c l2tp_config_parse.h - $(CC) -I. -MMD -w $(CFLAGS.optimize) -c -DYY_NO_UNPUT $< - - l2tp_config_parse.o: l2tp_config_parse.c l2tp_config_parse.h -@@ -265,13 +265,13 @@ - @for d in $(SUBDIRS); do $(MAKE) -C $$d $(MFLAGS) $@; done - etags $(wildcard *.c) $(wildcard *.h) - --openl2tpd: $(L2TPD_SRCS.o) -- $(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS.l2tpd) -+openl2tpd: generated-files $(SUBDIRS:%=subdir-%) $(L2TPD_SRCS.o) -+ $(CC) $(LDFLAGS) -o $@ $(L2TPD_SRCS.o) $(LDFLAGS.l2tpd) - --l2tpconfig: $(L2TPCONFIG_SRCS.o) -- $(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS.l2tpconfig) -+l2tpconfig: openl2tpd $(L2TPCONFIG_SRCS.o) -+ $(CC) $(LDFLAGS) -o $@ $(L2TPCONFIG_SRCS.o) $(LDFLAGS.l2tpconfig) - --%.o: %.c -+%.o: %.c generated-files - $(CC) -c $(CFLAGS) $< -o $@ - - l2tp_options.h: FORCE diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-pppd-2.patch b/net-dialup/openl2tp/files/openl2tp-1.8-pppd-2.patch deleted file mode 100644 index 5d326562c414..000000000000 --- a/net-dialup/openl2tp/files/openl2tp-1.8-pppd-2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nrau openl2tp-1.8.o/Makefile openl2tp-1.8/Makefile ---- openl2tp-1.8.o/Makefile 2011-06-03 17:45:24.000000000 +0200 -+++ openl2tp-1.8/Makefile 2011-06-03 17:52:22.000000000 +0200 -@@ -55,7 +55,7 @@ - # in the pppd subdirectory of the compiler's default search path - # (e.g. /usr/include/pppd). but can be pointed to another directory if - # desired. --PPPD_VERSION= 2.4.5 -+#PPPD_VERSION= 2.4.5 - # PPPD_INCDIR= /usr/include/pppd - # PPPD_LIBDIR= $(SYS_LIBDIR)/pppd/$(PPPD_VERSION) - diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-setkey.patch b/net-dialup/openl2tp/files/openl2tp-1.8-setkey.patch deleted file mode 100644 index d7b9e0681828..000000000000 --- a/net-dialup/openl2tp/files/openl2tp-1.8-setkey.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -brau openl2tp-1.8.o/plugins/ipsec.c openl2tp-1.8/plugins/ipsec.c ---- openl2tp-1.8.o/plugins/ipsec.c 2010-01-18 11:00:08.000000000 +0200 -+++ openl2tp-1.8/plugins/ipsec.c 2011-06-05 11:00:28.000000000 +0200 -@@ -31,7 +31,7 @@ - #include "usl.h" - #include "l2tp_private.h" - --#define IPSEC_SETKEY_CMD "/sbin/setkey" -+#define IPSEC_SETKEY_CMD "/usr/sbin/setkey" - #define IPSEC_SETKEY_FILE "/tmp/openl2tpd-tmp" - #define IPSEC_SETKEY_ACTION IPSEC_SETKEY_CMD " -f " IPSEC_SETKEY_FILE - diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-strings.patch b/net-dialup/openl2tp/files/openl2tp-1.8-strings.patch deleted file mode 100644 index 16b7beffb212..000000000000 --- a/net-dialup/openl2tp/files/openl2tp-1.8-strings.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff '--color=auto' -Naurd openl2tp-1.8.orig/l2tp_plugin.c openl2tp-1.8/l2tp_plugin.c ---- openl2tp-1.8.orig/l2tp_plugin.c 2008-09-25 19:00:55.000000000 +0400 -+++ openl2tp-1.8/l2tp_plugin.c 2020-07-12 11:55:23.292225206 +0300 -@@ -85,16 +85,20 @@ - - if (strchr(name, '/') == 0) { - const char *base = L2TP_PLUGIN_DIR; -- int len = strlen(base) + strlen(name) + 2; -+ size_t len_base, len_name, len; -+ len_base = strlen(base); -+ len_name = strlen(name); -+ len = len_base + len_name + 2; - path = malloc(len); - if (path == NULL) { - l2tp_log(LOG_ERR, "OOM: plugin file path"); - return -ENOMEM; - } - -- strncpy(path, base, len); -- strncat(path, "/", len); -- strncat(path, name, len); -+ memcpy(path, base, len_base); -+ path[len_base] = '/'; -+ memcpy(path + len_base + 1, name, len_name); -+ path[len - 1] = '\0'; - } else { - path = strdup(name); - if (path == NULL) { -diff '--color=auto' -Naurd openl2tp-1.8.orig/plugins/ppp_unix.c openl2tp-1.8/plugins/ppp_unix.c ---- openl2tp-1.8.orig/plugins/ppp_unix.c 2020-07-12 11:37:06.287914337 +0300 -+++ openl2tp-1.8/plugins/ppp_unix.c 2020-07-12 12:31:26.042810957 +0300 -@@ -811,7 +811,7 @@ - { - pid_t pid; - int result = 0; -- char str[10]; -+ char str[11]; - struct l2tp_session_config const *scfg; - - pid = usl_pid_safe_fork(); -@@ -1362,7 +1362,8 @@ - tmp_fd = socket(AF_INET, SOCK_DGRAM, 0); - if (tmp_fd >= 0) { - memset (&ifr, '\0', sizeof (ifr)); -- strncpy(ifr.ifr_name, ppp->interface_name, sizeof (ifr.ifr_name)); -+ strncpy(ifr.ifr_name, ppp->interface_name, sizeof (ifr.ifr_name) - 1); -+ ifr.ifr_name[sizeof(ifr.ifr_name)-1] = '\0'; - ifr.ifr_mtu = mtu; - - result = ioctl(tmp_fd, SIOCSIFMTU, (caddr_t) &ifr); -diff '--color=auto' -Naurd openl2tp-1.8.orig/l2tp_statusfile.c openl2tp-1.8/l2tp_statusfile.c ---- openl2tp-1.8.orig/l2tp_statusfile.c 2020-07-12 15:58:52.279211936 +0300 -+++ openl2tp-1.8/l2tp_statusfile.c 2020-07-12 15:59:07.949273953 +0300 -@@ -48,7 +48,7 @@ - - static FILE *l2tp_statusfile_file_create(const char *parent, const char *name) - { -- char filename[256]; -+ char filename[257]; - FILE *file; - - if (name != NULL) { -@@ -66,7 +66,7 @@ - static int l2tp_statusfile_file_delete(const char *root, const char *parent, const char *name) - { - int result; -- char filename[256]; -+ char filename[257]; - - if (root == NULL) { - if (name != NULL) { -@@ -102,7 +102,7 @@ - static int l2tp_statusfile_dir_create(const char *parent, const char *name) - { - int result; -- char dirname[256]; -+ char dirname[257]; - - if (name != NULL) { - sprintf(dirname, L2TP_STATUSFILE_DIR "/%s/%s", parent, name); -@@ -127,8 +127,8 @@ - static int l2tp_statusfile_dir_delete(const char *root, const char *parent, const char *name, int recursive) - { - int result; -- char dirname[256]; -- char filename[256]; -+ char dirname[257]; -+ char filename[257]; - DIR *dir; - struct dirent *entry; - struct stat statbuf; -diff '--color=auto' -Naurd openl2tp-1.8.orig/l2tp_config.c openl2tp-1.8/l2tp_config.c ---- openl2tp-1.8.orig/l2tp_config.c 2020-07-12 16:03:00.062192426 +0300 -+++ openl2tp-1.8/l2tp_config.c 2020-07-12 16:07:00.035142012 +0300 -@@ -135,7 +135,8 @@ - goto out; - } - if (strcmp(server_name, &server[0])) { -- strncpy(&server[0], server_name, sizeof(server)); -+ strncpy(&server[0], server_name, sizeof(server) - 1); -+ server[sizeof(server) - 1] = '\0'; - - clnt_destroy(cl); - cl = clnt_create(server, L2TP_PROG, L2TP_VERSION, opt_rpc_protocol); -@@ -6629,7 +6630,8 @@ - arg++; - break; - case 'R': -- strncpy(server, optarg, sizeof(server)); -+ strncpy(server, optarg, sizeof(server) - 1); -+ server[sizeof(server) - 1] = '\0'; - arg += 2; - l2tp_set_prompt(server); - break; diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-tirpc.patch b/net-dialup/openl2tp/files/openl2tp-1.8-tirpc.patch deleted file mode 100644 index 038d53c30d52..000000000000 --- a/net-dialup/openl2tp/files/openl2tp-1.8-tirpc.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -Naurd openl2tp-1.8.orig/Makefile openl2tp-1.8/Makefile ---- openl2tp-1.8.orig/Makefile 2018-07-03 05:02:39.734741959 +0900 -+++ openl2tp-1.8/Makefile 2018-07-03 05:01:52.071450387 +0900 -@@ -159,8 +159,8 @@ - -MMD -Wall -Wno-strict-aliasing \ - $(CPPFLAGS) $(CPPFLAGS.dmalloc) \ - -DSYS_LIBDIR=$(SYS_LIBDIR) --LDFLAGS.l2tpd= -Wl,-E -L. -Lusl -lusl -ldl $(LIBS.dmalloc) -lc -+LDFLAGS.l2tpd= -Wl,-E -L. -Lusl -lusl -ldl -ltirpc $(LIBS.dmalloc) -lc --LDFLAGS.l2tpconfig= -Lcli -lcli -lreadline $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc -+LDFLAGS.l2tpconfig= -Lcli -lcli -lreadline -ltirpc $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc - - ifeq ($(L2TP_DEBUG),y) - CFLAGS.opt= -g -@@ -168,6 +168,7 @@ - else - CFLAGS.opt= $(OPT_CFLAGS) - endif -+CFLAGS.opt+= -isystem /usr/include/tirpc - CFLAGS.optimize= $(CFLAGS) $(CFLAGS.opt) - export CFLAGS.optimize - -diff -Naurd openl2tp-1.8.orig/l2tp_api.c openl2tp-1.8/l2tp_api.c ---- openl2tp-1.8.orig/l2tp_api.c 2018-07-03 04:59:47.000000000 +0900 -+++ openl2tp-1.8/l2tp_api.c 2018-07-03 05:01:52.073450358 +0900 -@@ -25,6 +25,7 @@ - - #include <rpc/pmap_clnt.h> - #include <net/ethernet.h> -+#include <netinet/in.h> - - #include "usl.h" - -@@ -443,14 +443,16 @@ - */ - int l2tp_api_rpc_check_request(SVCXPRT *xprt) - { -+ char straddr[INET6_ADDRSTRLEN]; - /* If remote RPC is not enabled and the request is from a - * non-loopback interface, reject the request. - */ - if ((!l2tp_opt_remote_rpc) && -- ((xprt->xp_raddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)) && -- (xprt->xp_raddr.sin_addr.s_addr != htonl(INADDR_ANY)))) { -+ memcmp(&xprt->xp_raddr.sin6_addr, &in6addr_loopback, 16) && -+ memcmp(&xprt->xp_raddr.sin6_addr, &in6addr_any, 16)) { - if (l2tp_opt_trace_flags & L2TP_DEBUG_API) { -- l2tp_log(LOG_ERR, "Rejecting RPC request from %s", inet_ntoa(xprt->xp_raddr.sin_addr)); -+ l2tp_log(LOG_ERR, "Rejecting RPC request from %s", -+ inet_ntop(AF_INET6, &xprt->xp_raddr.sin6_addr, straddr, INET6_ADDRSTRLEN)); - } - svcerr_auth(xprt, AUTH_TOOWEAK); - return -EPERM; diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-unused-var.patch b/net-dialup/openl2tp/files/openl2tp-1.8-unused-var.patch deleted file mode 100644 index 2e1f6277cf5f..000000000000 --- a/net-dialup/openl2tp/files/openl2tp-1.8-unused-var.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naurd openl2tp-1.8.orig/pppd/pppol2tp.c openl2tp-1.8/pppd/pppol2tp.c ---- openl2tp-1.8.orig/pppd/pppol2tp.c 2010-11-15 15:12:43.000000000 +0300 -+++ openl2tp-1.8/pppd/pppol2tp.c 2018-03-17 14:11:07.484281421 +0300 -@@ -297,7 +297,7 @@ - static bool got_recv_accm = 0; - static uint32_t recv_accm = 0xffffffff; - static uint32_t send_accm = 0xffffffff; -- static bool snooping = 1; -+ // static bool snooping = 1; - - uint16_t protocol; - uint16_t lcp_pkt_len; -@@ -328,7 +328,7 @@ - "Network protocol %04x found.", - protocol); - } -- snooping = 0; -+ // snooping = 0; - return; - } - diff --git a/net-dialup/openl2tp/files/openl2tp-1.8-werror.patch b/net-dialup/openl2tp/files/openl2tp-1.8-werror.patch deleted file mode 100644 index d36447dfe966..000000000000 --- a/net-dialup/openl2tp/files/openl2tp-1.8-werror.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur openl2tp-1.8.orig/Makefile openl2tp-1.8/Makefile ---- openl2tp-1.8.orig/Makefile 2010-11-22 12:47:26.000000000 +0300 -+++ openl2tp-1.8/Makefile 2010-11-28 17:18:02.547651027 +0300 -@@ -154,7 +154,7 @@ - - CPPFLAGS= $(CPPFLAGS.l2tptest) $(CPPFLAGS-y) - CFLAGS= -I. -Iusl -Icli -isystem include \ -- -MMD -Wall -Werror -Wno-strict-aliasing \ -+ -MMD -Wall -Wno-strict-aliasing \ - $(CPPFLAGS) $(CPPFLAGS.dmalloc) \ - -DSYS_LIBDIR=$(SYS_LIBDIR) - LDFLAGS.l2tpd= -Wl,-E -L. -Lusl -lusl -ldl $(LIBS.dmalloc) -lc -diff -Naur openl2tp-1.8.orig/cli/Makefile openl2tp-1.8/cli/Makefile ---- openl2tp-1.8.orig/cli/Makefile 2010-11-12 15:28:47.000000000 +0300 -+++ openl2tp-1.8/cli/Makefile 2010-11-28 17:18:27.707453102 +0300 -@@ -7,7 +7,7 @@ - - LDFLAGS.cli_test= -L.. -L. $(READLINE_LDFLAGS) -lcli -lusl -lreadline -lcurses -lc - --CFLAGS= $(CFLAGS.optimize) -MMD -Wall -Werror -I.. $(READLINE_CFLAGS) -+CFLAGS= $(CFLAGS.optimize) -MMD -Wall -I.. $(READLINE_CFLAGS) - - .PHONY: all test clean - -diff -Naur openl2tp-1.8.orig/usl/Makefile openl2tp-1.8/usl/Makefile ---- openl2tp-1.8.orig/usl/Makefile 2010-11-04 19:27:08.000000000 +0300 -+++ openl2tp-1.8/usl/Makefile 2010-11-28 17:18:15.615816682 +0300 -@@ -14,7 +14,7 @@ - endif - - CPPFLAGS+= $(CFLAGS.optimize) -g --CFLAGS= -I. -MMD -Wall -Werror -Wno-strict-aliasing $(CPPFLAGS) $(CPPFLAGS.dmalloc) -+CFLAGS= -I. -MMD -Wall -Wno-strict-aliasing $(CPPFLAGS) $(CPPFLAGS.dmalloc) - - .PHONY: all test clean - diff --git a/net-dialup/openl2tp/files/openl2tpd.confd b/net-dialup/openl2tp/files/openl2tpd.confd deleted file mode 100644 index c4b7ee5ec392..000000000000 --- a/net-dialup/openl2tp/files/openl2tpd.confd +++ /dev/null @@ -1,17 +0,0 @@ -# Settings for the OpenL2TP daemon. -# OPENL2TPDARGS= : any extra command-line startup arguments for openl2tpd -# -D - enable debug messages from all tunnels and sessions -# -d nnn - set debug trace mask to nnn -# -L log-facility - set syslog facility (default LOG_DAEMON) -# -R - allow remote management using RPC -# -# OPENL2TPD_CONFIG_FILE= : a file containing L2TP config that -# is loaded when openl2tpd starts up. - -# Use ipsec.so plugin for IPSec setups. -#OPENL2TPDARGS="-p ipsec.so" -OPENL2TPDARGS= - -# Config file to load at openl2tpd startup. -# /etc/openl2tpd.conf is used by default if none is provided here -OPENL2TPD_CONFIG_FILE= diff --git a/net-dialup/openl2tp/files/openl2tpd.initd b/net-dialup/openl2tp/files/openl2tpd.initd deleted file mode 100644 index fda6770fa90f..000000000000 --- a/net-dialup/openl2tp/files/openl2tpd.initd +++ /dev/null @@ -1,69 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -userpc="yes" -retry_count="40" -retry_delay="0.5" - -bin=/usr/sbin/openl2tpd -pid=/var/run/openl2tpd.pid -[ -z "${OPENL2TPD_CONFIG_FILE}" ] && OPENL2TPD_CONFIG_FILE="/etc/openl2tpd.conf" - -depend() { - need net - [ "${userpc}" = "yes" ] && need portmap - use dns ipsec racoon -} - -check_module () { - if ! [ -f /proc/net/pppol2tp ]; then - ebegin "Loading l2tp module" - # try both new and old module names - modprobe l2tp_ppp 2>/dev/null || modprobe pppol2tp 2>/dev/null - eend $? - fi -} - -start() { - check_module - ebegin "Starting openl2tpd" - # if rpc is enabled do not read config file by daemon (has bugs), - # but read by l2tpconfig instead - if [ "${userpc}" = "yes" ]; then - conf="/dev/null" - else - conf="${OPENL2TPD_CONFIG_FILE}" - fi - - start-stop-daemon --start --quiet --exec ${bin} --pidfile ${pid} \ - -- -c "$conf" ${OPENL2TPDARGS} - - # it is possible to not to have config at all - if [ "${userpc}" = "yes" ] && [ -r "${OPENL2TPD_CONFIG_FILE}" ]; then - # on system startup it may take some time to load daemon - local i=0; - while [ $i -lt $retry_count ]; do - l2tpconfig config restore file="${OPENL2TPD_CONFIG_FILE}" >/dev/null 2>&1 - retcode=$? - [ ${retcode} = 0 ] && break - i=$((i+1)) - sleep $retry_delay - done - fi - eend $retcode -} - -stop() { - local rc - ebegin "Stopping openl2tpd" - start-stop-daemon --stop --quiet --exec ${bin} --pidfile ${pid} - rc=$? - - if [ ${RC_CMD} = "restart" ]; then - einfo "sleeping for server to finalize connections" - sleep 2 - fi - - eend ${rc} -} diff --git a/net-dialup/openl2tp/metadata.xml b/net-dialup/openl2tp/metadata.xml deleted file mode 100644 index 1e52fda2e8ab..000000000000 --- a/net-dialup/openl2tp/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -<use> - <flag name="client">Enable l2tp client.</flag> - <flag name="dmalloc">Enable debugging using <pkg>dev-libs/dmalloc</pkg>.</flag> - <flag name="rpc">Enable RPC control management. This flag is required for - l2tpconfig to be built and used.</flag> - <flag name="server">Enable l2tp server.</flag> - <flag name="stats">Enable status files. Note: when they are used, this - hampers performance of the daemon.</flag> -</use> -</pkgmetadata> diff --git a/net-dialup/openl2tp/openl2tp-1.8-r2.ebuild b/net-dialup/openl2tp/openl2tp-1.8-r2.ebuild deleted file mode 100644 index f59cc991ddff..000000000000 --- a/net-dialup/openl2tp/openl2tp-1.8-r2.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info - -DESCRIPTION="Userspace tools for kernel L2TP implementation" -HOMEPAGE="https://sourceforge.net/projects/openl2tp/" -SRC_URI="https://downloads.sourceforge.net/openl2tp/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+client debug dmalloc doc +examples rpc server stats" - -REQUIRED_USE="|| ( client server )" - -BDEPEND=" - >=net-libs/rpcsvc-proto-1.3.1-r1 - app-alternatives/yacc - app-alternatives/lex -" -DEPEND=" - >=net-dialup/ppp-2.4.5 - >=net-libs/libtirpc-1.0.3 - sys-libs/readline:= - dmalloc? ( dev-libs/dmalloc ) -" -RDEPEND="${DEPEND} - rpc? ( net-nds/rpcbind ) -" - -CONFIG_CHECK="~PPPOL2TP" - -PATCHES=( - "${FILESDIR}/${P}-werror.patch" - "${FILESDIR}/${P}-ldflags.patch" - "${FILESDIR}/${P}-pppd-2.patch" - "${FILESDIR}/${P}-man.patch" - "${FILESDIR}/${P}-l2tpconfig.patch" - "${FILESDIR}/${P}-parallelbuild.patch" - "${FILESDIR}/${P}-optionsfile.patch" - "${FILESDIR}/${P}-clientip_as_ipparam.patch" - "${FILESDIR}/${P}-setkey.patch" - "${FILESDIR}/${P}-unused-var.patch" - "${FILESDIR}/${P}-configure-Makefile.patch" - "${FILESDIR}/${P}-cflags.patch" - "${FILESDIR}/${P}-tirpc.patch" - "${FILESDIR}/${P}-native-tc.patch" - "${FILESDIR}/${P}-musl.patch" - "${FILESDIR}/${P}-strings.patch" -) - -src_prepare() { - default - sed -i 's/CFLAGS.optimize/CFLAGS_optimize/g' Makefile */Makefile || die "Makefile sed failed" -} - -src_configure() { - myconf= - - use client || myconf+=" L2TP_FEATURE_LAC_SUPPORT=n - L2TP_FEATURE_LAIC_SUPPORT=n - L2TP_FEATURE_LAOC_SUPPORT=n " - - use server || myconf+=" L2TP_FEATURE_LNS_SUPPORT=n - L2TP_FEATURE_LNIC_SUPPORT=n - L2TP_FEATURE_LNOC_SUPPORT=n " - - use rpc || myconf+=" L2TP_FEATURE_RPC_MANAGEMENT=n " - - use stats && myconf+=" L2TP_FEATURE_LOCAL_STAT_FILE=y " - use debug && myconf+=" L2TP_DEBUG=y " - use dmalloc && myconf+=" USE_DMALLOC=y " - - echo ${myconf} > "${T}/myconf" -} - -src_compile() { - emake $(cat "${T}/myconf") -} - -src_install() { - emake $(cat "${T}/myconf") DESTDIR="${D}" install - - if use examples; then - docinto event_socket - dodoc doc/{event_sock_example.c,README.event_sock} - docinto - dodoc -r "${FILESDIR}"/examples - fi - - if use doc; then - dodoc doc/*.txt - newdoc plugins/README README.plugins - dodoc -r ipsec - fi - - newinitd "${FILESDIR}"/openl2tpd.initd openl2tpd - # init.d script is quite different for RPC and non-RPC versions. - use rpc || sed -i s/userpc=\"yes\"/userpc=\"no\"/ "${D}/etc/init.d/openl2tpd" || die "sed failed" - newconfd "${FILESDIR}"/openl2tpd.confd openl2tpd -} - -pkg_postinst() { - if use rpc; then - ewarn - ewarn "RPC control does not provide any auth checks for control connection." - ewarn "Unless you need this you should disable it, for reference:" - ewarn "http://forums.openl2tp.org/viewtopic.php?f=4&t=41" - ewarn - ewarn "Therefore DO NOT USE RPC IN INSECURE ENVIRONMENTS!" - else - ewarn - ewarn "Without RPC support you won't be able to use l2tpconfig." - ewarn "Please read http://forums.openl2tp.org/viewtopic.php?f=4&t=41" - ewarn "for more information about the security risk before enabling." - ewarn - ewarn "If you are using numerical strings (e.g. login name containing only" - ewarn "digits) or special characters in password, please use double quotes" - ewarn "to enclose them." - fi - if use stats; then - ewarn - ewarn "To enable status files openl2tpd must be started with -S option." - ewarn "Upstream warns about runtime overhead with status files enabled." - fi -} diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest index bb6a6a1ea95e..329c1ccbd794 100644 --- a/net-dialup/xl2tpd/Manifest +++ b/net-dialup/xl2tpd/Manifest @@ -1,7 +1,9 @@ AUX xl2tpd-1.3.18-r1-close-calls-when-pppd-terminates.patch 1726 BLAKE2B 56433c1ca3a81e8f26c59235beeb0e105a9770e2faffa1657ff3c6bc79f48e248193fdb8b3ed50db11aa1c471a6b9a51c7801ff9857f572bb3ccdb6de7e4d513 SHA512 43a214c1fb0595648867e79b873356dff530340cc09b26cfac945152bb424b5ac0a912f5f53e9105ffc028cae3029018ea12c7c215a38fc57d7ded71dd1d6e5d +AUX xl2tpd-1.3.18-r2-Pass-remotenumber-to-pppd.patch 4029 BLAKE2B bdf288088991abe2fbb9e4e15a22e2db4508e0dbdeb4fe79cc05238b8d8b3a9ec052c5b92403b8c252a9952039889e49e11631fb1fb1e153581a705995994ee6 SHA512 b572171aab2cbc439424ac7387c0f1349db109ccb0fbc620ea3a0446e5747f54afc1235fae487d78a1784fe859c5558b248a808991838734984841deef05b60f AUX xl2tpd-init-r1 261 BLAKE2B f4aba90e73feeaea22401448681d60baf09854efaebe6d0a5722c96d2bb860653273351d1ce8a516b52491626db0e14ee1e8727b1b994b1ed1e1722ab9463214 SHA512 6d5aab46ee9dcdf3d15acc08d6d0dbbf868d27c4755526f3ae7c19dc9ba528d028a369a7779324687effa2458a60a06ee00984df99bcafce6a8aaa1113fc1788 AUX xl2tpd.conf 14 BLAKE2B ab6ecadf65d4cabd37779ea2de61860f1bced5b59e66cc6e4e960204ba04a4ecf2cef9fdacb79faec2f2e0966e299682d0cf99f97dd07c9873b3c6914a6668af SHA512 b209f3b365de37eb4a6b8c55fd06d79a09ac674e6bfcd40d08a7296f4ab64eb3b6d6b7338461192d19068868258ff70ea02261a56eaffb1bd15672921382ef72 AUX xl2tpd.service 232 BLAKE2B 16578777774cd7d378efb37f917e368d39f84267c45184d9b72a9d501f75e59cf2f14e1326c347cc4d62c541696a2cf4e5af51f13c0c909c26f908a374944e39 SHA512 184b4f63492c5a09fa61ebf0913a4a47e1cd3b321b80b122f2177ff8f5c9eccdc4a73831dfffc3c2e39325f5cb0b30c4e3f99c1f0fed1f21935be5da38a83579 DIST xl2tpd-1.3.18.tar.gz 534937 BLAKE2B ce745855709ac79d5d6aefbe2fb31a4e799f01c6ad31ad2e436c276933e079116daf32bcdc97b7459e4792aa2bd1ddbb600d798d8b28d1432681ffd319fe0829 SHA512 d1114777de5f3895429409fd5474da91fe9e9c218615eb989c9294de3e4e36dea7d8ea880a9b1b1ca18760e5709c8b8156c80d81401db479eaf215c026c3d861 EBUILD xl2tpd-1.3.18-r1.ebuild 1436 BLAKE2B 400c15c7a9b483df3a28c8ae8f577e79e8f16d8c0b4820bd824724122c7275d34e6f00dfcd3b4dd0d79908dd62967dc0ef2c3ab55aac0ae22a079572ef99df4f SHA512 d2b4db639064978c64519b48c761b5353118b407b4a830cbad7a999ace9a9edb092e8152d5ab85302172cad5c19ce71709bc16d999e531b77a8b105fd3b1000d +EBUILD xl2tpd-1.3.18-r2.ebuild 1504 BLAKE2B e22dff58f4602328864e8ea8fd325b5971dc4b21582df9e58df6d1dc827c661f00e7be5413c12be50ba0da134dd0ba7054f60f9f35c97e6eb668f1eb097d1733 SHA512 ca7897aec39b930d72524610431c814056343c10b7811ff049db435d6d3257135bab23609efd4f7fd2d70f78d6b97b2dffe01d8ebb197bae1fbdbdfc266c6cd2 MISC metadata.xml 879 BLAKE2B 45303811850f78008ae08da56724fd3e9ee5048db230735230504468a2ba03c8c4f19ebbc8b648f0f490504c9df35eb9c667c6dc320802105eaddad1f2098f8c SHA512 287af9f09cf7066768307b7dbb6b570291e4e15592c178e9dad215b1c3229cbfe9bee06994050184525d2636d3c3e87172caab49b084a27fd583461fed334df3 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 +} |