diff options
Diffstat (limited to 'net-dialup')
19 files changed, 274 insertions, 732 deletions
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz Binary files differindex fdb236683a25..fe43fb8763e4 100644 --- a/net-dialup/Manifest.gz +++ b/net-dialup/Manifest.gz diff --git a/net-dialup/pptpclient/Manifest b/net-dialup/pptpclient/Manifest index 4dbd7c4618e4..f2685083da45 100644 --- a/net-dialup/pptpclient/Manifest +++ b/net-dialup/pptpclient/Manifest @@ -4,6 +4,6 @@ AUX xpptp_fe.pl 5620 BLAKE2B 682623fe03b8d9e90f4e86837b850dd57a2a1b960e9f0554d65 DIST pptp-1.10.0.tar.gz 87007 BLAKE2B aeb8bff0025c5144678db2ee79ecd80ec3c7261640ed94596a3599c163763cbf17b50c37591fd8b39d0687db5dff9b4c14d1aa303d95b9fcaf4eb53602cf321b SHA512 d2b925fb9cb5dbc4da576dce0cfae62f466576ae5b5ed7d6edeaec9be16ab6e0d17c307df43ebdc06138f1269ef61ba8910462a4629b6262c452e8287cabe41c DIST pptp-1.8.0.tar.gz 86778 BLAKE2B 30cf3aadc3be97be83ac298ee366b5f44d7de669b083708194bd1d26c3b3f0d51e3d8b2484b6378f7c383c271732bc5be42c1674f3f71f19b979d4441e5b64a7 SHA512 cabcc2ef29d20859af923c6d96c524e83a80549839d1ad6fccaf9ec0ed5e7a5de7120e0694e6160b374952ea3ecb7b69d9809641000d6bf2585eeedb2d29c073 DIST pptp-command-20130515.bz2 7269 BLAKE2B dda3f517cf747e025dee1967841d40e58461384415161ef01bcc96c6568c5ccfb1af5254f26276164c43c41b668bf2646e5138985531d54f13ab2fedd410fab2 SHA512 3b0ad28c5f7bf4f674ba8742e8a3be50cb62521f767142a1a1e74263707bc860126b7238a4aea307366a71100a193d18f3ec7599f4c0c52cd259f8b1d6b429bf -EBUILD pptpclient-1.10.0.ebuild 1143 BLAKE2B 117e48b4391a42764213af4d49f958d36c3864edb5dd897322522593654af44d236b790fa1dec61573d6dfb6b3ade01fee2f28cee0b1671c057243aa4c54c8d7 SHA512 9fccfbeba66a4e9303865190cc410676ec3d55ffcd42af28894ad17ff5fb1205ca98648082e69c370d4277991605e23f53796ffcfce17e3aa80ebe7f2d38ee42 +EBUILD pptpclient-1.10.0.ebuild 1137 BLAKE2B b7ed439f14fb609ba5f002779e5dd308bb3aaa2c25febc79c65fd056dee6a87ec42c5e15a64fccb6b954ee3d25d3faae2197b09b90fbe137581115b85f9b5b1c SHA512 bbc5ceb25686ae23c5a0e11ec2742dda1a7ce72857edbb8aa0c01e20fee85b8293c0e8e0f3596a370aa75c2a8d394543128fb6ac5fe3b51ff8c39e62f74a22f0 EBUILD pptpclient-1.8.0.ebuild 1227 BLAKE2B 736df14cfeb87a3cb39b58855f608fe0f14eda367a36bd64b3ada1b08cb4d04de3037e7546f6fd181f03d97dcdc6c54db6966c00c14e95e1ca64a1cdff9a553c SHA512 e95fb37a5bb9fa83e8d647e7dfb67ea28773390f77da625937f2e830e99402873ecf76d919bed310c69dc5e5c6f1c6ab3d6393a71a09dcd4a13306816b8c4cf7 MISC metadata.xml 378 BLAKE2B 224be6ab2aa2334074dce847a6527f713f1c82f797862e58bb5ed972a4c1f464a53b67a28ea10635fd949a5aa927a9419f85163172f26376001c85e4784cb894 SHA512 7a4b7cfeecee2503bcf7171f7a66edc27962a6f461695dfad358421be6c1bfc794e438d9136448278b11a4fd0761df03132d8ee66b7e43f7b407c0a5bad09ea7 diff --git a/net-dialup/pptpclient/pptpclient-1.10.0.ebuild b/net-dialup/pptpclient/pptpclient-1.10.0.ebuild index a0aed74278d9..bf607214603e 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-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz SLOT="0" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 x86" IUSE="tk" DEPEND="net-dialup/ppp diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest index b2a949d8bd6b..38ae0de0c1db 100644 --- a/net-dialup/rp-pppoe/Manifest +++ b/net-dialup/rp-pppoe/Manifest @@ -1,17 +1,20 @@ +AUX pppoe-server.confd 428 BLAKE2B 83e91157082122ff084ed5b36031fa37950d154f22bed9630ca09f5e9ba00b65cbeb6769693f039b649b30b9c5f49051d6177e108bae2d23c58af7412363d5f6 SHA512 2216e972469d1b544d1dc5729a5c8e2520006f8fd1d07e4d2152a1fd6dd00f52cb97a984398058006f7830fbeae8ee1e8088d5d9ea7648acf50510cc19372b16 +AUX pppoe-server.initd 456 BLAKE2B 1dd9e1dbfe7e18c4f20d9e7a6eb99f942742516273053375e31e802df5297ad61645439ad76ec28a16b6da672862831de627273dd056021b76e1a37beac1fdbf SHA512 44df1122ae36f56c044c47e94c5dd70d00c060c23d0590f233f6cb6024241c1d1c83832d167c12a45ef4464e94f7d5f5e2ddf04c413ea929e1d398feafa0ec0a AUX rp-pppoe-3.10-autotools.patch 4038 BLAKE2B 12a95482243faf66c23724f19cf94ec06a4ddb402d5d6c4509c990dec202938fd51d1350292f1b993a535bcfc9d08e148873c1db6ac68220edd593e2daa641a4 SHA512 a6269e86c8b4d693fc8b0f501103bd3308394040d35ea9a163ce4f89b9a4a571178b0f52e693ab2189648309f136760d15d9247f4f17305582376507e26ea393 AUX rp-pppoe-3.10-gentoo-netscripts.patch 5238 BLAKE2B 711fe8e682214e4b933bd1abffd8dced7404dc916574a321523bba7827f05b6b50bda2bad9f04c002492767bce8c70d952848e315e621d16b680974659f7eeb2 SHA512 b479de56886e30c40cf707ed9edcef5ff3bc08448d8084c7f96b26fc20594ed2a5a61a9706d992fb1ddab5f7d6b4d68ce90b9a1dee606bf9b02843322eaa451f AUX rp-pppoe-3.10-linux-headers.patch 823 BLAKE2B 7262cc247fd1b991422173a1d0e2b8c9a793d94586c801a8eef884505e8c3bbaf8d66068e6c315e65823001aef4716af463f334fe96021f57e31dd737f211372 SHA512 f4cdbeb16af670c3674cf965c3fb43bed1e7716e6ff737b2592a8aa33453adc9dfff0466805bb8c84b6395adaa4c47e2b145cb073c0fb109456c27fd35bf0a96 AUX rp-pppoe-3.10-plugin-options.patch 1491 BLAKE2B 9e58f9931eb7e044435c4390e4b9e0c3b97aefcba36a9d0b33b31de0a06442f516b5780d2dbd05b5bd08043748612916db9e632a1fee1c1a4d6e2a81a76cacd6 SHA512 d25e64e6fa167271a425d0414254b9ba21e33eaaf2623027c586527a7c3be176be0166f9a1dd50885dfbef2e0cc57c9a228e74c736bcfe684add91c9cfb56792 AUX rp-pppoe-3.10-posix-source-sigaction.patch 513 BLAKE2B 6386ad7dac2f987e0930b5d7e16d2cace78c1148a30d349a3cf511c2db0b97bf206647d70e38f9ea9036ec3c35080839d863bced1c7701395715c67f85cb8b9d SHA512 52164a8194dbe160df3c16028ba3720cf801b94ab0d14e471b1fbff6db91e1e88be25fff3ece7571b49cc0befcbbe9aad2cd72da9d63cfcf16a9c365dc78d4ba -AUX rp-pppoe-3.10-session-offset.patch 832 BLAKE2B 96d3a04b4caa4836f27431c9f607fce275de50039c719a5444ffe82a8c76140957e7e9194a55322a6540343695309a0fa05ba3e618b9581e6d7f566955815b6d SHA512 20d169a27d7fc52c53e8ed06652c8db22c4b8b7d44a137c6f3beece41a408ca71b6aeb441a3bbcac76275382b40633f4a1c75dc95212402aa3ebf378dc3cb052 AUX rp-pppoe-3.10-username-charset.patch 1950 BLAKE2B d1338a634023ae9946be052ae576e1c075683f75e09e558ece04b04843fc61cc17c951ff261a0788cd635df7dcf1cfa65106c765fcb8b260a166c1267ccf126b SHA512 849cd9d0b59b844b2def6b49a203f3af0ec551a09235004b13541f14812517a651327e5694502a32f259b0eee7bc4b708800deabd93eaf3a01771bd47dd43e3f AUX rp-pppoe-3.11-gentoo.patch 333 BLAKE2B 31376abb679aef0c58af3ab2e44fe818c4ca2dd5abd9ec60ebd9bc053a0f222691caaa36b19e430b23857a4c2e1799db47b802f28edbbf8e171c291baa18cd97 SHA512 76a79224e9d2b12c7a580f66e1ccc2ae4f2b655b2e54a10ec791e49d806d5afc6f2e8b6dd9128c1eb6222d3bdc0ed6787ddfd7775f4c3df42d05033e35ae65b1 AUX rp-pppoe-3.11-kmode.patch 232 BLAKE2B fdbab17bff3556d1bbe373d2b2685e17dfd1e6314dd10474892a72e5c213dd4891be73b1d7aa7448c80fccb9baa0d3262185eb12c0b4f0200ae8b6f814055d92 SHA512 4481d6ba933a8d400acacab1147de5d7675ee898ead8ddee9a24fa065a1e701569e83ae68a08c9bc0ea4ff5c909aa256e5c75fed7229ff288bd99cbbabdf2c59 AUX rp-pppoe-3.12-ifconfig-path.patch 1892 BLAKE2B d27d544f9c93138b8e3ffa70f865dc34a09d4f12daec969500f9ccacfea16764cb74bf738a8ad86a64edad4a0f1e7d0faebf4fc4b10572122feb8a74bbf144c6 SHA512 9fc96ff573f8973ca864de9bc017d75d6bd01b7080adef14f5cc8f3ed253efa8cfbb850327e769400994c5208a4ffcc8d72cf693d2fb6cf678e3305a5ce3f5e4 AUX rp-pppoe-3.12-linux-headers.patch 681 BLAKE2B 79198d765c1c114cc8bb87de7254e38589619da2385b4e143904bef3c95ae583181e9c338697ee725be5aa3cbfdf7d99e0e7ded4c45ceb5527fa8562074c93a4 SHA512 b4d25bfd060e8ab63978ac243516c92d889a2a00b1cb786c0c3bc9ca892c43e0e76c24964aa3165a5a4bb3eb56af8df20be4f99accb8bfb812a4678e8bf9980c +AUX rp-pppoe-3.13-autotools.patch 3537 BLAKE2B dda2e4494e29248b2d829bacb272f60fd03a378d93f463c4eaac2cba659039857ca04f4daaf07399ab9992c10e6a94260d42117c6a9f1d38707f43dfe2858c83 SHA512 1068dae2a50923f35d9d81da6f359b48e96fc9dc321ddc9cd3fd6462f066feb1985a10f6cdbf8e75ad6cf00ab064f4695d3d4135a14e20f837b93f3e881c4029 +AUX rp-pppoe-3.13-linux-headers.patch 608 BLAKE2B 22ea43655b50eb38e2ae0e9ceca19063e44bb3bd7277269cbacc39c109df30c8709bc4b27cf4de07d3d2005875b921ee8bac8ff5588c612fd5caba5df2ccb3d8 SHA512 7a7458004e255a20698ae4cfef4ca0c67f7acf556963019bc4a23f256a92d882c9e9de1d1d097bfab0fb05181050263e4d84b46450f63579565f5f8b79e75b6d DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c34e6184c0b99b50262ad1cd7fb6f4a1ed302872527a0c164af340e15ad1e2eaf191392c3f6ae2de21f5dd SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2 -DIST rp-pppoe-3.11.tar.gz 223234 BLAKE2B 48a733f2b454284934a123383c32484e5715f131dd45e78a1dd8844dc7e9da74a62f2d4e144b8d57e30652be6eefef480d88a7b61fade7312a47ea750ddcbcda SHA512 cb9579ad94f6b6cfd709e8061aacac0a007f1f58ffd50bd0603f5a2b612c0cf4831febdbfeee290b97932fd30f8ae7f707d532a291124c4aeae2333131d53905 DIST rp-pppoe-3.12.tar.gz 224125 BLAKE2B 27fe75e794624acaeb81806d67a6f4e5601a6b6a466100898ae3cccc8acb5f72ad9275fecd28735df1b01162ff0e60b74ad0373a24a60c7a5731b0744b86e019 SHA512 1b9e4c806fcbad1bc21f7b74a780ae98682b10a69d91fb08df6dbd1fff86f6271995ebded43f926f8249a17cdddb541edccbbb3ee28e1a2dc89173ad61cd3de1 -EBUILD rp-pppoe-3.11-r3.ebuild 2634 BLAKE2B b2e99bea0a4cdbb519b6f46934fa8d36db8ec446734bcec7569b865623b7e0101aa734177b900ea842f2e777e1caac8fa0c8c117d78e76001db5bacc45c36ed3 SHA512 bd22a5713758edfe8d70a5c533d16fa71f6e8f3d62bbcf4d5a6bed329f2c78da74ac07827dd41ab7388f0f92cdda9bebd802760910c553f6f7e7e7a2a9ec3353 +DIST rp-pppoe-3.13.tar.gz 224204 BLAKE2B 8ac3cd59c809f7f2e10fea580dfbda20fc99ae443851513cdc6d0ba8e8df848d7bd6f10d2b0ac6592bc4b48ee1945c299d3cbd73eb9dd6ddc23d0c1c39cd1b77 SHA512 e29ddc39252a0e71d509096e275f6f195f86a5871052dd558e8fb174d13086b1c601e6652f45619279a1eb2fbda96ba0ec85dea9edb27459af56ded4a52b5f36 EBUILD rp-pppoe-3.12-r1.ebuild 2666 BLAKE2B f051d00155b09d18065f544f6de3363155f05555662b5bbeded15562768a03ebfa7b8bf0a3dbdd7807a3ebe00fc67b43cf35e2e543e166b6811da5cdf1109751 SHA512 fd58f3d98d861d532afb9c649c37c22afdf599de3ebbef75a0bda912bdfa3d94e715648a36c69d6a1939c2ed262a8c7c2022b97e5171c46bf03e33c8121f4b64 +EBUILD rp-pppoe-3.13.ebuild 2935 BLAKE2B f88160eb9a8c604ff4a12bb306e17284c049931c3bb026db950133de2520aa77286551356bb80491b73ff159572e3c92c20714b9579331367bdcbe3a08881309 SHA512 82d44be4f322e2bfcc135e74ae5cac6fcf5f746ee701acf10ad2dbf85d7e3623a65b931ba2e124f631b64154e7de0d1d73978f3c69c638e372c75bbfc3c65df3 MISC metadata.xml 370 BLAKE2B 00e0195d903d9fe379c0c8662f4019dd55a53f7027ade12f314f8007f9edbb6b4a5e5bccef2897d97ee3d2164a169efcad607548dbf53d363b72a360b57444b3 SHA512 ebfae7addd585ee6f01b45921b1ba6a1c824c6e34f8f6a3c6d2fd917d7b17aceffca5f6a4ca1c7b135a34c679394417b73a23e067daed8a2c4b71fa63536c849 diff --git a/net-dialup/rp-pppoe/files/pppoe-server.confd b/net-dialup/rp-pppoe/files/pppoe-server.confd new file mode 100644 index 000000000000..bb5b2e9088d7 --- /dev/null +++ b/net-dialup/rp-pppoe/files/pppoe-server.confd @@ -0,0 +1,10 @@ +#Multiple interfaces allowed. Example: PPPOE_INTERFACE="vlan10 -I vlan11 -I vlan12" and so on. +#Multiple interfaces allowed. Example: PPPOE_INTERFACE="vlan10 -I vlan11 -I vlan12" and so on. + +#PPPOE_INTERFACE=<interface name> +#AC_NAME=<AC Name> +#SERVICE_NAME=<Service Name> +#MAX_SESSIONS=<Max PPPoE Sessions> +#MAX_SESESSION_PER_MAC=<Max PPPoE Sessions per MAC> +#LOCAL_IP=<PPP Local IP Addr> +#OTHER_OPTIONS="-p /etc/ppp/ip-pools" diff --git a/net-dialup/rp-pppoe/files/pppoe-server.initd b/net-dialup/rp-pppoe/files/pppoe-server.initd new file mode 100644 index 000000000000..39caee9d761b --- /dev/null +++ b/net-dialup/rp-pppoe/files/pppoe-server.initd @@ -0,0 +1,9 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License, v2 or later + +description="rp-pppoe server" +pidfile="/run/pppoe-server.pid" +command="/usr/sbin/pppoe-server" +command_args="-I ${PPPOE_INTERFACE:-eth0} -C ${AC_NAME:-$(hostname)} -S ${SERVICE_NAME:-default} -N ${MAX_SESSIONS:-64} -x ${MAX_SESESSION_PER_MAC:-1} -L ${LOCAL_IP:-10.0.0.1.} -k -F ${OTHER_OPTIONS}" +command_background="true" diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-session-offset.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-session-offset.patch deleted file mode 100644 index 303ecfa9e4b7..000000000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-session-offset.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nru rp-pppoe-3.10.orig/src/pppoe-server.c rp-pppoe-3.10/src/pppoe-server.c ---- rp-pppoe-3.10.orig/src/pppoe-server.c 2008-06-30 16:00:43.000000000 +0200 -+++ rp-pppoe-3.10/src/pppoe-server.c 2008-06-30 22:35:11.000000000 +0200 -@@ -1751,7 +1751,7 @@ - } - if (PassUnitOptionToPPPD) { - argv[c++] = "unit"; -- sprintf(buffer, "%u", (unsigned int) (ntohs(session->sess) - 1 - SessOffset)); -+ sprintf(buffer, "%u", (unsigned int) (ntohs(session->sess) - 1)); - argv[c++] = buffer; - } - argv[c++] = NULL; -@@ -1834,7 +1834,7 @@ - argv[c++] = "default-asyncmap"; - if (PassUnitOptionToPPPD) { - argv[c++] = "unit"; -- sprintf(buffer, "%u", (unsigned int) (ntohs(session->sess) - 1 - SessOffset)); -+ sprintf(buffer, "%u", (unsigned int) (ntohs(session->sess) - 1)); - argv[c++] = buffer; - } - argv[c++] = NULL; diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.13-autotools.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.13-autotools.patch new file mode 100644 index 000000000000..d098de8cdbc3 --- /dev/null +++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.13-autotools.patch @@ -0,0 +1,110 @@ +--- rp-pppoe-3.13/gui/Makefile.in ++++ rp-pppoe-3.13/gui/Makefile.in +@@ -46,7 +46,7 @@ + -mkdir -p $(DESTDIR)$(sbindir) + -mkdir -p $(DESTDIR)$(bindir) + -mkdir -p $(DESTDIR)/etc/ppp/rp-pppoe-gui +- $(install) -m 4755 -s pppoe-wrapper $(DESTDIR)$(sbindir) ++ $(install) -m 4755 pppoe-wrapper $(DESTDIR)$(sbindir) + $(install) -m 755 tkpppoe $(DESTDIR)$(bindir) + -mkdir -p $(DESTDIR)$(mandir)/man1 + $(install) -m 644 pppoe-wrapper.1 $(DESTDIR)$(mandir)/man1 +--- rp-pppoe-3.13/src/configure.in ++++ rp-pppoe-3.13/src/configure.in +@@ -45,7 +45,7 @@ + AC_MSG_RESULT($ac_cv_struct_sockaddr_ll) + + if test "$ac_cv_struct_sockaddr_ll" = yes ; then +-AC_DEFINE(HAVE_STRUCT_SOCKADDR_LL) ++AC_DEFINE(HAVE_STRUCT_SOCKADDR_LL, 1, [Define if you have struct sockaddr_ll]) + fi + + dnl Check for N_HDLC line discipline +@@ -58,7 +58,7 @@ + ac_cv_n_hdlc=no) + AC_MSG_RESULT($ac_cv_n_hdlc) + if test "$ac_cv_n_hdlc" = yes ; then +-AC_DEFINE(HAVE_N_HDLC) ++AC_DEFINE(HAVE_N_HDLC, 1, [Define if you have the N_HDLC line discipline in linux/termios.h]) + fi + + AC_ARG_ENABLE(plugin, [ --enable-plugin=pppd_src_path build pppd plugin], ac_cv_pluginpath=$enableval, ac_cv_pluginpath=no) +@@ -106,7 +106,7 @@ + if test "$ac_cv_header_linux_if_pppox_h" = yes ; then + if test "$ac_cv_pluginpath" != no ; then + LINUX_KERNELMODE_PLUGIN=rp-pppoe.so +- AC_DEFINE(HAVE_LINUX_KERNEL_PPPOE) ++ AC_DEFINE(HAVE_LINUX_KERNEL_PPPOE, 1, [Define if you have kernel-mode PPPoE in Linux file]) + PPPD_INCDIR=$ac_cv_pluginpath + fi + fi +@@ -116,7 +116,7 @@ + fi + + if test "$ac_cv_debugging" = "yes" ; then +- AC_DEFINE(DEBUGGING_ENABLED) ++ AC_DEFINE(DEBUGGING_ENABLED, 1, [Define to include debugging code]) + fi + + AC_SUBST(LINUX_KERNELMODE_PLUGIN) +@@ -156,15 +156,15 @@ + AC_MSG_CHECKING(for Linux 2.4.X kernel-mode PPPoE support) + AC_CACHE_VAL(ac_cv_linux_kernel_pppoe,[ + if test "`uname -s`" = "Linux" ; then +-if test $cross_compiling = "no"; then ++dnl if test $cross_compiling = "no"; then + + dnl Do a bunch of modprobes. Can't hurt; might help. +-modprobe ppp_generic > /dev/null 2>&1 +-modprobe ppp_async > /dev/null 2>&1 +-modprobe n_hdlc > /dev/null 2>&1 +-modprobe ppp_synctty > /dev/null 2>&1 +-modprobe pppoe > /dev/null 2>&1 +-fi ++dnl modprobe ppp_generic > /dev/null 2>&1 ++dnl modprobe ppp_async > /dev/null 2>&1 ++dnl modprobe n_hdlc > /dev/null 2>&1 ++dnl modprobe ppp_synctty > /dev/null 2>&1 ++dnl modprobe pppoe > /dev/null 2>&1 ++dnl fi + AC_TRY_RUN([#include <sys/socket.h> + #include <netinet/in.h> + #include <linux/if_pppox.h> +@@ -204,7 +204,7 @@ + dnl Figure out pppd version. 2.3.7 to 2.3.9 -- issue warning. Less than + dnl 2.3.7 -- stop + +-PPPD_VERSION=`$PPPD --version 2>&1 | awk ' /version/ {print $NF}'` ++PPPD_VERSION=$PPPD_VER + + case "$PPPD_VERSION" in + 1.*|2.0.*|2.1.*|2.2.*|2.3.0|2.3.1|2.3.2|2.3.3|2.3.4|2.3.5|2.3.6) +@@ -260,7 +260,7 @@ + + if test "$rpppoe_cv_pack_bitfields" = "rev" ; then + AC_MSG_RESULT(reversed) +- AC_DEFINE(PACK_BITFIELDS_REVERSED) ++ AC_DEFINE(PACK_BITFIELDS_REVERSED, 1, [Define if bitfields are packed in reverse order]) + else + AC_MSG_RESULT(normal) + fi +--- rp-pppoe-3.13/src/plugin.c ++++ rp-pppoe-3.13/src/plugin.c +@@ -24,7 +24,6 @@ + * + ***********************************************************************/ + +-#define _GNU_SOURCE 1 + #include "pppoe.h" + + #include "pppd/pppd.h" +--- rp-pppoe-3.13/src/relay.c ++++ rp-pppoe-3.13/src/relay.c +@@ -14,7 +14,6 @@ + * $Id$ + * + ***********************************************************************/ +-#define _GNU_SOURCE 1 /* For SA_RESTART */ + #include "config.h" + + #include <sys/socket.h> diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.13-linux-headers.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.13-linux-headers.patch new file mode 100644 index 000000000000..1ee989dce872 --- /dev/null +++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.13-linux-headers.patch @@ -0,0 +1,25 @@ +the linux headers have started adding shims to not define types or structs +when C lib headers are active, but in order to work, the C lib headers have +to be included before the linux headers. + +move the netinet/in.h include up above the linux/ includes. + +Mike Frysinger <vapier@gentoo.org> + +--- rp-pppoe-3.13/src/pppoe.h ++++ rp-pppoe-3.13/src/pppoe.h +@@ -120,12 +120,12 @@ + #error Could not find a 32-bit integer type + #endif + ++#include <netinet/in.h> ++ + #ifdef HAVE_LINUX_IF_ETHER_H + #include <linux/if_ether.h> + #endif + +-#include <netinet/in.h> +- + #ifdef HAVE_NETINET_IF_ETHER_H + #include <sys/types.h> + diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild deleted file mode 100644 index 256fe45f563d..000000000000 --- a/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic autotools readme.gentoo - -PPP_P="ppp-2.4.7" - -DESCRIPTION="A user-mode PPPoE client and server suite for Linux" -HOMEPAGE="https://www.roaringpenguin.com/products/pppoe" -SRC_URI="http://www.roaringpenguin.com/files/download/${P}.tar.gz - https://www.samba.org/ftp/pub/ppp/${PPP_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86" -IUSE="tk" - -RDEPEND=" - net-dialup/ppp:= - tk? ( dev-lang/tk ) -" -DEPEND=">=sys-kernel/linux-headers-2.6.25 - ${RDEPEND}" - -DOC_CONTENTS="Use pppoe-setup to configure your dialup connection" - -pkg_setup() { - # This is needed in multiple phases - PPPD_VER=$(best_version net-dialup/ppp) - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%-*} #reduce it to ${PV} -} - -src_prepare() { - # Patch to enable integration of pppoe-start and pppoe-stop with - # baselayout-1.11.x so that the pidfile can be found reliably per interface - epatch "${FILESDIR}/${PN}-3.10-gentoo-netscripts.patch" - - epatch "${FILESDIR}/${PN}-3.10-username-charset.patch" # bug 82410 - epatch "${FILESDIR}/${PN}-3.10-plugin-options.patch" - epatch "${FILESDIR}/${PN}-3.10-autotools.patch" - epatch "${FILESDIR}/${PN}-3.10-session-offset.patch" # bug 204476 - has_version '<sys-kernel/linux-headers-2.6.35' && \ - epatch "${FILESDIR}/${PN}-3.10-linux-headers.patch" #334197 - epatch "${FILESDIR}/${PN}-3.10-posix-source-sigaction.patch" - epatch "${FILESDIR}/${PN}-3.11-gentoo.patch" - epatch "${FILESDIR}/${PN}-3.11-kmode.patch" #364941 - - cd "${S}"/src || die - eautoreconf -} - -src_configure() { - addpredict /dev/ppp - - cd "${S}/src" || die - econf --enable-plugin=../../ppp-${PPPD_VER} -} - -src_compile() { - cd "${S}/src" || die - emake - - if use tk; then - emake -C "${S}/gui" || die "gui make failed" - fi -} - -src_install () { - cd "${S}/src" || die - emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install - - #Don't use compiled rp-pppoe plugin - see pkg_preinst below - local pppoe_plugin="${D}/etc/ppp/plugins/rp-pppoe.so" - if [ -f "${pppoe_plugin}" ] ; then - rm "${pppoe_plugin}" || die - fi - - if use tk; then - emake -C "${S}/gui" \ - DESTDIR="${D}" \ - datadir=/usr/share/doc/${PF}/ \ - install - dosym /usr/share/doc/${PF}/tkpppoe /usr/share/tkpppoe - fi - - readme.gentoo_create_doc -} - -pkg_preinst() { - # Use the rp-pppoe plugin that comes with net-dialup/pppd - if [ -n "${PPPD_VER}" ] && [ -f "${ROOT}/usr/lib/pppd/${PPPD_VER}/rp-pppoe.so" ] ; then - dosym /usr/lib/pppd/${PPPD_VER}/rp-pppoe.so /etc/ppp/plugins/rp-pppoe.so - fi -} diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild new file mode 100644 index 000000000000..5a62bbd85690 --- /dev/null +++ b/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic readme.gentoo-r1 + +PPP_P="ppp-2.4.7" + +DESCRIPTION="A user-mode PPPoE client and server suite for Linux" +HOMEPAGE="https://www.roaringpenguin.com/products/pppoe" +SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz + https://www.samba.org/ftp/pub/ppp/${PPP_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="tk" + +RDEPEND=" + net-dialup/ppp:= + tk? ( dev-lang/tk:= ) +" +DEPEND=">=sys-kernel/linux-headers-2.6.25 + ${RDEPEND}" + +DOC_CONTENTS="Use pppoe-setup to configure your dialup connection" + +pkg_setup() { + # This is needed in multiple phases + PPPD_VER=$(best_version net-dialup/ppp) + PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER%%-*} #reduce it to ${PV} +} + +PATCHES=( + # Patch to enable integration of pppoe-start and pppoe-stop with + # baselayout-1.11.x so that the pidfile can be found reliably per interface + "${FILESDIR}/${PN}-3.10-gentoo-netscripts.patch" + + "${FILESDIR}/${PN}-3.10-username-charset.patch" # bug 82410 + "${FILESDIR}/${PN}-3.10-plugin-options.patch" + "${FILESDIR}/${PN}-3.13-autotools.patch" + "${FILESDIR}/${PN}-3.10-posix-source-sigaction.patch" + "${FILESDIR}/${PN}-3.11-gentoo.patch" + "${FILESDIR}/${PN}-3.11-kmode.patch" #364941 + "${FILESDIR}/${PN}-3.13-linux-headers.patch" + "${FILESDIR}/${PN}-3.12-ifconfig-path.patch" #602344 +) + +src_prepare() { + if has_version '<sys-kernel/linux-headers-2.6.35' ; then + PATCHES+=( + "${FILESDIR}/${PN}-3.10-linux-headers.patch" #334197 + ) + fi + + default + + cd "${S}"/src || die + eautoreconf +} + +src_configure() { + addpredict /dev/ppp + + cd "${S}/src" || die + # PPPD_VER variable is required for correct pppd detection + # This was added through the rp-pppoe-*-autotools.patch + econf PPPD_VER="${PPPD_VER}" --enable-plugin=../../ppp-${PPPD_VER} +} + +src_compile() { + cd "${S}/src" || die + emake + + if use tk; then + emake -C "${S}/gui" || die "gui make failed" + fi +} + +src_install () { + cd "${S}/src" || die + emake DESTDIR="${D}" install #docdir=/usr/share/doc/${PF} install + + #Don't use compiled rp-pppoe plugin - see pkg_preinst below + local pppoe_plugin="${ED%/}/etc/ppp/plugins/rp-pppoe.so" + if [ -f "${pppoe_plugin}" ] ; then + rm "${pppoe_plugin}" || die + fi + + if use tk; then + emake -C "${S}/gui" \ + DESTDIR="${D}" \ + datadir=/usr/share/doc/${PF}/ \ + install + dosym doc/${PF}/tkpppoe /usr/share/tkpppoe + fi + + newinitd "${FILESDIR}"/pppoe-server.initd pppoe-server + newconfd "${FILESDIR}"/pppoe-server.confd pppoe-server + + readme.gentoo_create_doc +} + +pkg_preinst() { + # Use the rp-pppoe plugin that comes with net-dialup/pppd + if [ -n "${PPPD_VER}" ] && [ -f "${EROOT%/}/usr/lib/pppd/${PPPD_VER}/rp-pppoe.so" ] ; then + dosym ../../../usr/lib/pppd/${PPPD_VER}/rp-pppoe.so /etc/ppp/plugins/rp-pppoe.so + fi +} diff --git a/net-dialup/ueagle-atm/Manifest b/net-dialup/ueagle-atm/Manifest deleted file mode 100644 index dadcb8c6f58f..000000000000 --- a/net-dialup/ueagle-atm/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX README 8687 BLAKE2B 6f4cf26b4877df625dcf4b5f180c4321210f73702aed426919d782063af7b8ba5792557e02c192877511a43c761485afefdb596063bdfad22f0f549e42c2563e SHA512 a847cb05b8ab1050257940a717ef32b74b5d92fc280a07b1189274e14e3b0481c6a4ccfb31411350ea7e38360f2f478748ff46fb3214586b9466a6cef7a4a36c -DIST ueagle-data-src-1.1.tar.gz 1270515 BLAKE2B 18056b17d9b4b2adbeac1e4dead6966abd91e57b56c4a1b25d5481456ec1a4fd1bb2bda233ff8b2384276079690c2809004a73ec4efcbe3f8c21983c9e2d3305 SHA512 ce4d54c02da9943d7ee77615142c64c3ec02acea00a3d107dbeaa0dad9f047b5bda5844e8b896596af000bcb9a9fd0f49aa04a9da603760639bd7655933a98fa -EBUILD ueagle-atm-1.1-r3.ebuild 1727 BLAKE2B 911110a0cc8e63448fd80da8514c6715ffc4537b8e8e07fcead06978729fe4338003f8046f9fd63201784f5adadac9f54162231cd4952bcbe035038e186472a5 SHA512 da1e520d8245f9a407ee8b14b6617808c8c00215cc676d6277889f7c7b3685fff6962ea531a7a0d78eb469e462b68a1052174fa78650d518144c87917f4e50ef -MISC metadata.xml 318 BLAKE2B 9dee4c4d83bd54e295149eb2b2f5afdcdcd1785ad1fb57561748bba7102ff22eccd789c8b4537dcd099409f64f694f949536d0c32f44ecf40514689b0eb57bad SHA512 cb837defad14a199f7c0ad62a721e08afee90ee05125b8783cd7cf7059f9c7090e3fd18c2cf3d91e6dde78b7cf86a3abd70a3d4e22f9b4a59bee750bda214ced diff --git a/net-dialup/ueagle-atm/files/README b/net-dialup/ueagle-atm/files/README deleted file mode 100644 index ef07b71dadcd..000000000000 --- a/net-dialup/ueagle-atm/files/README +++ /dev/null @@ -1,235 +0,0 @@ -Introduction -============ - -This ebuild installs firmware files necessary for ADI 930/Eagle USB ADSL -Modem driver which first appeared in kernel 2.6.16. - -Configuration -============= - -Most ADSL modems are connected via the ATM protocol, rather -than Ethernet. For ATM, run the following: - euse -E atm && emerge net-dialup/ppp net-dialup/ueagle-atm - -It is necessary to choose an interface number for the connection. This -is arbitrary - the only requirement is that the connection number is -not already in use. The first available number is 0, and it is usual to -choose the lowest unused number. For the purposes of this document, 0 -will be chosen. - -Add the following lines from the appropriate section below to -/etc/conf.d/net, then customize them as per the inline comments. - - -a) PPPoATM configuration: - -config_ppp0='ppp' # Runs /lib/rcscripts/net/pppd.sh -# The 2 numbers represent the VPI & VCI of your ISP, and they are separated -# by a dot. Ask your ISP about those numbers. -link_ppp0='0.38' -plugins_ppp0='pppoa' -# 'man pppd' shows other options. Compression is disabled because it is -# rarely taken advantage of, and may interfere with the connection. -# Add option 'usepeerdns' to populate /etc/resolv.conf -pppd_ppp0='updetach noauth debug defaultroute noaccomp nobsdcomp noccp - nodeflate nopcomp novj novjccomp child-timeout 60' -username_ppp0='username@isp.com' # ADSL login, assigned by your ISP -password_ppp0='password' # ADSL password, assigned by your ISP - -# If the kernel modules are not built-in, then they must be loaded -# before starting the PPP daemon: -function preup() { - if [[ "$1" = "ppp0" ]] ; then - modprobe -q ueagle-atm - return 0 - fi -} - - -b) PPPoE configuration: - -# Configure first the RFC2684 bridge interface -config_nas0='null' -# Use "-e 0" for LLC mux or "-e 1" for VC mux. -# The 2 numbers after "-a" represent the VPI & VCI of your ISP, and -# they are separated by a dot. Ask your ISP about those numbers. -br2684ctl_nas0='-e 0 -a 0.38' - -config_ppp0='ppp' # Runs /lib/rcscripts/net/pppd.sh -link_ppp0='nas0' # The name of the RFC2684 bridge interface -plugins_ppp0='pppoe' -# 'man pppd' shows other options. Compression is disabled because it is -# rarely taken advantage of, and may interfere with the connection. -# Add option 'usepeerdns' to populate /etc/resolv.conf -pppd_ppp0='updetach noauth debug defaultroute noaccomp nobsdcomp noccp - nodeflate nopcomp novj novjccomp child-timeout 60' -username_ppp0='username@isp.com' # ADSL login, assigned by your ISP -password_ppp0='password' # ADSL password, assigned by your ISP - -depend_ppp0() { - need net.nas0 -} - -# If the kernel modules are not built-in, then they must be loaded -# before starting the RFC2684 bridge: -function preup() { - if [[ "$1" = "nas0" ]] ; then - modprobe -q ueagle-atm - return 0 - fi -} - - -Configuration continued -======================= - -Create a symlink for the new network interface, for it to be enabled by -baselayout: - cd /etc/init.d && ln -sfn net.lo net.ppp0 -If you use PPPoE, you should also create the symlink for the RFC2684 -bridge interface: - cd /etc/init.d && ln -sfn net.lo net.nas0 - -The "debug" option adds some extra commentary from pppd regarding the -connection to /var/log/messages, e.g.: -"sent [LCP ConfReq id=0x1 <magic 0x7bea6ef1>]". It is wise to keep the -option on permanently, due to its usefulness when debugging. - -Set RC_NET_STRICT_CHECKING="yes" in /etc/conf.d/rc, to prevent Internet -services in /etc/init.d/ from starting before the Internet connection -is established. Other options are to start/stop programs in -/etc/ppp/ip-{up,down}.local, and to customize initscript dependencies -as described in: - http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=2&chap=4 - - -Starting the Connection -======================= - -To start manually, with the modem connected: - /etc/init.d/net.ppp0 start - -To start automatically when the PC boots: - rc-update add net.ppp0 default - - -Kernel Configuration -==================== - -The ebuild, during an emerge, checks that the required kernel modules -are present. - -Note that in the list below, "[*]" means that the option is compiled -into the kernel, whereas "[M]" means that the option can either be -compiled into the kernel, or as a module. Compiling them into the -kernel is recommended, to guarantee that the modules are already loaded -when they are needed, and it will improve the bootup time by a couple -of seconds. - -In "make menuconfig", you can press "/" and search on e.g. "eagle" -to see exactly where an option is - the location of an option and its -dependencies can change between kernel versions. - -Check that the following kernel options are configured as shown (this -list includes the prerequisites, e.g. USB_UEAGLEATM depends on USB): - - Code maturity level options ---> - [*] Prompt for development and/or incomplete code/drivers - - CONFIG_EXPERIMENTAL - - Device Drivers ---> - Generic Driver Options ---> - [ ] Select only drivers that don't need compile-time external - firmware (*unselected*) - CONFIG_STANDALONE - [*] Hotplug firmware loading support - CONFIG_FW_LOADER - - Networking ---> - [*] Networking support - CONFIG_NET - Networking options ---> - [*] Packet socket - CONFIG_PACKET - [M] Asynchronous Transfer Mode (ATM) - CONFIG_ATM - [M] RFC1483/2684 Bridged protocols - CONFIG_ATM_BR2684 (only needed for PPPoE) - - Device Drivers ---> - Network device support ---> - [*] Network device support - CONFIG_NETDEVICES - [*] PPP (point-to-point protocol) support - CONFIG_PPP - [M] PPP Deflate compression - CONFIG_PPP_DEFLATE (only useful if - compression is supported - rare) - [M] PPP BSD-Compress compression - CONFIG_PPP_BSDCOMP (only useful - if compression is supported - rare) - [M] PPP over Ethernet - CONFIG_PPPOE (only needed for PPPoE) - [M] PPP over ATM - CONFIG_PPPOATM (only needed for PPPoATM) - USB support ---> - [*] Support for Host-side USB - CONFIG_USB - [*] USB device filesystem - CONFIG_USB_DEVICEFS - [M] (O or U)HCI HCD support - USB DSL modem support ---> - [M] USB DSL modem support - CONFIG_USB_ATM - [M] ADI 930 and eagle USB DSL modem - CONFIG_USB_UEAGLEATM - - - -Troubleshooting -=============== - -Try "emerge ueagle-atm" again, because the ebuild checks that the -required kernel modules are present (showing a warning message if -appropriate), and creates the firmware files in /lib/firmware/ueagle-atm. - -If the modem is unresponsive, then run "/etc/init.d/net.ppp0 stop" and -unplug the modem for 30 seconds, to drain its memory. Then reconnect -the modem to the PC and run "/etc/init.d/net.ppp0 start" - -To check the modem's connection progress, run: - tail -f /var/log/messages -/var/log/messages should show e.g.: - -pppd[nnn]: Plugin pppoatm.so loaded. -pppd[nnn]: pppd n.n.n started by root, uid 0 -pppd[nnn]: Using interface ppp0 -pppd[nnn]: Connect: ppp0 <--> n.nn -ADSL line is synchronising -DSL line goes up -ADSL line is up (nnn Kib/s down | nnn Kib/s up) -pppd[nnn]: CHAP authentication succeeded -pppd[nnn]: local IP address nnn.nnn.nnn.nnn -pppd[nnn]: remote IP address nnn.nnn.nnn.nnn - - -If the authentification fails, then check username_ppp0 and -password_ppp0. - -If the ADSL connection is not established, then check the options in -pppd_ppp0. "man pppd" explains all the options in that file. - -If the ADSL connection seems to have worked, but no websites can be -contacted, then check that /etc/resolv.conf is populated, and possibly -add the "usepeerdns" option (to use the ISP's DNS) to pppd_ppp0 in -/etc/conf.d/net . - -If the problem is still not resolved, post to the Gentoo Forums at -http://forums.gentoo.org/ and ultimately, if there is no answer, -file a bug at http://bugs.gentoo.org/ . - - -Compression -=========== - -Some ISPs require compression to be disabled in order for the -connection to work, so the default configuration described above -disables compression. Few ISPs support ADSL compression anyway. If you -are lucky enough to have an ISP which *does* support compression -(Google is your best friend for determining this), then compression can -be enabled by following these steps: - -* Compile the kernel modules CONFIG_PPP_DEFLATE and CONFIG_PPP_BSDCOMP -(only one is strictly necessary - pppd prefers "deflate" compression). -Add them to /etc/modules.autoload.d/kernel-2.6 or /etc/conf.d/net above -the "pppoatm" line, if they are not built-in. -* Remove the following options in pppd_ppp0: - noaccomp nobsdcomp noccp nodeflate nopcomp novj novjccomp -* Ensure that "debug" is in the pppd_ppp0 options, to check that -compression is being utilized. Note that "module registered" in -/var/log/messages only confirms that the kernel module is loaded - -it does not indicate that the connection is compressed. diff --git a/net-dialup/ueagle-atm/metadata.xml b/net-dialup/ueagle-atm/metadata.xml deleted file mode 100644 index 92efb62d35fd..000000000000 --- a/net-dialup/ueagle-atm/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription>Firmware and configuration instructions for ADI 930/Eagle USB ADSL Modem driver -available in kernels >= 2.6.16.</longdescription> -</pkgmetadata> diff --git a/net-dialup/ueagle-atm/ueagle-atm-1.1-r3.ebuild b/net-dialup/ueagle-atm/ueagle-atm-1.1-r3.ebuild deleted file mode 100644 index 6143b28417a5..000000000000 --- a/net-dialup/ueagle-atm/ueagle-atm-1.1-r3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils linux-info - -DESCRIPTION="Firmware and configuration instructions for ADI 930/Eagle USB ADSL Modem driver" -HOMEPAGE="https://gna.org/projects/ueagleatm/" -SRC_URI="http://eagle-usb.org/ueagle-atm/non-free/ueagle-data-src-${PV}.tar.gz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64 x86" - -DEPEND="" -RDEPEND="net-dialup/ppp - !sys-kernel/linux-firmware" - -S="${WORKDIR}/ueagle-data-src-${PV}" - -src_compile() { - emake generate -} - -src_install() { - # Copy to the firmware directory - insinto /lib/firmware/ueagle-atm - doins build/* - - # Documentation necessary to complete the setup - dodoc "${FILESDIR}/README" -} - -pkg_postinst() { - # Check kernel configuration - local CONFIG_CHECK="~FW_LOADER ~NET ~PACKET ~ATM ~NETDEVICES ~USB_DEVICEFS ~USB_ATM ~USB_UEAGLEATM \ - ~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/ueagle4-atm/Manifest b/net-dialup/ueagle4-atm/Manifest deleted file mode 100644 index f4dc01997d87..000000000000 --- a/net-dialup/ueagle4-atm/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX README 8682 BLAKE2B b8ef47faac9bfb02a048c563d82a51c0783d6b8f3bce3b696e2f80d43da28a79f548d79265cd234bb78513aa4f1c27d769e59349c983a404e5c266dafdab790d SHA512 4441464519b518d3b666df88323624a6ca4ce746b75dcd2d8ba638d0a3b953d9d5a34344e6acdb400b5a4fe5ccd9fec49202bb357a6d9c76b49dd8e0accb265c -DIST ueagle4-data-1.0.tar.gz 217512 BLAKE2B 3714bcb268e5a9e7d504e1eb618cf23a441b3a19ef675eeb2cf10f8a6979ebaa5896de7101572206a6f9e5ee9764329ce2cd180d456bb869e58f39f2326110ac SHA512 3d47150eb288865432e7201390669262e0d12239f5d45d194da8abe535e69cabcb53ef6b8757ab7e3c495394ecd74b781ac724635918b70c479a1219b3bcaa74 -EBUILD ueagle4-atm-1.0.ebuild 1673 BLAKE2B 2d09ad5d65b18b8d90284244292b18b1cf305e4d14311fe5714ddd12ca39c2c2d4434e9acfae2837c15eeba7fbf529c8e794a57b37381609f444c2789279b1c3 SHA512 f6b5c31eb8193aa2812229943f37b48ad8868ec4a692d30cb8a067b0904ea5ce774e4d3b94c633295afae40f868b5449bffb84995b09d56c3535dac9fbc1114d -MISC metadata.xml 313 BLAKE2B 4fe447ad90f5621e276fecc719943d9243cbb792e02e4c888481fd907e137684170d860989b2d56a3321f824d2720e86109e6085e48a2f10486e37d800202ed1 SHA512 5e82ee1abcd89c42e7519966aae253537495a2b471b479a75a0aa0f9d5c11b57772a0138223abd3edd29c7393f0ad198bd8e7da9c3035660e441c11f21641458 diff --git a/net-dialup/ueagle4-atm/files/README b/net-dialup/ueagle4-atm/files/README deleted file mode 100644 index 20067824f303..000000000000 --- a/net-dialup/ueagle4-atm/files/README +++ /dev/null @@ -1,235 +0,0 @@ -Introduction -============ - -This ebuild installs firmware files necessary for Eagle USB E4 ADSL -Modem driver which first appeared in kernel 2.6.16. - -Configuration -============= - -Most ADSL modems are connected via the ATM protocol, rather -than Ethernet. For ATM, run the following: - euse -E atm && emerge net-dialup/ppp net-dialup/ueagle-atm - -It is necessary to choose an interface number for the connection. This -is arbitrary - the only requirement is that the connection number is -not already in use. The first available number is 0, and it is usual to -choose the lowest unused number. For the purposes of this document, 0 -will be chosen. - -Add the following lines from the appropriate section below to -/etc/conf.d/net, then customize them as per the inline comments. - - -a) PPPoATM configuration: - -config_ppp0='ppp' # Runs /lib/rcscripts/net/pppd.sh -# The 2 numbers represent the VPI & VCI of your ISP, and they are separated -# by a dot. Ask your ISP about those numbers. -link_ppp0='0.38' -plugins_ppp0='pppoa' -# 'man pppd' shows other options. Compression is disabled because it is -# rarely taken advantage of, and may interfere with the connection. -# Add option 'usepeerdns' to populate /etc/resolv.conf -pppd_ppp0='updetach noauth debug defaultroute noaccomp nobsdcomp noccp - nodeflate nopcomp novj novjccomp child-timeout 60' -username_ppp0='username@isp.com' # ADSL login, assigned by your ISP -password_ppp0='password' # ADSL password, assigned by your ISP - -# If the kernel modules are not built-in, then they must be loaded -# before starting the PPP daemon: -function preup() { - if [[ "$1" = "ppp0" ]] ; then - modprobe -q ueagle-atm - return 0 - fi -} - - -b) PPPoE configuration: - -# Configure first the RFC2684 bridge interface -config_nas0='null' -# Use "-e 0" for LLC mux or "-e 1" for VC mux. -# The 2 numbers after "-a" represent the VPI & VCI of your ISP, and -# they are separated by a dot. Ask your ISP about those numbers. -br2684ctl_nas0='-e 0 -a 0.38' - -config_ppp0='ppp' # Runs /lib/rcscripts/net/pppd.sh -link_ppp0='nas0' # The name of the RFC2684 bridge interface -plugins_ppp0='pppoe' -# 'man pppd' shows other options. Compression is disabled because it is -# rarely taken advantage of, and may interfere with the connection. -# Add option 'usepeerdns' to populate /etc/resolv.conf -pppd_ppp0='updetach noauth debug defaultroute noaccomp nobsdcomp noccp - nodeflate nopcomp novj novjccomp child-timeout 60' -username_ppp0='username@isp.com' # ADSL login, assigned by your ISP -password_ppp0='password' # ADSL password, assigned by your ISP - -depend_ppp0() { - need net.nas0 -} - -# If the kernel modules are not built-in, then they must be loaded -# before starting the RFC2684 bridge: -function preup() { - if [[ "$1" = "nas0" ]] ; then - modprobe -q ueagle-atm - return 0 - fi -} - - -Configuration continued -======================= - -Create a symlink for the new network interface, for it to be enabled by -baselayout: - cd /etc/init.d && ln -sfn net.lo net.ppp0 -If you use PPPoE, you should also create the symlink for the RFC2684 -bridge interface: - cd /etc/init.d && ln -sfn net.lo net.nas0 - -The "debug" option adds some extra commentary from pppd regarding the -connection to /var/log/messages, e.g.: -"sent [LCP ConfReq id=0x1 <magic 0x7bea6ef1>]". It is wise to keep the -option on permanently, due to its usefulness when debugging. - -Set RC_NET_STRICT_CHECKING="yes" in /etc/conf.d/rc, to prevent Internet -services in /etc/init.d/ from starting before the Internet connection -is established. Other options are to start/stop programs in -/etc/ppp/ip-{up,down}.local, and to customize initscript dependencies -as described in: - http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=2&chap=4 - - -Starting the Connection -======================= - -To start manually, with the modem connected: - /etc/init.d/net.ppp0 start - -To start automatically when the PC boots: - rc-update add net.ppp0 default - - -Kernel Configuration -==================== - -The ebuild, during an emerge, checks that the required kernel modules -are present. - -Note that in the list below, "[*]" means that the option is compiled -into the kernel, whereas "[M]" means that the option can either be -compiled into the kernel, or as a module. Compiling them into the -kernel is recommended, to guarantee that the modules are already loaded -when they are needed, and it will improve the bootup time by a couple -of seconds. - -In "make menuconfig", you can press "/" and search on e.g. "eagle" -to see exactly where an option is - the location of an option and its -dependencies can change between kernel versions. - -Check that the following kernel options are configured as shown (this -list includes the prerequisites, e.g. USB_UEAGLEATM depends on USB): - - Code maturity level options ---> - [*] Prompt for development and/or incomplete code/drivers - - CONFIG_EXPERIMENTAL - - Device Drivers ---> - Generic Driver Options ---> - [ ] Select only drivers that don't need compile-time external - firmware (*unselected*) - CONFIG_STANDALONE - [*] Hotplug firmware loading support - CONFIG_FW_LOADER - - Networking ---> - [*] Networking support - CONFIG_NET - Networking options ---> - [*] Packet socket - CONFIG_PACKET - [M] Asynchronous Transfer Mode (ATM) - CONFIG_ATM - [M] RFC1483/2684 Bridged protocols - CONFIG_ATM_BR2684 (only needed for PPPoE) - - Device Drivers ---> - Network device support ---> - [*] Network device support - CONFIG_NETDEVICES - [*] PPP (point-to-point protocol) support - CONFIG_PPP - [M] PPP Deflate compression - CONFIG_PPP_DEFLATE (only useful if - compression is supported - rare) - [M] PPP BSD-Compress compression - CONFIG_PPP_BSDCOMP (only useful - if compression is supported - rare) - [M] PPP over Ethernet - CONFIG_PPPOE (only needed for PPPoE) - [M] PPP over ATM - CONFIG_PPPOATM (only needed for PPPoATM) - USB support ---> - [*] Support for Host-side USB - CONFIG_USB - [*] USB device filesystem - CONFIG_USB_DEVICEFS - [M] (O or U)HCI HCD support - USB DSL modem support ---> - [M] USB DSL modem support - CONFIG_USB_ATM - [M] ADI 930 and eagle USB DSL modem - CONFIG_USB_UEAGLEATM - - - -Troubleshooting -=============== - -Try "emerge ueagle-atm" again, because the ebuild checks that the -required kernel modules are present (showing a warning message if -appropriate), and creates the firmware files in /lib/firmware/ueagle-atm. - -If the modem is unresponsive, then run "/etc/init.d/net.ppp0 stop" and -unplug the modem for 30 seconds, to drain its memory. Then reconnect -the modem to the PC and run "/etc/init.d/net.ppp0 start" - -To check the modem's connection progress, run: - tail -f /var/log/messages -/var/log/messages should show e.g.: - -pppd[nnn]: Plugin pppoatm.so loaded. -pppd[nnn]: pppd n.n.n started by root, uid 0 -pppd[nnn]: Using interface ppp0 -pppd[nnn]: Connect: ppp0 <--> n.nn -ADSL line is synchronising -DSL line goes up -ADSL line is up (nnn Kib/s down | nnn Kib/s up) -pppd[nnn]: CHAP authentication succeeded -pppd[nnn]: local IP address nnn.nnn.nnn.nnn -pppd[nnn]: remote IP address nnn.nnn.nnn.nnn - - -If the authentification fails, then check username_ppp0 and -password_ppp0. - -If the ADSL connection is not established, then check the options in -pppd_ppp0. "man pppd" explains all the options in that file. - -If the ADSL connection seems to have worked, but no websites can be -contacted, then check that /etc/resolv.conf is populated, and possibly -add the "usepeerdns" option (to use the ISP's DNS) to pppd_ppp0 in -/etc/conf.d/net . - -If the problem is still not resolved, post to the Gentoo Forums at -http://forums.gentoo.org/ and ultimately, if there is no answer, -file a bug at http://bugs.gentoo.org/ . - - -Compression -=========== - -Some ISPs require compression to be disabled in order for the -connection to work, so the default configuration described above -disables compression. Few ISPs support ADSL compression anyway. If you -are lucky enough to have an ISP which *does* support compression -(Google is your best friend for determining this), then compression can -be enabled by following these steps: - -* Compile the kernel modules CONFIG_PPP_DEFLATE and CONFIG_PPP_BSDCOMP -(only one is strictly necessary - pppd prefers "deflate" compression). -Add them to /etc/modules.autoload.d/kernel-2.6 or /etc/conf.d/net above -the "pppoatm" line, if they are not built-in. -* Remove the following options in pppd_ppp0: - noaccomp nobsdcomp noccp nodeflate nopcomp novj novjccomp -* Ensure that "debug" is in the pppd_ppp0 options, to check that -compression is being utilized. Note that "module registered" in -/var/log/messages only confirms that the kernel module is loaded - -it does not indicate that the connection is compressed. diff --git a/net-dialup/ueagle4-atm/metadata.xml b/net-dialup/ueagle4-atm/metadata.xml deleted file mode 100644 index 331b50f53b69..000000000000 --- a/net-dialup/ueagle4-atm/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription>Firmware and configuration instructions for Eagle USB E4 ADSL Modem driver -available in kernels >= 2.6.16.</longdescription> -</pkgmetadata> diff --git a/net-dialup/ueagle4-atm/ueagle4-atm-1.0.ebuild b/net-dialup/ueagle4-atm/ueagle4-atm-1.0.ebuild deleted file mode 100644 index 80b2ba00625b..000000000000 --- a/net-dialup/ueagle4-atm/ueagle4-atm-1.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils linux-info - -DESCRIPTION="Firmware and configuration instructions for Eagle USB E4 ADSL Modem driver" -HOMEPAGE="https://gna.org/projects/ueagleatm/" -SRC_URI="http://eagle-usb.org/ueagle-atm/non-free/ueagle4-data-${PV}.tar.gz" - -LICENSE="Ikanos" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="" -RDEPEND="net-dialup/ppp - !sys-kernel/linux-firmware" - -S="${WORKDIR}/ueagle4-data-${PV}" - -src_install() { - # Copy to the firmware directory - insinto /lib/firmware/ueagle-atm - doins * - - # Documentation necessary to complete the setup - dodoc "${FILESDIR}/README" -} - -pkg_postinst() { - # Check kernel configuration - local CONFIG_CHECK="~FW_LOADER ~NET ~PACKET ~ATM ~NETDEVICES ~USB_DEVICEFS ~USB_ATM ~USB_UEAGLEATM \ - ~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}" -} |