summaryrefslogtreecommitdiff
path: root/net-misc
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/Manifest.gzbin60404 -> 60381 bytes
-rw-r--r--net-misc/dropbox-cli/Manifest6
-rw-r--r--net-misc/dropbox-cli/dropbox-cli-1-r1.ebuild4
-rw-r--r--net-misc/dropbox-cli/dropbox-cli-1.6.0-r1.ebuild2
-rw-r--r--net-misc/dropbox-cli/dropbox-cli-1.6.0.ebuild4
-rw-r--r--net-misc/hylafaxplus/Manifest6
-rw-r--r--net-misc/hylafaxplus/files/hylafaxplus-init4
-rw-r--r--net-misc/hylafaxplus/files/ldconfig-patch4
-rw-r--r--net-misc/hylafaxplus/hylafaxplus-5.5.9.ebuild162
-rw-r--r--net-misc/kea/Manifest4
-rw-r--r--net-misc/kea/kea-1.4.0.ebuild (renamed from net-misc/kea/kea-1.2.0-r1.ebuild)14
-rw-r--r--net-misc/nemesis/Manifest10
-rw-r--r--net-misc/nemesis/files/nemesis-1.4-fileio.patch4
-rw-r--r--net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch177
-rw-r--r--net-misc/nemesis/files/nemesis-1.4-prototcp.patch4
-rw-r--r--net-misc/nemesis/metadata.xml4
-rw-r--r--net-misc/nemesis/nemesis-1.4-r1.ebuild29
-rw-r--r--net-misc/networkmanager/Manifest10
-rw-r--r--net-misc/networkmanager/networkmanager-1.10.10.ebuild (renamed from net-misc/networkmanager/networkmanager-1.10.0.ebuild)5
-rw-r--r--net-misc/networkmanager/networkmanager-1.10.2.ebuild325
-rw-r--r--net-misc/networkmanager/networkmanager-1.8.0.ebuild323
-rw-r--r--net-misc/networkmanager/networkmanager-1.8.2.ebuild324
-rw-r--r--net-misc/ntpsec/Manifest4
-rw-r--r--net-misc/ntpsec/ntpsec-1.1.1.ebuild154
-rw-r--r--net-misc/ntpsec/ntpsec-9999.ebuild6
-rw-r--r--net-misc/openssh/Manifest8
-rw-r--r--net-misc/openssh/openssh-7.7_p1-r101.ebuild (renamed from net-misc/openssh/openssh-7.7_p1-r100.ebuild)50
-rw-r--r--net-misc/openssh/openssh-7.7_p1-r5.ebuild (renamed from net-misc/openssh/openssh-7.7_p1-r4.ebuild)52
-rw-r--r--net-misc/stunnel/Manifest2
-rw-r--r--net-misc/stunnel/stunnel-5.43.ebuild2
-rw-r--r--net-misc/youtube-dl/Manifest4
-rw-r--r--net-misc/youtube-dl/youtube-dl-2018.06.19.ebuild (renamed from net-misc/youtube-dl/youtube-dl-2018.06.04.ebuild)0
32 files changed, 557 insertions, 1150 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 915a6794fc1a..c4c4477b6811 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
Binary files differ
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index a0ead833277e..594d83ba6eb7 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -1,7 +1,7 @@
AUX dropbox-cli-completion 129 BLAKE2B 6e8c72ceb1ad993c90178c3aa99b7da861ed3ea4d3482e4712c8dabfc3d79b16c02c5175977c7e5a6a474731a54af0f01b97c398b319f5065ec83951663c9e35 SHA512 d85963af334d1f8bb293caf6b344e5085562224942525b459c6e9554a24e9a497b2d2ce43356d76f93aac70ebad58dae3e2ab2aaa29cefed0d2e75ecc9c064bb
DIST dropbox-cli-1.6.0.py.xz 17632 BLAKE2B 244e36ea2b1f3a7ad36884de227933f91ca94dd907fadc300cc599336b4a09efec54e9f4cd26aa922609755812cfcd0f506866d0a66e74700c1b90a8c4347683 SHA512 06fcbba67031c18fe1840f592d04039a7c78848d6e77ae8cca04881f5f72ada7fb368921e2ae3b92d161e49bf91eae0f41b559a210eacd0dc203c51134597857
DIST dropbox-cli-1.py.xz 17580 BLAKE2B 9bb165f419df716acfb485f40e3b40238d06db1448cf12731499f8b891d1a2b3de57ae405807c9b61316bea65eca133c95a88a475db210173efb915707e2154d SHA512 d5510a66a5605e474059bb761cc2f33cd4d23481e85f040b049c36759a030f1e7072a9ad2cc7f72e59507767aa375ff3ea1c06d7bf702eb7ba7d698db2bfefe5
-EBUILD dropbox-cli-1-r1.ebuild 557 BLAKE2B cb7b604df2000c898929dc19c124294253e7bd4635f6f46bb8fc5e134816baaf7e181934c0e62344f20ca0ecf7ba58ce680a555d64237c943588c8e3d14fd3d2 SHA512 f05f11819aa08f4a3c15ebbac4aec43147e93175b04670c8a6b7c393322886c992185f67fc1ec0cc85121225d590660767cbd5452f2d8086a57a2ae1c54e1df6
-EBUILD dropbox-cli-1.6.0-r1.ebuild 725 BLAKE2B 11abc7bb2b8121c8a23fbde3ba660a89a682c2c4a3f128a2b83cc754e4ccef81ba7f713a3821e27daffd313c5094f192d20cf4fb99eed181909c833e89cd29d0 SHA512 fbade155715082a9eb05b90dc4e83fa3706314f0b5ed0e868ed660c516e9f6cbe6c227564aa150d98eedf279be01b440db472c46afa801a0e791d9c3280ee549
-EBUILD dropbox-cli-1.6.0.ebuild 576 BLAKE2B 7d7835695e4d66ded69362e6dbe9a682373ce72d8cb8f668a87819ffdd6fdc41cc3905902a2a02c64ebd8b1f661195cb5ea1fc721ea12df25070e796edf680bc SHA512 d85d45e60ace1c07220b94ede13aa18d2293b7bf3494981bc1a21ff4ad19a5e1fb35110a7d215b342d6d99e8d6e4a36be0bc65631037bcc8bb9eb60e288a9ccc
+EBUILD dropbox-cli-1-r1.ebuild 558 BLAKE2B cc8d5071ae4c78a71532c2d614ba557ac1f3356a6bc3290f089dfdc2c3485641621045f06e7b6a626e69d423ab25af7f237f78d5ddb639bc299d325085d5d7d1 SHA512 f5e55ab6913334f11f28b41ad9387bb56d47d6a8636b85850630f2da40de83cbd9092ab5de265556491df73fd28ce700aab417c996a079c074d003ecb4613ef8
+EBUILD dropbox-cli-1.6.0-r1.ebuild 726 BLAKE2B 347b786c5cded9461e4dde1b737365caaaec6fde96136ad6bce0c2e888b7d348e411271800bdbcae050df1bfbf5854e54bc484747b985f7f3cd677dc2f6555b6 SHA512 f231633c6c3bb8592c0300d2994fdc2306ed02b012673af6768742ff2ba13aaeb6a11a58c9d22b8d9cce891c119fbd0c672fe845d3f231fc674935af2d1b0bc9
+EBUILD dropbox-cli-1.6.0.ebuild 577 BLAKE2B 39b17d38b78589ef96c5b0d488270ac3c872e97c402fb608681e1ef15eae835845c15e19e7c8bad4617028f456e8787a3dfe99f07602038e7af459b75847122b SHA512 fbceaac61478cc262a136c136d6f59bac4d12a7ac4bc245fc9f288fe2c17e552d664d24f3fab649de177d30dd3eeeae2e848d34ee9e84653ac7a1a1a1df008fe
MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
diff --git a/net-misc/dropbox-cli/dropbox-cli-1-r1.ebuild b/net-misc/dropbox-cli/dropbox-cli-1-r1.ebuild
index 028c2c8b2060..aae2afff5d09 100644
--- a/net-misc/dropbox-cli/dropbox-cli-1-r1.ebuild
+++ b/net-misc/dropbox-cli/dropbox-cli-1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit python-r1
DESCRIPTION="Cli interface for dropbox daemon (python)"
-HOMEPAGE="http://www.dropbox.com/"
+HOMEPAGE="https://www.dropbox.com/"
SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.py.xz"
LICENSE="GPL-3"
diff --git a/net-misc/dropbox-cli/dropbox-cli-1.6.0-r1.ebuild b/net-misc/dropbox-cli/dropbox-cli-1.6.0-r1.ebuild
index b2dd3a01d442..f45f0bdbfc47 100644
--- a/net-misc/dropbox-cli/dropbox-cli-1.6.0-r1.ebuild
+++ b/net-misc/dropbox-cli/dropbox-cli-1.6.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit python-r1 bash-completion-r1
DESCRIPTION="Cli interface for dropbox (python), part of nautilus-dropbox"
-HOMEPAGE="http://www.dropbox.com/"
+HOMEPAGE="https://www.dropbox.com/"
SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.py.xz"
LICENSE="GPL-3"
diff --git a/net-misc/dropbox-cli/dropbox-cli-1.6.0.ebuild b/net-misc/dropbox-cli/dropbox-cli-1.6.0.ebuild
index 299c194c861d..c7230031c47e 100644
--- a/net-misc/dropbox-cli/dropbox-cli-1.6.0.ebuild
+++ b/net-misc/dropbox-cli/dropbox-cli-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit python-r1
DESCRIPTION="Cli interface for dropbox (python), part of nautilus-dropbox"
-HOMEPAGE="http://www.dropbox.com/"
+HOMEPAGE="https://www.dropbox.com/"
SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.py.xz"
LICENSE="GPL-3"
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index 0893b19b1cd7..ac3691cd0f2c 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -1,7 +1,9 @@
AUX hylafax-cryptglibc.patch 3154 BLAKE2B 242ffe9babe0e68d891e2bb9fcc261368dca67c92dfac66c234abe42da4cdc2bb84ba939fdff6073c05ed0e8d10a343b723c43cea4bb43009a17302a61778966 SHA512 04e2253cbc8b1f71e984a3d80e98d8aa5a7c7ab7ae286ecbecf8fb6c8d5528085b719a9dbc9f5dae6c788cfa83a57393d9ae0c36525eac658d244f4fc500f0cb
AUX hylafaxplus-conf 572 BLAKE2B cd2b237704e0607565c16cf81593654d266c212810d0dcb399f35d980d04ed54a5bb961f2fd29dbc8386ef6684fe684a8bcbd21c9cd782490546554ec90e4b2e SHA512 ee97c45e49ed03bf2d393b7861fb8d0a92ce927243b7f1843c52de452540e78633e1a6d7b6892e6f5e30b5518b4b3d998354a3cfebe7adfd84da3f9586585621
-AUX hylafaxplus-init 3140 BLAKE2B d5eb74b3d0380e83878286a69f8d73701f7e9d1bf77210b5c231e86009d381d4e55ad0cc3f6cca1fc14e2e1fc8e2e128bbb190906c7f314e0c45c1bd181e7d3f SHA512 22ac7b13c622da5b4a73c856eb3e97c44b4d0fb4ba760d544f4d1205eded913b2952f1cecc194815b34700f0e02b8604f908acc632677a9fb77fb2232b23025a
-AUX ldconfig-patch 463 BLAKE2B 87d79ce2b1f33fa3ce0712f956989968185fac6812243bbf011129da338c53e309eb69b2e891094ee187ad051a6592ead59b8bd974c0c36d4fe9763efe414c0c SHA512 3729b8c1a7bc9e0a7fda33a7f57ead1fcbb3f3642f8639303acf079b32dc2856659a92bc39bf36606ffc042b0ba656b3b4e962eedda2cadca5247663893c0a9a
+AUX hylafaxplus-init 3150 BLAKE2B 67b27c9e773d141c462b62882fa1ec592bdd30397c21c0dc0ef55384ac0d448803a8984c35eb22185c0aa315019eea1588829717b170f0b6168b549a270f2570 SHA512 6bc4db4597ef55aaf01bff66dfe7e9b3ce23d51e8d165f635ad49d9971260f8f131d386869787b2cd0de612d8ee784fb8f4e44fa8b8deb4eabf1aeab441e68f5
+AUX ldconfig-patch 467 BLAKE2B d19f7a8ebc79bb40d9935e1f327f3abfa2d336ea4af2026c784178c8110efe4a1bb2c19a17c9127f039d64c2e9115b5899d1999ed1f5ac7c999cdce79875e5b0 SHA512 eb7c154eac56e20a81b3396770442d93b6833c7961927f8264e3ed1aa72850e018fbe14760d7bd5be739d069769e3db3fd5848aaa936dd7509f03a289a146d4c
DIST hylafax-5.5.5.tar.gz 1353495 BLAKE2B e1b41a5cf5502ad28467625495171c085f43f4352b73bfd633da851a1366502aca04a157790ad4a7f3d634a6adbb5dab4c1eeb294283352e9eedaf03c565cb42 SHA512 ee6225ae044c567093103f35c30d848db757636c1d8db78e8f7cb43eb01ea34ab229a81ca4175e2bf30d3c87b598d5b5797b7d92b0dc852bf4b69c697baca8cf
+DIST hylafax-5.5.9.tar.gz 1364807 BLAKE2B 1e63d28dbe42170af65369ceab6b76b30fb264515992bb7f3561722eccae21e2d790e50eab3f1f9bdbb8c48e369166c90271aa8cf37c1905fda44c3b31b18b71 SHA512 67ac84df2619db7fb88cd7ad3af4beff9918b2481fc8edf7cc7574941161dd7aa6186cfc49c6cdb2a1f073f6cbf2f2a4ed084ca70ebe288bf7cd8e752cd56b2d
EBUILD hylafaxplus-5.5.5.ebuild 4715 BLAKE2B 9d6ca4008ad1c725374ea961f7573daa2ec4fff75506b5d131a6680ba95dfdae6bbd734e1d003f07093d47bbfe07fd5db0b7001bf226e50360968e1deae3cf82 SHA512 e3b531d0ea6ed7039abbf2488f8ac5955b41691d1fa47da7182c06e7f44ec2f59082f8b3a1b7493c6129859e477bc72c2b8f21dfc795530fcf5e89de01bab05f
+EBUILD hylafaxplus-5.5.9.ebuild 4293 BLAKE2B 5c3e2ba530b2f8ad984f3db95189f77194fe1bfdd529c3ab5ece560c1fcf0ae97eba2fb56f20f1313ec2ee0c5ba960341acd2d29b8704f27a86d0329d078dc8d SHA512 4b19d97455b3679981d316dbb5f063df8056b4a95e8cb229978bb06e62e43e79ac8af018c79faa5d4f8e175ded1b490b6bc657a2ab876adc175902707af22665
MISC metadata.xml 578 BLAKE2B 2188942965a0a84ce976c7447444c4858651f4a36ec29a21b169e5224137d7a03eb8dca7522c4ab5ce0d58356ba6de3a276810ba4bf37955628ec0a6ae3940d0 SHA512 1f8cbc639c7ed84086201f71010c2ed662ebad39a3529cf0d9450be66f2d0d4660dde88b16050ef6e112672ce5d23db2210ea3d14a44452233f55aa22f28215d
diff --git a/net-misc/hylafaxplus/files/hylafaxplus-init b/net-misc/hylafaxplus/files/hylafaxplus-init
index 851cd3b09777..c15f26774a86 100644
--- a/net-misc/hylafaxplus/files/hylafaxplus-init
+++ b/net-misc/hylafaxplus/files/hylafaxplus-init
@@ -1,9 +1,9 @@
#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Author Geaaru
# Distributed under the terms of the GNU General Public License v2
-opts="zap"
+extra_commands="zap"
depend() {
use lo
diff --git a/net-misc/hylafaxplus/files/ldconfig-patch b/net-misc/hylafaxplus/files/ldconfig-patch
index 8b0f4352d51f..78a42cf562f0 100644
--- a/net-misc/hylafaxplus/files/ldconfig-patch
+++ b/net-misc/hylafaxplus/files/ldconfig-patch
@@ -1,5 +1,5 @@
---- faxd/Makefile.LINUXdso.original 2011-12-30 18:17:59.000000000 +0100
-+++ faxd/Makefile.LINUXdso 2011-12-30 18:18:51.000000000 +0100
+--- a/faxd/Makefile.LINUXdso.original 2011-12-30 18:17:59.000000000 +0100
++++ b/faxd/Makefile.LINUXdso 2011-12-30 18:18:51.000000000 +0100
@@ -37,7 +37,6 @@
installDSO: libfaxserver.${DSO}
diff --git a/net-misc/hylafaxplus/hylafaxplus-5.5.9.ebuild b/net-misc/hylafaxplus/hylafaxplus-5.5.9.ebuild
new file mode 100644
index 000000000000..18d1e65d47a1
--- /dev/null
+++ b/net-misc/hylafaxplus/hylafaxplus-5.5.9.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit pam toolchain-funcs
+
+MY_PN="${PN/plus/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
+HOMEPAGE="http://hylafax.sourceforge.net"
+SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="hylafaxplus"
+KEYWORDS="~amd64 ~x86"
+IUSE="jbig html lcms ldap mgetty pam"
+
+DEPEND="
+ >=sys-libs/zlib-1.1.4
+ app-text/ghostscript-gpl
+ virtual/mta
+ media-libs/tiff:0[jbig?]
+ virtual/jpeg:0
+ jbig? ( media-libs/jbigkit )
+ virtual/awk
+ lcms? ( media-libs/lcms )
+ ldap? ( net-nds/openldap )
+ pam? ( virtual/pam )
+ mgetty? ( net-dialup/mgetty[-fax] )
+ !net-dialup/mgetty[fax]
+"
+RDEPEND="${DEPEND}
+ net-mail/metamail
+ !net-dialup/sendpage
+"
+
+S="${WORKDIR}/${MY_P}"
+
+export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
+export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
+
+PATCHES=( "${FILESDIR}/ldconfig-patch" )
+
+src_prepare() {
+ default
+
+ # force it not to strip binaries
+ for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \
+ hfaxd sendfax sendpage ; do
+ sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
+ "${dir}"/Makefile.in || die "sed failed"
+ done
+
+ sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed"
+
+ # Respect LDFLAGS(at least partially)
+ sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed"
+
+ sed -i -e "s|-fpic|-fPIC|g" \
+ configure || die
+}
+
+src_configure() {
+ do_configure() {
+ echo ./configure --nointeractive ${1}
+ # eval required for quoting in ${my_conf} to work properly, better way?
+ eval ./configure --nointeractive ${1} || die "./configure failed"
+ }
+ local my_conf="
+ --with-DIR_BIN=/usr/bin
+ --with-DIR_SBIN=/usr/sbin
+ --with-DIR_LIB=/usr/$(get_libdir)
+ --with-DIR_LIBEXEC=/usr/sbin
+ --with-DIR_LIBDATA=/usr/$(get_libdir)/fax
+ --with-DIR_LOCALE=/usr/share/locale
+ --with-DIR_LOCKS=/var/lock
+ --with-DIR_MAN=/usr/share/man
+ --with-DIR_SPOOL=/var/spool/fax
+ --with-DIR_HTML=/usr/share/doc/${P}/html
+ --with-DIR_CGI="${WORKDIR}"
+ --with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
+ --with-PATH_IMPRIP=\"\"
+ --with-SYSVINIT=no
+ --with-REGEX=yes
+ --with-LIBTIFF=\"-ltiff -ljpeg -lz\"
+ --with-OPTIMIZER=\"${CFLAGS}\"
+ --with-DSO=auto
+ --with-HTML=$(usex html)"
+
+ if use mgetty; then
+ my_conf="${my_conf} \
+ --with-PATH_GETTY=/sbin/mgetty \
+ --with-PATH_EGETTY=/sbin/mgetty \
+ --with-PATH_VGETTY=/usr/sbin/vgetty"
+ else
+ # GETTY defaults to /sbin/agetty
+ my_conf="${my_conf} \
+ --with-PATH_EGETTY=/bin/false \
+ --with-PATH_VGETTY=/bin/false"
+ fi
+
+ #--enable-pam isn't valid
+ use pam || my_conf="${my_conf} $(use_enable pam)"
+ use lcms || my_conf="${my_conf} $(use_enable lcms)"
+ use ldap || my_conf="${my_conf} $(use_enable ldap)"
+ use jbig || my_conf="${my_conf} $(use_enable jbig)"
+
+ tc-export CC CXX AR RANLIB
+
+ do_configure "${my_conf}"
+}
+
+src_compile() {
+ # Parallel building is borked, bug #????
+ emake -j1
+}
+
+src_install() {
+ dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
+ dodir /var/spool /var/spool/fax
+ fowners uucp:uucp /var/spool/fax
+ fperms 0600 /var/spool/fax
+ dodir "/usr/share/doc/${P}/samples"
+
+ emake DESTDIR="${D}" \
+ BIN="${D}/usr/bin" \
+ SBIN="${D}/usr/sbin" \
+ LIBDIR="${D}/usr/$(get_libdir)" \
+ LIB="${D}/usr/$(get_libdir)" \
+ LIBEXEC="${D}/usr/sbin" \
+ LIBDATA="${D}/usr/$(get_libdir)/fax" \
+ DIR_LOCALE="${D}/usr/share/locale" \
+ MAN="${D}/usr/share/man" \
+ SPOOL="${D}/var/spool/fax" \
+ HTMLDIR="${D}/usr/share/doc/${PF}/html" \
+ install
+
+ keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
+ keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
+
+ generate_files # in this case, it only generates the env.d entry
+
+ einfo "Adding env.d entry for ${PN}"
+ doenvd "${T}/99${PN}"
+
+ newconfd "${FILESDIR}/${PN}-conf" ${PN}
+ newinitd "${FILESDIR}/${PN}-init" ${PN}
+
+ use pam && pamd_mimic_system ${MY_PN} auth account session
+
+ einstalldocs
+ docinto samples
+}
+
+generate_files() {
+ cat <<-EOF > "${T}/99${PN}"
+ PATH="/var/spool/fax/bin"
+ CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
+ CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog"
+ EOF
+}
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index d1413e11e27f..2a38233e1bca 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,8 +1,8 @@
AUX kea-confd 87 BLAKE2B 564c4c3b7e4d3b16ad03a7971b842e83f1d332a3fd9d5c63d3905b95d57368f9f769e792e39b03ad4345c5870d6d221e904f1f11998c7165874de1c05606e7b7 SHA512 14a95add77a5190475ca698d5981fbf2e07a15c998004af518c2d51c3327c8b059b574a7e8485af61359a814c1b57f8f406902999515c975d81d6ff3e2e00fab
AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae1095dcf08dc5438570fefbc35a087e5285ee6b9f424c1fd62153ef8355246c4cc9fb30bf61acb SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31
-DIST kea-1.2.0.tar.gz 5720941 BLAKE2B c97e4fc18daddbbcba85fa35124290d926b9fa56c83d218b72da886bb3c03540e76ee1a0c1be5f01738b84b8a26f3a395f5b67b0cbc298e8a97cde0aba48a3f9 SHA512 d90571027edbce9eeb75d9ac889865dc24c2fd3ab17e44e23337ff623ca098ffd02560f01273da3c28f13734d95d5950110bc116bed527a295a9dc70addcc240
DIST kea-1.3.0.tar.gz 5996560 BLAKE2B 2037aed1d72c8db58f6be88caa695956e482776571879f439d39dad909c1f79e4fa4353fef1eacf1135e763109f777a8a30500892a9ee1d8d261d3fd41f6257c SHA512 4708485efe537d9af00b50da9a3f33b740edaf37d9bbfe96f5625e30715349c48ef8a32f5abb8320f00821aea642a5b7ecdbc9f0d323a71b7a07f46f1bed978b
-EBUILD kea-1.2.0-r1.ebuild 1320 BLAKE2B 207afa1c8d7ba6d25a45168cb0255cd6bd9e65506bad1dd6cbfab9129e3417ccf630dd85aaae86ed3d1911f8954cd5b053e9ce8a9e229111d65d424c2d11459d SHA512 5148b065c65c7dcaa1e479831b20dd7c29020c36c0442854647b9a0e4d969f9c0bbf7aee805f95ba61945a4682bf519fe7a59bff66f80d7fb7ddcab8dad958ee
+DIST kea-1.4.0.tar.gz 6552970 BLAKE2B bb12a19b156f58f5146904214dc2b0812a56827e7e72d6336db07e64b49bcc198ccc26245088dfccb268b058db574fc43e036341eadc3b1677a03816f6385990 SHA512 ce4e2bcdc6f06472c4dccfc9cc26b06ff10ce1ce947b2bdc8753bbb15ff77831f7317625bdd81d24c945cf0d4c33cf9eef0ae0be21149532b0b9b9bc8892dd14
EBUILD kea-1.3.0.ebuild 1325 BLAKE2B 1ffdea5221ba73471253b50a1fcf1e6c974588f45e5df67ea04c11bb2e2207e9182e9277aabe1f547a4596c042b36782aad53af4c7b2c4d3337f9efbfdd5cad2 SHA512 b846b3b7c202bd05b4be60ea4d89142052f46ff1ef10bea4b04b8e70cf4160d34f6ca6a6d637b821e8803ba5c7fc393e2fd1b50e8d670e8deeea45526fc668b2
+EBUILD kea-1.4.0.ebuild 1485 BLAKE2B 8b860d58efd988221fe35ce2d75e4ed0b59ba09d2c2b951e89c8a7d402f9689a9a59627f61c0df4644ab4e781b63e44d1994f294b37d30c6c98561a02964976d SHA512 9777bc0844c9e261e84f63294109935a8c8cab6e3545ab182ee7d3c8c996c0b979495182117701b30714c418eecd62600e435be279864b187f3227a279498aa7
EBUILD kea-9999.ebuild 1485 BLAKE2B 8b860d58efd988221fe35ce2d75e4ed0b59ba09d2c2b951e89c8a7d402f9689a9a59627f61c0df4644ab4e781b63e44d1994f294b37d30c6c98561a02964976d SHA512 9777bc0844c9e261e84f63294109935a8c8cab6e3545ab182ee7d3c8c996c0b979495182117701b30714c418eecd62600e435be279864b187f3227a279498aa7
MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/kea-1.2.0-r1.ebuild b/net-misc/kea/kea-1.4.0.ebuild
index b8c433491d4b..b3312db88dd3 100644
--- a/net-misc/kea/kea-1.2.0-r1.ebuild
+++ b/net-misc/kea/kea-1.4.0.ebuild
@@ -12,12 +12,17 @@ MY_PV="${MY_PV//_p/-P}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
HOMEPAGE="http://www.isc.org/kea/"
-SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
- ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
+if [[ ${PV} = 9999* ]] ; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
+else
+ SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
+ ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
SLOT="0"
-KEYWORDS="~amd64"
IUSE="openssl samples"
DEPEND="
@@ -32,11 +37,12 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
src_prepare() {
+ default
+ [[ ${PV} = 9999* ]] && eautoreconf
# Brand the version with Gentoo
sed -i \
-e "/VERSION=/s:'$: Gentoo-${PR}':" \
configure || die
- default
}
src_configure() {
diff --git a/net-misc/nemesis/Manifest b/net-misc/nemesis/Manifest
index 69402a722063..f2738b944d05 100644
--- a/net-misc/nemesis/Manifest
+++ b/net-misc/nemesis/Manifest
@@ -1,8 +1,8 @@
AUX 1.4-libnet-1.0.patch 6278 BLAKE2B 481287457b392d86c4d9c55a12c66d5dfb5b1373e1aeacb8aeeb11bb620b92e74d3d3fbf60aca100481963a0adb608bebee4c0fa8587df2c4ed410e6f942decc SHA512 c584afc645e64ac0f09907ba50a60b8ab10d1aad93749eda277dfdf645267a3b16a0617ca4b7812c8a1828f48170c0b7aa5f6077e537bb539e1fe8294efec6d2
-AUX nemesis-1.4-fileio.patch 1064 BLAKE2B 75aeda3252e8375f1ccd803d08f5cb1c93c434a2f3503feb2becd18065465ea635425a1f8800aeea3b3d9e28330bcf1b12e7c816862583b1dd4651edf230d394 SHA512 d50107668e19f7fb9cd27bbdd97c24cb594dd6bc7a82ebb6fc6c6a0ef9e344c9c9c0dc5f18bae5e97714ce8544b81f910ea469e4985137d3b1934745845cec95
-AUX nemesis-1.4-libnet-1.0.patch 6278 BLAKE2B 481287457b392d86c4d9c55a12c66d5dfb5b1373e1aeacb8aeeb11bb620b92e74d3d3fbf60aca100481963a0adb608bebee4c0fa8587df2c4ed410e6f942decc SHA512 c584afc645e64ac0f09907ba50a60b8ab10d1aad93749eda277dfdf645267a3b16a0617ca4b7812c8a1828f48170c0b7aa5f6077e537bb539e1fe8294efec6d2
-AUX nemesis-1.4-prototcp.patch 1376 BLAKE2B 71c39c8b48112a5651dba36e5c6f4adebeebad3d8a0b31fece40e9352a3812b0085617d88c3548375793f1135baf9b8d8eecb91cb6832fac1104435408d7c78e SHA512 2c502eb3a3caa3a1cd849827d43d247102d63cd574dcf142ef4b10e53c22b4b64f8016a4763cd57d2acef995354aeeef78294b97b2637f8454fd107b214efacd
+AUX nemesis-1.4-fileio.patch 975 BLAKE2B 6f955ef14cff07d34ea5693a9dec680748d50c5d831663590a63e97aef9cc68668dd242610a996f19736bba409e6c36fdc2a3a3897cb18f656a2081c7f58d64e SHA512 3bfc30e047eaa493d47ef1dbc1e6940746b347f64c60c210a68db47774c169b2eaeedcaba84eff2fe16fca656d613819218b5f2afe52b97f0d0152cf00a65a3f
+AUX nemesis-1.4-libnet-1.0.patch 4627 BLAKE2B b2ab0e2c72bc24729912d60938dbd0f06ea7f93d78f0431baacab136b1a892ef8c5b0c1d6be96d03940b45aa8d058b05853db7f35832d7bbc53fc988fa019968 SHA512 aa94f7b9db756e636b671de2e0f56bcc145b73f808ef907d1f8965c78e8fd025a69e684d693a3095a751d6a3433c3f34c43c753624c0543c1c5b45bbb1c69eb9
+AUX nemesis-1.4-prototcp.patch 1287 BLAKE2B 0d50d3258f8a1c80cb9622c05ec8611e6f90491fc2d045c9a792630918f8bb73776555ce7714b6d5a2f0ee79b54d9d842db8f0ab3482b6d1fb18a92fe9fd257e SHA512 89f5bbd0506ff6ee15823631c254b9dc7049eccc31f9882485a6e07a9686f8d96f84ef7b56e366d1f3fccb302db9383b10ed3a17be3508a8ab4a001809e7876a
DIST nemesis-1.4.tar.gz 144187 BLAKE2B 9b16fa37283e4a659312bbd24e5ab850cf11cbee9c598f9e57bda517f462448a0a74721425144ec00afb2cde5ba86fcb020d2d7dbf4d6df688b67f7c282d9d38 SHA512 a8d4b434a9b0287e704ab923900c43051dc3aac4a7063e702aa93d7c89cfdeac287a6f40138bdca140e2c889e024f885288c4953940104ac12631cf7394501c8
-EBUILD nemesis-1.4-r1.ebuild 620 BLAKE2B 0667f456249e0c3cede1a53454a987f17d75123c79ad5917a3ca7d1cfcc603d2eb5b1af69c866f80426528287827ae1ea1c62415957f5c02f6b28e2b88a8635f SHA512 228079a6233df981052fc0118ddb65745989e91aee9712befd607352644e2ac30d3272486e3c6c07f05f084ca82b4801d2e576323d7c0a20353ce006598ea97b
+EBUILD nemesis-1.4-r1.ebuild 632 BLAKE2B a353bb9b7f8cab5a7c244c2c288ffc1175885f9176a9d0593fa6aa82ff2adab16aa013c96d57abc8b59fd54f18fbc4284da1b7d1a23396a966350ba0b50e8a6a SHA512 cf01ea29dd05382bc63bda19686dc6e889caaf8dc04c09bf54132e68b4edfbe1dc537d35d19f4a6882ba35b01f10365f666c00f0dc00d401def578ed65550286
EBUILD nemesis-1.4.ebuild 641 BLAKE2B 1af51134b80b35c76dee9ec2252f6aef05eee025e93d58f031d3d8bf747b70bf8ed263824266f019ab01589f36638400e38b5d14eed7d9a3a9766c74581678e6 SHA512 b726b9295600019b56bf84e2501fee4a5587ba75351ddf969594edca68b71eddd253affd5e318893c8409069064c0df47226156b1715e2c2c4a0560c518ef081
-MISC metadata.xml 243 BLAKE2B 49dc7dca723bcd6ee8344d99e398c8e536aacbf61d765db300fcb3e7be17609a44f7c8c8f71b18e0582898f11d0137701521858c62e3432413aec703ca045aac SHA512 49c6be03064a974962f0e82bd76d7d71d73ef243be8bbf6ba9438ff1fce527c633235b2abfd32ea18c5fcb1bd13c0950486851c1a87e8148d88beac7eb85ce88
+MISC metadata.xml 291 BLAKE2B 41178dcbae1f81d0bc5a8cfaacce0d5bdf65648775430d1b8828e3875e7322c7de7537983852485f3a091380a72b964e82f4cac91dc2281f1291662abfacd72a SHA512 7e39bc9868b0b6603f3a48d7905f47745656f96334e6fbaa66e314a6dbfb0c63e1ba33cbbc63fc61f8289fb756105dfd6cf9b990c113a8569a9997af29d2c2dc
diff --git a/net-misc/nemesis/files/nemesis-1.4-fileio.patch b/net-misc/nemesis/files/nemesis-1.4-fileio.patch
index 07c96bc17a74..d39cef3d6508 100644
--- a/net-misc/nemesis/files/nemesis-1.4-fileio.patch
+++ b/net-misc/nemesis/files/nemesis-1.4-fileio.patch
@@ -1,5 +1,5 @@
---- nemesis-1.4-orig/source/src/nemesis-fileio.c Fri Oct 31 16:29:36 2003
-+++ nemesis-1.4/source/src/nemesis-fileio.c Fri May 19 17:31:13 2006
+--- a/src/nemesis-fileio.c
++++ b/src/nemesis-fileio.c
@@ -63,7 +63,7 @@
fp = stdin;
fd = fileno(fp);
diff --git a/net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch b/net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch
index b4c55c374efa..a5a0a83d54a0 100644
--- a/net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch
+++ b/net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch
@@ -1,127 +1,158 @@
---- nemesis-1.4.orig/configure 2006-12-15 13:56:46.000000000 -0700
-+++ nemesis-1.4/configure 2006-12-15 14:17:33.000000000 -0700
-@@ -4150 +4150 @@
+--- a/configure.in
++++ b/configure.in
+@@ -128,22 +128,21 @@
+ dnl LIBS="${LIBS} -L${with_libpcap_libraries}"
+ dnl fi
+
-CPPFLAGS="${CPPFLAGS} `libnet-config --defines`"
+-CFLAGS="${CFLAGS} -funroll-loops -pipe"
+CPPFLAGS="${CPPFLAGS} `libnet-1.0-config --defines`"
-@@ -4153 +4153 @@
+
-if test `libnet-config --cflags | wc -c` = "1"; then
+if test `libnet-1.0-config --cflags | wc -c` = "1"; then
-@@ -4157 +4157 @@
+ CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
+ LIBNET_CONFIG_BROKEN_CFLAGS=yes
+ else
- CPPFLAGS="${CPPFLAGS} `libnet-config --cflags`"
+ CPPFLAGS="${CPPFLAGS} `libnet-1.0-config --cflags`"
-@@ -4160,3 +4160,3 @@
+ fi
+
-if test `libnet-config --libs | wc -c` = "1"; then
-- { echo "$as_me:$LINENO: WARNING: libnet-config --libs is broken on your system. If you" >&5
--echo "$as_me: WARNING: libnet-config --libs is broken on your system. If you" >&2;}
+- AC_MSG_WARN(libnet-config --libs is broken on your system. If you)
+if test `libnet-1.0-config --libs | wc -c` = "1"; then
-+ { echo "$as_me:$LINENO: WARNING: libnet-1.0-config --libs is broken on your system. If you" >&5
-+echo "$as_me: WARNING: libnet-1.0-config --libs is broken on your system. If you" >&2;}
-@@ -4167 +4167 @@
++ AC_MSG_WARN(libnet-1.0-config --libs is broken on your system. If you)
+ AC_MSG_WARN(are using a precompiled package please notify the maintainer.)
+ LIBS="${LIBS} -L/usr/local/lib -L/sw/lib"
+ else
- LIBS="${LIBS} `libnet-config --libs | sed s/\-lnet//`"
-+ LIBS="${LIBS} `libnet-1.0-config --libs | sed s/\-lnet-1.0//`"
-@@ -4712,2 +4712,2 @@
--echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet" >&5
--echo $ECHO_N "checking for libnet_build_ip in -lnet... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet-1.0" >&5
-+echo $ECHO_N "checking for libnet_build_ip in -lnet-1.0... $ECHO_C" >&6
-@@ -4718 +4718 @@
--LIBS="-lnet $LIBS"
-+LIBS="-lnet-1.0 $LIBS"
-@@ -4781 +4781 @@
-- LIBS="-lnet $LIBS"
-+ LIBS="-lnet-1.0 $LIBS"
-@@ -5263 +5263 @@
--for ac_header in libnet.h
-+for ac_header in libnet-1.0.h
-@@ -5433 +5433 @@
++ LIBS="${LIBS} `libnet-1.0-config --libs`"
+ fi
+
+ AC_DEFUN(HEADER_FAIL_MESSAGE,[
+@@ -185,7 +184,7 @@
+ AC_CHECK_LIB(resolv, hstrerror)
+
+ LNET=""
+-AC_CHECK_LIB(net, libnet_build_ip,, LNET="no")
++AC_CHECK_LIB(net-1.0, libnet_build_ip,, LNET="no")
+
+ if test "$LNET" = "no"; then
+ echo
+@@ -193,7 +192,7 @@
+ echo " http://www.packetfactory.net/projects/libnet/"
+ echo " or use the --with-libnet-* options, if you have it installed"
+ echo " in unusual place"
+- exit
++ exit 1
+ fi
+
+ dnl if test "$enable_pcapoutput" != "no" -a "$enable_pcapoutput" = "yes"; then
+@@ -216,7 +215,7 @@
+ AC_CHECK_HEADERS(unistd.h errno.h strings.h netdb.h limits.h machine/endian.h sys/time.h sys/param.h arpa/inet.h netinet/in.h)
+
+ LNET=""
+-AC_CHECK_HEADERS(libnet.h,, LNET="no")
++AC_CHECK_HEADERS(libnet-1.0.h,, LNET="no")
+
+ if test "$LNET" = "no"; then
+ echo
+@@ -235,29 +234,29 @@
+ libnet_dir="/usr/include /usr/local/include /sw/include"
+ fi
+ else
- libnet_dir=`libnet-config --cflags | cut -dI -f2`
+ libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2`
-@@ -5438 +5438 @@
+ fi
+
+ LIBNET_INC_DIR=""
+ for i in $libnet_dir; do
- if test -r $i/libnet.h; then
+ if test -r $i/libnet-1.0.h; then
-@@ -5444 +5444 @@
+ LIBNET_INC_DIR=$i
+ fi
+ done
+
+ if test "$LIBNET_INC_DIR" != ""; then
- if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then
+ if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then
-@@ -5455 +5455 @@
-- echo " ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
-+ echo " ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
-@@ -5474 +5474 @@
-- echo " ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
-+ echo " ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
-diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-arp.h nemesis-1.4beta3/src/nemesis-arp.h
---- nemesis-1.4beta3.orig/src/nemesis-arp.h 2003-08-19 15:45:45.675664688 -0400
-+++ nemesis-1.4beta3/src/nemesis-arp.h 2003-08-19 15:47:07.631205552 -0400
+ AC_MSG_RESULT(no)
+ echo
+ echo " ERROR! Nemesis will *only* work with libnet version 1.0.2a,"
+ echo " go get it from"
+ echo " http://www.packetfactory.net/projects/libnet/"
+- HEADER_FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR)
++ HEADER_FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $LIBNET_INC_DIR)
+ fi
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+- HEADER_FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir)
++ HEADER_FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $libnet_dir)
+ fi
+
+ dnl if test "$enable_pcapoutput" != "no" -a "$enable_pcapoutput" = "yes"; then
+--- a/src/nemesis-arp.h
++++ b/src/nemesis-arp.h
@@ -30 +30 @@
-#include <libnet.h>
+#include <libnet-1.0.h>
-diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-dns.h nemesis-1.4beta3/src/nemesis-dns.h
---- nemesis-1.4beta3.orig/src/nemesis-dns.h 2003-08-19 15:45:45.675664688 -0400
-+++ nemesis-1.4beta3/src/nemesis-dns.h 2003-08-19 15:47:07.638204488 -0400
+--- a/src/nemesis-dns.h
++++ b/src/nemesis-dns.h
@@ -30 +30 @@
-#include <libnet.h>
+#include <libnet-1.0.h>
-diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-ethernet.h nemesis-1.4beta3/src/nemesis-ethernet.h
---- nemesis-1.4beta3.orig/src/nemesis-ethernet.h 2003-08-19 15:45:45.676664536 -0400
-+++ nemesis-1.4beta3/src/nemesis-ethernet.h 2003-08-19 15:47:07.641204032 -0400
+--- a/src/nemesis-ethernet.h
++++ b/src/nemesis-ethernet.h
@@ -29 +29 @@
-#include <libnet.h>
+#include <libnet-1.0.h>
-diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-functions.c nemesis-1.4beta3/src/nemesis-functions.c
---- nemesis-1.4beta3.orig/src/nemesis-functions.c 2003-08-19 15:45:45.676664536 -0400
-+++ nemesis-1.4beta3/src/nemesis-functions.c 2003-08-19 15:47:07.656201752 -0400
+--- a/src/nemesis-functions.c
++++ b/src/nemesis-functions.c
@@ -37 +37 @@
-#include <libnet.h>
+#include <libnet-1.0.h>
-diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-icmp.h nemesis-1.4beta3/src/nemesis-icmp.h
---- nemesis-1.4beta3.orig/src/nemesis-icmp.h 2003-08-19 15:45:45.676664536 -0400
-+++ nemesis-1.4beta3/src/nemesis-icmp.h 2003-08-19 15:47:07.665200384 -0400
+--- a/src/nemesis-icmp.h
++++ b/src/nemesis-icmp.h
@@ -31 +31 @@
-#include <libnet.h>
+#include <libnet-1.0.h>
-diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-igmp.h nemesis-1.4beta3/src/nemesis-igmp.h
---- nemesis-1.4beta3.orig/src/nemesis-igmp.h 2003-08-19 15:45:45.676664536 -0400
-+++ nemesis-1.4beta3/src/nemesis-igmp.h 2003-08-19 15:47:07.670199624 -0400
+--- a/src/nemesis-igmp.h
++++ b/src/nemesis-igmp.h
@@ -30 +30 @@
-#include <libnet.h>
+#include <libnet-1.0.h>
-diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-ip.h nemesis-1.4beta3/src/nemesis-ip.h
---- nemesis-1.4beta3.orig/src/nemesis-ip.h 2003-08-19 15:45:45.676664536 -0400
-+++ nemesis-1.4beta3/src/nemesis-ip.h 2003-08-19 15:47:07.677198560 -0400
+--- a/src/nemesis-ip.h
++++ b/src/nemesis-ip.h
@@ -26 +26 @@
-#include <libnet.h>
+#include <libnet-1.0.h>
-diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-ospf.h nemesis-1.4beta3/src/nemesis-ospf.h
---- nemesis-1.4beta3.orig/src/nemesis-ospf.h 2003-08-19 15:45:45.677664384 -0400
-+++ nemesis-1.4beta3/src/nemesis-ospf.h 2003-08-19 15:47:07.684197496 -0400
+--- a/src/nemesis-ospf.h
++++ b/src/nemesis-ospf.h
@@ -33 +33 @@
-#include <libnet.h>
+#include <libnet-1.0.h>
-diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-rip.h nemesis-1.4beta3/src/nemesis-rip.h
---- nemesis-1.4beta3.orig/src/nemesis-rip.h 2003-08-19 15:45:45.678664232 -0400
-+++ nemesis-1.4beta3/src/nemesis-rip.h 2003-08-19 15:47:07.717192480 -0400
+--- a/src/nemesis-rip.h
++++ b/src/nemesis-rip.h
@@ -33 +33 @@
-#include <libnet.h>
+#include <libnet-1.0.h>
-diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-tcp.h nemesis-1.4beta3/src/nemesis-tcp.h
---- nemesis-1.4beta3.orig/src/nemesis-tcp.h 2003-08-19 15:45:45.678664232 -0400
-+++ nemesis-1.4beta3/src/nemesis-tcp.h 2003-08-19 15:47:07.723191568 -0400
+--- a/src/nemesis-tcp.h
++++ b/src/nemesis-tcp.h
@@ -30 +30 @@
-#include <libnet.h>
+#include <libnet-1.0.h>
-diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-udp.h nemesis-1.4beta3/src/nemesis-udp.h
---- nemesis-1.4beta3.orig/src/nemesis-udp.h 2003-08-19 15:45:45.678664232 -0400
-+++ nemesis-1.4beta3/src/nemesis-udp.h 2003-08-19 15:47:07.728190808 -0400
+--- a/src/nemesis-udp.h
++++ b/src/nemesis-udp.h
@@ -30 +30 @@
-#include <libnet.h>
+#include <libnet-1.0.h>
-diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis.h nemesis-1.4beta3/src/nemesis.h
---- nemesis-1.4beta3.orig/src/nemesis.h 2003-08-19 15:45:45.678664232 -0400
-+++ nemesis-1.4beta3/src/nemesis.h 2003-08-19 15:47:07.731190352 -0400
+--- a/src/nemesis.h
++++ b/src/nemesis.h
@@ -15 +15 @@
-#include <libnet.h>
+#include <libnet-1.0.h>
---- nemesis-1.4.orig/src/nemesis-printout.c 2006-12-15 13:56:46.000000000 -0700
-+++ nemesis-1.4/src/nemesis-printout.c 2006-12-15 14:47:14.000000000 -0700
+--- a/src/nemesis-printout.c
++++ b/src/nemesis-printout.c
@@ -34 +34 @@
-#include <libnet.h>
+#include <libnet-1.0.h>
diff --git a/net-misc/nemesis/files/nemesis-1.4-prototcp.patch b/net-misc/nemesis/files/nemesis-1.4-prototcp.patch
index 0e75a2e43c39..b4a4e7c71378 100644
--- a/net-misc/nemesis/files/nemesis-1.4-prototcp.patch
+++ b/net-misc/nemesis/files/nemesis-1.4-prototcp.patch
@@ -1,5 +1,5 @@
---- nemesis-1.4-orig/source/src/nemesis-proto_tcp.c Fri Oct 31 16:29:38 2003
-+++ nemesis-1.4/source/src/nemesis-proto_tcp.c Fri May 19 17:31:13 2006
+--- a/src/nemesis-proto_tcp.c
++++ b/src/nemesis-proto_tcp.c
@@ -16,7 +16,7 @@
FileData *ipod, FileData *tcpod, char *device)
{
diff --git a/net-misc/nemesis/metadata.xml b/net-misc/nemesis/metadata.xml
index 172e3a59fa4e..f4cbcdfdbb21 100644
--- a/net-misc/nemesis/metadata.xml
+++ b/net-misc/nemesis/metadata.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+<maintainer type='project'>
+<email>netmon@gentoo.org</email>
+</maintainer>
<upstream>
<remote-id type="sourceforge">nemesis</remote-id>
</upstream>
diff --git a/net-misc/nemesis/nemesis-1.4-r1.ebuild b/net-misc/nemesis/nemesis-1.4-r1.ebuild
index 37cd943d341e..6270cd163075 100644
--- a/net-misc/nemesis/nemesis-1.4-r1.ebuild
+++ b/net-misc/nemesis/nemesis-1.4-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
-
-inherit eutils
+EAPI=6
+inherit autotools
DESCRIPTION="A commandline-based, portable human IP stack for UNIX/Linux"
HOMEPAGE="http://nemesis.sourceforge.net/"
@@ -12,16 +11,24 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~sparc ~x86"
-IUSE=""
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
- =net-libs/libnet-1.0*"
+RDEPEND="
+ net-libs/libpcap
+"
+DEPEND="
+ ${RDEPEND}
+ =net-libs/libnet-1.0*
+"
DOCS="CREDITS ChangeLog README"
+PATCHES=(
+ "${FILESDIR}"/${P}-fileio.patch
+ "${FILESDIR}"/${P}-libnet-1.0.patch
+ "${FILESDIR}"/${P}-prototcp.patch
+)
+
src_prepare() {
- epatch "${FILESDIR}"/${P}-fileio.patch
- epatch "${FILESDIR}"/${P}-libnet-1.0.patch
- epatch "${FILESDIR}"/${P}-prototcp.patch
+ default
+ eautoreconf
}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 1f20971f8886..660faa338554 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,18 +2,12 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0
AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658
-DIST NetworkManager-1.10.0.tar.xz 3884396 BLAKE2B 62f6ce759188fe1c4337922d4c23145da5029ed6fa70eae1de122bd4ce00209b0f7a0d1fdf0b65083baa9a9b304471a6ec79de63ea8e79779f2e27c1cec26e19 SHA512 f1c479396fe50faaca9dfd90b165ec3158148a2fb5a2d7a71cd8d573597566520610d572d6a8ec2b1d27ac2e5409a2ba899f46f9f38c114c5b90f0431e370958
-DIST NetworkManager-1.10.2.tar.xz 3937636 BLAKE2B b99a115233e6f2761fc042b8b9599db096edea7c35894beed1663013d3845212028f436d92e088c086e0e31941013ad4e75b5601fac0c9db9264ebfa04c53382 SHA512 bc372b334120bc62ce4d9f78baf9f46a880fe6fa24181bcefe71eb1c67868c32edb4c5b323e63aa720284b13189a0704e0b3d13a2c6e6a9be72e5bfb6bca9072
+DIST NetworkManager-1.10.10.tar.xz 4038552 BLAKE2B a0a3c2a74dd641d25267ec7932f0801e30720334cb905c86abfaeb9bc3c60a2c1e9372b738b1eb43c55a34edf952905d94e3513cef653ea62e470d56bc575b65 SHA512 e536598b19064e0ab7fe3e92362de9c380281ff53a1481438216c2247b2d5287244e735be41c56c53040a5861bf36bbb979e36578244fabd6448a50ea42c4645
DIST NetworkManager-1.10.6.tar.xz 4029656 BLAKE2B 0fa99dbb54c3f51755329f229f941e408d883aeff24bbcf0f9df143544190ab59ed5742caca42ea7cced949de0891ecc148394fbff1b9cd87b26c3a84f2a728e SHA512 8406ed561efff13b63dc218babdd2ad9e2816bcc829ba3ef2ce942bb5fa027640de28660381203016fa9cddb61412d3cd5102b7cbd29d0e284b5cb8d13dd8610
DIST NetworkManager-1.4.4.tar.xz 3762664 BLAKE2B 430f5a15540c43d067c27927b627ecb1c7935f42566e9b14b82b6f70cf7dae3ed7398bb45647911e91d8ce14558b1eccc0f6ffa97eae852dd524219dcc536a90 SHA512 a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14
-DIST NetworkManager-1.8.0.tar.xz 3811100 BLAKE2B ad8026891ed0f29e80d217d0cbc7965bdc67065462e88068cc6f8cd989ddbcec7095b5d98eab85d8e6fba4f5af5485b2ec0feecafcb6d8324c3ee3c257a0dd64 SHA512 1f261a9bbba1013ec7ac88672f2ebdfdb9447874eb711ccfa7383534f003f37aabbcddb51aa868e14cec1d76c33d33a99d681a3858ea6239112fe6fce81a9c6c
-DIST NetworkManager-1.8.2.tar.xz 3818844 BLAKE2B 97929ae1d071b3e88dbacf9bd1131840066edb031df2e2fe7e15ef5029029d0029efff8836df3f2cf857e95728bfd8f77f6a81cadf45ae8c76a986aba1649709 SHA512 7bebea66d8f494c052313224e9d5b1b4cf665482f07ee5d93defc3543f32296545a2d1097ab1fff27dbebb58e07a4bc47fbc0101163db92953ae66ac9b95524d
DIST NetworkManager-1.8.4.tar.xz 3821500 BLAKE2B 7db1c95af5b8006cd3b7e1d960f9763c05caf5aadcc139bbe349a12ef996821afc38250afe4b078fd4d1953be19c1f16c6813562c5f4792e6c17f28ee0521c06 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1
-EBUILD networkmanager-1.10.0.ebuild 10709 BLAKE2B fc7e5d74d6b916ab8018f1a7f3ca773d85a4bcf95daa052e1b30326a9f7bf13922ec17883422d0a771002e1d53ddfe3c4a2d072f48c5f4baa1cfb35c61fb9422 SHA512 c04f31d5cac1c6dd094d0bd043d70cd195322e0fd1acf749c9b2f9d0fbafca185cee0289c93078454d10a3e396613e8b3c28cf8b60f3afbe02b2ca9fd42c128a
-EBUILD networkmanager-1.10.2.ebuild 10709 BLAKE2B fc7e5d74d6b916ab8018f1a7f3ca773d85a4bcf95daa052e1b30326a9f7bf13922ec17883422d0a771002e1d53ddfe3c4a2d072f48c5f4baa1cfb35c61fb9422 SHA512 c04f31d5cac1c6dd094d0bd043d70cd195322e0fd1acf749c9b2f9d0fbafca185cee0289c93078454d10a3e396613e8b3c28cf8b60f3afbe02b2ca9fd42c128a
+EBUILD networkmanager-1.10.10.ebuild 10772 BLAKE2B 04abf058760e6a89a215de2e01e371f85c5a3fae221b79f3c2e1663f0cc9254c0fca3704094eb756cf2ab244e254392aa87bb21cd2ae087ae9999a3e443ccd6b SHA512 8950a84fe560747c914f7e2597860885d08c25a1ac3fe27a65507beb3ffb80889a98d6bb40342f8e68b02161af8b271a2543c8cea16f26b86611f33934d7c91d
EBUILD networkmanager-1.10.6.ebuild 10772 BLAKE2B 04abf058760e6a89a215de2e01e371f85c5a3fae221b79f3c2e1663f0cc9254c0fca3704094eb756cf2ab244e254392aa87bb21cd2ae087ae9999a3e443ccd6b SHA512 8950a84fe560747c914f7e2597860885d08c25a1ac3fe27a65507beb3ffb80889a98d6bb40342f8e68b02161af8b271a2543c8cea16f26b86611f33934d7c91d
EBUILD networkmanager-1.4.4-r1.ebuild 11420 BLAKE2B 2245516cc7f356c194032729459a96c68e684fd1d3e3f78230424dff74648c29a75225d80376793544d15b9e450d7266a5e3457756fb0db9134981ba2d3c29c3 SHA512 35e42a8b58ebbf86980c15807c010246a2e7b90ae537a039c481266393bc1975ce2f7576dfb8bebd65fed2eb090d053bb8accdc09732549ff586b0ac1a04a956
-EBUILD networkmanager-1.8.0.ebuild 10634 BLAKE2B 5ebd3854eb79ae1e7bdc754584f50c86fac6c93b53cc5a083ed456b4d0f01f11e25ddbcd431cafcddb9842f3bb21a0826941e3db572c19df7303b436ff28da1b SHA512 540491cac8d661c19e36b425261b4c595045577f3194cac666e5d2aa7d8dfff09500ceb84f87532a2570637243412ec7f4240545e7180c3415e487e19618455d
-EBUILD networkmanager-1.8.2.ebuild 10688 BLAKE2B 30ce707b2fde2280d021e76cdebf5e453c32a9490463877a8012cbc2bf65e7e2c3611eca110be09ecd8a0a199a8a876e18ec39366e216c44629a1fba4280095d SHA512 373537eb5ec7a6f002f4ba46d87a8e0b774700622a9155bd0eb5e712b65a98ab8f514c4f820abf8dce245677af53d203d7290afb8b8d25fdc8fecdb02e9d281e
EBUILD networkmanager-1.8.4.ebuild 10684 BLAKE2B 5f5459e190d2c682f9b0cd84495be993ddc22cc6df6bb5961928d647676e9c99b27b0ab8b0ce576228d86f7b623e8289ba7d9b810320367b5d24849be2a833b2 SHA512 95b658dd24645f839870548fd14c1ae03a6f774282adc30cca5ef57c9dcef013438b8894e258b201af37e777f4b1adcf2ea564a5a0475347c8078e3b1e468dd3
MISC metadata.xml 1824 BLAKE2B f2397e8a74db17eab6a84d75837dc7e144d21d90c304fbe643b05ed13dbf36c553cacc01328bda0ef8e03319c036591b38ef1d49c250e1f2317b1a3e18213091 SHA512 e85f1ec75063c842dbb5c72d8e84158f1a5ac2452e8c19f9b8269c5f6d143399463b4aef9eec918778dd0f3dd0bea70ebb9512165fd1d60e48f93fc577d4d77c
diff --git a/net-misc/networkmanager/networkmanager-1.10.0.ebuild b/net-misc/networkmanager/networkmanager-1.10.10.ebuild
index 48b1dd56d0de..3d3830010e12 100644
--- a/net-misc/networkmanager/networkmanager-1.10.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.10.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -290,6 +290,9 @@ multilib_src_install_all() {
# Allow users in plugdev group to modify system connections
insinto /usr/share/polkit-1/rules.d/
doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+ # Empty
+ rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
}
pkg_postinst() {
diff --git a/net-misc/networkmanager/networkmanager-1.10.2.ebuild b/net-misc/networkmanager/networkmanager-1.10.2.ebuild
deleted file mode 100644
index 48b1dd56d0de..000000000000
--- a/net-misc/networkmanager/networkmanager-1.10.2.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
- user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
- modemmanager? ( ppp )
- vala? ( introspection )
- wext? ( wifi )
- ^^ ( nss gnutls )
- ?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
- >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
- >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
- >=dev-libs/libnl-3.2.8:3=[${MULTILIB_USEDEP}]
- policykit? ( >=sys-auth/polkit-0.106 )
- net-libs/libndp[${MULTILIB_USEDEP}]
- >=net-misc/curl-7.24
- net-misc/iputils
- sys-apps/util-linux[${MULTILIB_USEDEP}]
- sys-libs/readline:0=
- >=virtual/libudev-175:=[${MULTILIB_USEDEP}]
- audit? ( sys-process/audit )
- bluetooth? ( >=net-wireless/bluez-5 )
- connection-sharing? (
- net-dns/dnsmasq[dbus,dhcp]
- net-firewall/iptables )
- consolekit? ( >=sys-auth/consolekit-1.0.0 )
- dhclient? ( >=net-misc/dhcp-4[client] )
- dhcpcd? ( net-misc/dhcpcd )
- elogind? ( >=sys-auth/elogind-219 )
- gnutls? (
- dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
- >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
- json? ( dev-libs/jansson[${MULTILIB_USEDEP}] )
- modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
- ncurses? ( >=dev-libs/newt-0.52.15 )
- nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
- ofono? ( net-misc/ofono )
- ovs? ( dev-libs/jansson )
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
- resolvconf? ( net-dns/openresolv )
- selinux? ( sys-libs/libselinux )
- systemd? ( >=sys-apps/systemd-209:0= )
- teamd? (
- dev-libs/jansson
- >=net-misc/libteam-1.9
- )
-"
-RDEPEND="${COMMON_DEPEND}
- || (
- net-misc/iputils[arping(+)]
- net-analyzer/arping
- )
- wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
- dev-util/gdbus-codegen
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- >=sys-kernel/linux-headers-2.6.29
- virtual/pkgconfig[${MULTILIB_USEDEP}]
- introspection? (
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- dev-lang/perl
- dev-libs/libxslt
- )
- vala? ( $(vala_depend) )
- test? (
- $(python_gen_any_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]')
- )
-"
-
-python_check_deps() {
- if use introspection; then
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
- fi
- if use test; then
- has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
- fi
-}
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
- eerror "or NetworkManager will not work correctly."
- eerror "See https://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend $?
-}
-
-pkg_pretend() {
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
- ewarn "See https://bugs.gentoo.org/333639 for more info."
- fi
-
- fi
-}
-
-pkg_setup() {
- if use connection-sharing; then
- CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
- linux-info_pkg_setup
- fi
- enewgroup plugdev
- if use introspection || use test; then
- python-any-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- DOC_CONTENTS="To modify system network connections without needing to enter the
- root password, add your user account to the 'plugdev' group."
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=(
- --disable-more-warnings
- --disable-static
- --localstatedir=/var
- --disable-lto
- --disable-config-plugin-ibft
- # ifnet plugin always disabled until someone volunteers to actively
- # maintain and fix it
- --disable-ifnet
- --disable-qt
- --without-netconfig
- --with-dbus-sys-dir=/etc/dbus-1/system.d
- # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
- # still not ready for removing that lib
- --with-libnm-glib
- --with-nmcli=yes
- --with-udev-dir="$(get_udevdir)"
- --with-config-plugins-default=keyfile
- --with-iptables=/sbin/iptables
- $(multilib_native_enable concheck)
- --with-crypto=$(usex nss nss gnutls)
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
- --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
- $(multilib_native_use_with audit libaudit)
- $(multilib_native_use_enable bluetooth bluez5-dun)
- $(use_with dhclient)
- $(use_with dhcpcd)
- $(multilib_native_use_enable introspection)
- $(use_enable json json-validation)
- $(multilib_native_use_enable ppp)
- --without-libpsl
- $(multilib_native_use_with modemmanager modem-manager-1)
- $(multilib_native_use_with ncurses nmtui)
- $(multilib_native_use_with ofono)
- $(multilib_native_use_enable ovs)
- $(multilib_native_use_with resolvconf)
- $(multilib_native_use_with selinux)
- $(multilib_native_use_with systemd systemd-journal)
- $(multilib_native_use_enable teamd teamdctl)
- $(multilib_native_use_enable test tests)
- $(multilib_native_use_enable vala)
- --without-valgrind
- $(multilib_native_use_with wext)
- $(multilib_native_use_enable wifi)
- )
-
- if multilib_is_native_abi && use policykit; then
- myconf+=( --enable-polkit=yes )
- else
- myconf+=( --enable-polkit=disabled )
- fi
-
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
- if use ppp; then
- local PPPD_VER=`best_version net-dialup/ppp`
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
- myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
- fi
-
- # unit files directory needs to be passed only when systemd is enabled,
- # otherwise systemd support is not disabled completely, bug #524534
- use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
- if multilib_is_native_abi; then
- # work-around man out-of-source brokenness, must be done before configure
- ln -s "${S}/docs" docs || die
- ln -s "${S}/man" man || die
- fi
-
- ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- local targets=(
- libnm/libnm.la
- libnm-util/libnm-util.la
- libnm-glib/libnm-glib.la
- libnm-glib/libnm-glib-vpn.la
- )
- emake "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- if use test && multilib_is_native_abi; then
- python_setup
- virtx emake check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- # Install completions at proper place, bug #465100
- gnome2_src_install completiondir="$(get_bashcompdir)"
- else
- local targets=(
- install-libLTLIBRARIES
- install-libdeprecatedHEADERS
- install-libnm_glib_libnmvpnHEADERS
- install-libnm_glib_libnmincludeHEADERS
- install-libnm_util_libnm_util_includeHEADERS
- install-libnmincludeHEADERS
- install-nodist_libnm_glib_libnmincludeHEADERS
- install-nodist_libnm_glib_libnmvpnHEADERS
- install-nodist_libnm_util_libnm_util_includeHEADERS
- install-nodist_libnmincludeHEADERS
- install-pkgconfigDATA
- )
- emake DESTDIR="${D}" "${targets[@]}"
- fi
-}
-
-multilib_src_install_all() {
- ! use systemd && readme.gentoo_create_doc
-
- newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
- # Allow users in plugdev group to modify system connections
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- systemd_reenable NetworkManager.service
- ! use systemd && readme.gentoo_print_elog
-
- if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
- ewarn "The ${PN} system configuration file has moved to a new location."
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn
- ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
- fi
-
- # NM fallbacks to plugin specified at compile time (upstream bug #738611)
- # but still show a warning to remember people to have cleaner config file
- if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
- if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
- ewarn
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
- ewarn
- fi
- fi
-
- # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
- ewarn "You have psk-flags=1 setting in above files, you will need to"
- ewarn "either reconfigure affected networks or, at least, set the flag"
- ewarn "value to '0'."
- fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.8.0.ebuild b/net-misc/networkmanager/networkmanager-1.8.0.ebuild
deleted file mode 100644
index ccf11ee170c4..000000000000
--- a/net-misc/networkmanager/networkmanager-1.8.0.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
- user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
- modemmanager? ( ppp )
- vala? ( introspection )
- wext? ( wifi )
- ^^ ( nss gnutls )
- ?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# TODO: need multilib janson (linked to libnm.so)
-COMMON_DEPEND="
- >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
- >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
- >=dev-libs/libnl-3.2.8:3=[${MULTILIB_USEDEP}]
- policykit? ( >=sys-auth/polkit-0.106 )
- net-libs/libndp[${MULTILIB_USEDEP}]
- net-misc/curl
- net-misc/iputils
- sys-apps/util-linux[${MULTILIB_USEDEP}]
- sys-libs/readline:0=
- >=virtual/libudev-175:=[${MULTILIB_USEDEP}]
- audit? ( sys-process/audit )
- bluetooth? ( >=net-wireless/bluez-5 )
- connection-sharing? (
- net-dns/dnsmasq[dbus,dhcp]
- net-firewall/iptables )
- consolekit? ( >=sys-auth/consolekit-1.0.0 )
- dhclient? ( >=net-misc/dhcp-4[client] )
- dhcpcd? ( net-misc/dhcpcd )
- elogind? ( sys-auth/elogind )
- gnutls? (
- dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
- >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
- json? ( dev-libs/jansson )
- modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
- ncurses? ( >=dev-libs/newt-0.52.15 )
- nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
- ofono? ( net-misc/ofono )
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
- resolvconf? ( net-dns/openresolv )
- selinux? ( sys-libs/libselinux )
- systemd? ( >=sys-apps/systemd-209:0= )
- teamd? (
- dev-libs/jansson
- >=net-misc/libteam-1.9
- )
-"
-RDEPEND="${COMMON_DEPEND}
- || (
- net-misc/iputils[arping(+)]
- net-analyzer/arping
- )
- wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
- dev-util/gdbus-codegen
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- >=sys-kernel/linux-headers-2.6.29
- virtual/pkgconfig[${MULTILIB_USEDEP}]
- introspection? (
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- dev-lang/perl
- dev-libs/libxslt
- )
- vala? ( $(vala_depend) )
- test? (
- $(python_gen_any_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]')
- )
-"
-
-python_check_deps() {
- if use introspection; then
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
- fi
- if use test; then
- has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
- fi
-}
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
- eerror "or NetworkManager will not work correctly."
- eerror "See https://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend $?
-}
-
-pkg_pretend() {
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
- ewarn "See https://bugs.gentoo.org/333639 for more info."
- fi
-
- fi
-}
-
-pkg_setup() {
- if use connection-sharing; then
- CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
- linux-info_pkg_setup
- fi
- enewgroup plugdev
- if use introspection || use test; then
- python-any-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- DOC_CONTENTS="To modify system network connections without needing to enter the
- root password, add your user account to the 'plugdev' group."
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=(
- --disable-more-warnings
- --disable-static
- --localstatedir=/var
- --disable-lto
- --disable-config-plugin-ibft
- # ifnet plugin always disabled until someone volunteers to actively
- # maintain and fix it
- --disable-ifnet
- --disable-qt
- --without-netconfig
- --with-dbus-sys-dir=/etc/dbus-1/system.d
- # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
- # still not ready for removing that lib
- --with-libnm-glib
- --with-nmcli=yes
- --with-udev-dir="$(get_udevdir)"
- --with-config-plugins-default=keyfile
- --with-iptables=/sbin/iptables
- $(multilib_native_enable concheck)
- --with-crypto=$(usex nss nss gnutls)
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
- --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
- $(multilib_native_use_with audit libaudit)
- $(multilib_native_use_enable bluetooth bluez5-dun)
- $(use_with dhclient)
- $(use_with dhcpcd)
- $(multilib_native_use_enable introspection)
- $(multilib_native_use_enable json json-validation)
- $(multilib_native_use_enable ppp)
- --without-libpsl
- $(multilib_native_use_with modemmanager modem-manager-1)
- $(multilib_native_use_with ncurses nmtui)
- $(multilib_native_use_with ofono)
- $(multilib_native_use_with resolvconf)
- $(multilib_native_use_with selinux)
- $(multilib_native_use_with systemd systemd-journal)
- $(multilib_native_use_enable teamd teamdctl)
- $(multilib_native_use_enable test tests)
- $(multilib_native_use_enable vala)
- --without-valgrind
- $(multilib_native_use_with wext)
- $(multilib_native_use_enable wifi)
- )
-
- if multilib_is_native_abi && use policykit; then
- myconf+=( --enable-polkit=yes )
- else
- myconf+=( --enable-polkit=disabled )
- fi
-
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
- if use ppp; then
- local PPPD_VER=`best_version net-dialup/ppp`
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
- myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
- fi
-
- # unit files directory needs to be passed only when systemd is enabled,
- # otherwise systemd support is not disabled completely, bug #524534
- use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
- if multilib_is_native_abi; then
- # work-around man out-of-source brokenness, must be done before configure
- ln -s "${S}/docs" docs || die
- ln -s "${S}/man" man || die
- fi
-
- ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- local targets=(
- libnm/libnm.la
- libnm-util/libnm-util.la
- libnm-glib/libnm-glib.la
- libnm-glib/libnm-glib-vpn.la
- )
- emake "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- if use test && multilib_is_native_abi; then
- python_setup
- virtx emake check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- # Install completions at proper place, bug #465100
- gnome2_src_install completiondir="$(get_bashcompdir)"
- else
- local targets=(
- install-libLTLIBRARIES
- install-libdeprecatedHEADERS
- install-libnm_glib_libnmvpnHEADERS
- install-libnm_glib_libnmincludeHEADERS
- install-libnm_util_libnm_util_includeHEADERS
- install-libnmincludeHEADERS
- install-nodist_libnm_glib_libnmincludeHEADERS
- install-nodist_libnm_glib_libnmvpnHEADERS
- install-nodist_libnm_util_libnm_util_includeHEADERS
- install-nodist_libnmincludeHEADERS
- install-pkgconfigDATA
- )
- emake DESTDIR="${D}" "${targets[@]}"
- fi
-}
-
-multilib_src_install_all() {
- ! use systemd && readme.gentoo_create_doc
-
- newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
- # Allow users in plugdev group to modify system connections
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- ! use systemd && readme.gentoo_print_elog
-
- if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
- ewarn "The ${PN} system configuration file has moved to a new location."
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn
- ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
- fi
-
- # NM fallbacks to plugin specified at compile time (upstream bug #738611)
- # but still show a warning to remember people to have cleaner config file
- if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
- if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
- ewarn
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
- ewarn
- fi
- fi
-
- # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
- ewarn "You have psk-flags=1 setting in above files, you will need to"
- ewarn "either reconfigure affected networks or, at least, set the flag"
- ewarn "value to '0'."
- fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.8.2.ebuild b/net-misc/networkmanager/networkmanager-1.8.2.ebuild
deleted file mode 100644
index 55ec2f85cec3..000000000000
--- a/net-misc/networkmanager/networkmanager-1.8.2.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
- user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
- modemmanager? ( ppp )
- vala? ( introspection )
- wext? ( wifi )
- ^^ ( nss gnutls )
- ?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# TODO: need multilib janson (linked to libnm.so)
-COMMON_DEPEND="
- >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
- >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
- >=dev-libs/libnl-3.2.8:3=[${MULTILIB_USEDEP}]
- policykit? ( >=sys-auth/polkit-0.106 )
- net-libs/libndp[${MULTILIB_USEDEP}]
- >=net-misc/curl-7.24
- net-misc/iputils
- sys-apps/util-linux[${MULTILIB_USEDEP}]
- sys-libs/readline:0=
- >=virtual/libudev-175:=[${MULTILIB_USEDEP}]
- audit? ( sys-process/audit )
- bluetooth? ( >=net-wireless/bluez-5 )
- connection-sharing? (
- net-dns/dnsmasq[dbus,dhcp]
- net-firewall/iptables )
- consolekit? ( >=sys-auth/consolekit-1.0.0 )
- dhclient? ( >=net-misc/dhcp-4[client] )
- dhcpcd? ( net-misc/dhcpcd )
- elogind? ( >=sys-auth/elogind-219 )
- gnutls? (
- dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
- >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
- json? ( dev-libs/jansson )
- modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
- ncurses? ( >=dev-libs/newt-0.52.15 )
- nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
- ofono? ( net-misc/ofono )
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
- resolvconf? ( net-dns/openresolv )
- selinux? ( sys-libs/libselinux )
- systemd? ( >=sys-apps/systemd-209:0= )
- teamd? (
- dev-libs/jansson
- >=net-misc/libteam-1.9
- )
-"
-RDEPEND="${COMMON_DEPEND}
- || (
- net-misc/iputils[arping(+)]
- net-analyzer/arping
- )
- wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
- dev-util/gdbus-codegen
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- >=sys-kernel/linux-headers-2.6.29
- virtual/pkgconfig[${MULTILIB_USEDEP}]
- introspection? (
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- dev-lang/perl
- dev-libs/libxslt
- )
- vala? ( $(vala_depend) )
- test? (
- $(python_gen_any_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]')
- )
-"
-
-python_check_deps() {
- if use introspection; then
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
- fi
- if use test; then
- has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
- fi
-}
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
- eerror "or NetworkManager will not work correctly."
- eerror "See https://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend $?
-}
-
-pkg_pretend() {
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
- ewarn "See https://bugs.gentoo.org/333639 for more info."
- fi
-
- fi
-}
-
-pkg_setup() {
- if use connection-sharing; then
- CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
- linux-info_pkg_setup
- fi
- enewgroup plugdev
- if use introspection || use test; then
- python-any-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- DOC_CONTENTS="To modify system network connections without needing to enter the
- root password, add your user account to the 'plugdev' group."
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=(
- --disable-more-warnings
- --disable-static
- --localstatedir=/var
- --disable-lto
- --disable-config-plugin-ibft
- # ifnet plugin always disabled until someone volunteers to actively
- # maintain and fix it
- --disable-ifnet
- --disable-qt
- --without-netconfig
- --with-dbus-sys-dir=/etc/dbus-1/system.d
- # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
- # still not ready for removing that lib
- --with-libnm-glib
- --with-nmcli=yes
- --with-udev-dir="$(get_udevdir)"
- --with-config-plugins-default=keyfile
- --with-iptables=/sbin/iptables
- $(multilib_native_enable concheck)
- --with-crypto=$(usex nss nss gnutls)
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
- --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
- $(multilib_native_use_with audit libaudit)
- $(multilib_native_use_enable bluetooth bluez5-dun)
- $(use_with dhclient)
- $(use_with dhcpcd)
- $(multilib_native_use_enable introspection)
- $(multilib_native_use_enable json json-validation)
- $(multilib_native_use_enable ppp)
- --without-libpsl
- $(multilib_native_use_with modemmanager modem-manager-1)
- $(multilib_native_use_with ncurses nmtui)
- $(multilib_native_use_with ofono)
- $(multilib_native_use_with resolvconf)
- $(multilib_native_use_with selinux)
- $(multilib_native_use_with systemd systemd-journal)
- $(multilib_native_use_enable teamd teamdctl)
- $(multilib_native_use_enable test tests)
- $(multilib_native_use_enable vala)
- --without-valgrind
- $(multilib_native_use_with wext)
- $(multilib_native_use_enable wifi)
- )
-
- if multilib_is_native_abi && use policykit; then
- myconf+=( --enable-polkit=yes )
- else
- myconf+=( --enable-polkit=disabled )
- fi
-
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
- if use ppp; then
- local PPPD_VER=`best_version net-dialup/ppp`
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
- myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
- fi
-
- # unit files directory needs to be passed only when systemd is enabled,
- # otherwise systemd support is not disabled completely, bug #524534
- use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
- if multilib_is_native_abi; then
- # work-around man out-of-source brokenness, must be done before configure
- ln -s "${S}/docs" docs || die
- ln -s "${S}/man" man || die
- fi
-
- ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- local targets=(
- libnm/libnm.la
- libnm-util/libnm-util.la
- libnm-glib/libnm-glib.la
- libnm-glib/libnm-glib-vpn.la
- )
- emake "${targets[@]}"
- fi
-}
-
-multilib_src_test() {
- if use test && multilib_is_native_abi; then
- python_setup
- virtx emake check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- # Install completions at proper place, bug #465100
- gnome2_src_install completiondir="$(get_bashcompdir)"
- else
- local targets=(
- install-libLTLIBRARIES
- install-libdeprecatedHEADERS
- install-libnm_glib_libnmvpnHEADERS
- install-libnm_glib_libnmincludeHEADERS
- install-libnm_util_libnm_util_includeHEADERS
- install-libnmincludeHEADERS
- install-nodist_libnm_glib_libnmincludeHEADERS
- install-nodist_libnm_glib_libnmvpnHEADERS
- install-nodist_libnm_util_libnm_util_includeHEADERS
- install-nodist_libnmincludeHEADERS
- install-pkgconfigDATA
- )
- emake DESTDIR="${D}" "${targets[@]}"
- fi
-}
-
-multilib_src_install_all() {
- ! use systemd && readme.gentoo_create_doc
-
- newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
- # Allow users in plugdev group to modify system connections
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- systemd_reenable NetworkManager.service
- ! use systemd && readme.gentoo_print_elog
-
- if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
- ewarn "The ${PN} system configuration file has moved to a new location."
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn
- ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
- fi
-
- # NM fallbacks to plugin specified at compile time (upstream bug #738611)
- # but still show a warning to remember people to have cleaner config file
- if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
- if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
- ewarn
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
- ewarn
- fi
- fi
-
- # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
- ewarn "You have psk-flags=1 setting in above files, you will need to"
- ewarn "either reconfigure affected networks or, at least, set the flag"
- ewarn "value to '0'."
- fi
-}
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 706365b4b6c7..ff62a5f6fb99 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -4,6 +4,8 @@ AUX ntpd.rc-r2 484 BLAKE2B 826a3ee09486d912525fe6d44b967e25d8b31485d89a80987afcf
AUX ntpd.service 299 BLAKE2B 307dbf3a8569cdd1d54095bdb9b409986a9de3c7ec98405b4544f1df565828da2b685ce408061bc03f9a7991fbd61a9b42577c4e6db06bd2a4a012949cafe2dc SHA512 b625e993bbeba5da9c0f14ec8ff9d256575d9590a6c506436e834a9dc17877bfd57920b008bd01409d47de71acfb221a0d92c0203e2aacca33083e196466faf9
AUX ntpsec-1.0.0-fix-seccomp.patch 587 BLAKE2B c937a12ed548a4d825964c66e37faebb35b3b8ca2bb6dda6a75a84cfcce04777a0e9ff48a6f3bbd82dfc9fd47977aba749dd93200e81280cea5475bc04c933f3 SHA512 12eaa510d6dac6b6e2fe764d6ec8cc8582031be25e5e6785a4813d4c150ecb36574b64f1fa8c2a7d6cf6a49423642fe875774b8d6e894f31f8605e5716313107
DIST ntpsec-1.0.0.tar.gz 2405862 BLAKE2B b1631491500cafa5d41761fe6cb2db523450ed7801d06678048d6b8878d93dbd1e9d7cb2081a8400421213cf78a6724220236149a7f719896d1e8e48f5337d85 SHA512 9fb06310508b30d2ae2d66212d7d87b00e8eea294cebc27eb70435d764bd639fcec234b66e78deafb700476c88e47afe2d1b463563008c32efbb0644dd611f43
+DIST ntpsec-1.1.1.tar.gz 2451415 BLAKE2B 516c87f0710ecacfde27f801a5fc4a492e7871eb35cc3afb8a107e0c381cd9787a4af2d0b01e2cf5d4f43043afe042321e5bbd2299578723e870b2fa502646d2 SHA512 838ed81c94e14a3d8588670ce63a1c4f6216d2f79be5149ad6a845cec00bdf6d7fe77310ce9c33c4675d3db54e59c3d9d02ae4351913ffbd9a3883716c443f83
EBUILD ntpsec-1.0.0-r6.ebuild 3984 BLAKE2B d1752c19aedecd7cb4a7522ab4f4adbc6c86daf0a3d33a45aa81f501142b0daab5e66785362f751d3603f21fdab66c17a22304365db99af5dd808ae6beccc95a SHA512 fecd7e354283d83be97445a4d7dd36e103f56e123519bbfacfd2983d8e94953dcafc461d97a628be7b019e06a989ef1778afa1af63a41d2e42b61023debc92a9
-EBUILD ntpsec-9999.ebuild 3899 BLAKE2B 2b7cd2154ca66134947d435ce1315402b9eeca0bad2400a318c1ae52a0a155089eddc2787906127eed5a33a644d25ee972abbea597e206f18364774f3ee458eb SHA512 294b7491be69d17d96d01664e26813913cf7ca0c0d18c58a81c2dd9268de625b5681097bdc4f1612e242260aa8b5c555023b2cb02f5d51267644a885de0b8da4
+EBUILD ntpsec-1.1.1.ebuild 3920 BLAKE2B 41c8e51bf42125994bffc8d5a6793769311eb66e78ee5cb5e7b575992e335f9fdecf18e0224709a281d2d9c0a2e0784b9dae568e33daea99f33ab2ecfc61278c SHA512 5131e8e735ef0a15d56c355e40d32d3b60ae76d659f45a2f173ef66a4cc2a12f619c3804ac2f054b385f46362c86627992a554bb0659872b5a9e7747cf8044e3
+EBUILD ntpsec-9999.ebuild 3920 BLAKE2B 41c8e51bf42125994bffc8d5a6793769311eb66e78ee5cb5e7b575992e335f9fdecf18e0224709a281d2d9c0a2e0784b9dae568e33daea99f33ab2ecfc61278c SHA512 5131e8e735ef0a15d56c355e40d32d3b60ae76d659f45a2f173ef66a4cc2a12f619c3804ac2f054b385f46362c86627992a554bb0659872b5a9e7747cf8044e3
MISC metadata.xml 2008 BLAKE2B e4f1a7e79fbaf5011ba2b26143c138f39663be73664ec9f1270e9b6cbcb553c245201c9a5bd0771435a24e1f342907861e8a2b6808cc2e3f6d6a7a10ad6ed021 SHA512 5c8fc24233d577ebc254a6d92d93734bfb10ef287217ef61f4f6e8b28f059ee7e92bc5e18326d61a9e80fa7504f79c820d831cdad489321a9f45bae0a4d54a16
diff --git a/net-misc/ntpsec/ntpsec-1.1.1.ebuild b/net-misc/ntpsec/ntpsec-1.1.1.ebuild
new file mode 100644
index 000000000000..680e3dcba1d5
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.1.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit flag-o-matic python-r1 waf-utils systemd user
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+ BDEPEND=""
+ KEYWORDS=""
+else
+ SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
+ RESTRICT="mirror"
+ BDEPEND=""
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+NTPSEC_REFCLOCK=(
+ oncore trimble truetime gpsd jjy generic spectracom
+ shm pps hpgps zyfer arbiter nmea neoclock modem
+ local)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# net-misc/pps-tools oncore,pps
+CDEPEND="${PYTHON_DEPS}
+ ${BDEPEND}
+ sys-libs/libcap
+ dev-python/psutil[${PYTHON_USEDEP}]
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
+ seccomp? ( sys-libs/libseccomp )
+"
+RDEPEND="${CDEPEND}
+ ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
+ !net-misc/ntp
+ !net-misc/openntpd
+"
+DEPEND="${CDEPEND}
+ app-text/asciidoc
+ app-text/docbook-xsl-stylesheets
+ sys-devel/bison
+ rclock_oncore? ( net-misc/pps-tools )
+ rclock_pps? ( net-misc/pps-tools )
+"
+
+WAF_BINARY="${S}/waf"
+
+pkg_setup() {
+ enewgroup ntp 123
+ enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+ default
+ # Remove autostripping of binaries
+ sed -i -e '/Strip binaries/d' wscript
+ python_copy_sources
+}
+
+src_configure() {
+ is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+
+ local string_127=""
+ local rclocks="";
+ local CLOCKSTRING=""
+
+ for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+ if use rclock_${refclock} ; then
+ string_127+="$refclock,"
+ fi
+ done
+ CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+ local myconf=(
+ --nopyc
+ --nopyo
+ --refclock="${CLOCKSTRING}"
+ $(use doc && echo "--enable-doc")
+ $(use early && echo "--enable-early-droproot")
+ $(use gdb && echo "--enable-debug-gdb")
+ $(use nist && echo "--enable-lockclock")
+ $(use samba && echo "--enable-mssntp")
+ $(use seccomp && echo "--enable-seccomp")
+ $(use smear && echo "--enable-leap-smear")
+ $(use tests && echo "--alltests")
+ $(use debug && echo "--enable-debug")
+ )
+
+ python_configure() {
+ waf-utils_src_configure "${myconf[@]}"
+ }
+ python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+ unset MAKEOPTS
+ python_compile() {
+ waf-utils_src_compile
+ }
+ python_foreach_impl run_in_build_dir python_compile
+}
+
+src_install() {
+ python_install() {
+ waf-utils_src_install
+ }
+ python_foreach_impl run_in_build_dir python_install
+
+ # Install heat generating scripts
+ use heat && dosbin "${S}"/contrib/ntpheat{,usb}
+
+ # Install the openrc files
+ newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
+ newconfd "${FILESDIR}"/ntpd.confd ntp
+
+ # Install the systemd unit file
+ systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
+
+ # Prepare a directory for the ntp.drift file
+ mkdir -pv "${ED}"/var/lib/ntp
+ chown ntp:ntp "${ED}"/var/lib/ntp
+ chmod 770 "${ED}"/var/lib/ntp
+ keepdir /var/lib/ntp
+
+ # Install a log rotate script
+ mkdir -pv "${ED}"/etc/logrotate.d
+ cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
+
+ # Install the configuration file and sample configuration
+ cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
+ cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+}
+
+pkg_postinst() {
+ einfo "If you want to serve time on your local network, then"
+ einfo "you should disable all the ref_clocks unless you have"
+ einfo "one and can get stable time from it. Feel free to try"
+ einfo "it but PPS probably won't work unless you have a UART"
+ einfo "GPS that actually provides PPS messages."
+}
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index a4689a76e05b..680e3dcba1d5 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -66,6 +66,8 @@ pkg_setup() {
src_prepare() {
default
+ # Remove autostripping of binaries
+ sed -i -e '/Strip binaries/d' wscript
python_copy_sources
}
@@ -83,9 +85,6 @@ src_configure() {
done
CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
- # Remove autostripping of binaries
- sed -i -e '/Strip binaries/d' wscript
-
local myconf=(
--nopyc
--nopyo
@@ -135,6 +134,7 @@ src_install() {
mkdir -pv "${ED}"/var/lib/ntp
chown ntp:ntp "${ED}"/var/lib/ntp
chmod 770 "${ED}"/var/lib/ntp
+ keepdir /var/lib/ntp
# Install a log rotate script
mkdir -pv "${ED}"/etc/logrotate.d
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index f37cddb096ae..d337169dc63d 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -28,16 +28,16 @@ DIST openssh-7.6_p1-sctp.patch.xz 6996 BLAKE2B 4a857afdc8fa5cb2bfb9dd1805ac6343e
DIST openssh-7.6p1+x509-11.2.diff.gz 466657 BLAKE2B 3f4f108e2d97eb292c215bc3a6e2c64ae6b9e49704f46f46a21496a71d5ebd051ab648446bf71ef141e2114f4a03363d8cd043f5813f957c2c5f2e2eb193931d SHA512 1c0fea91037bfcaed7aa3f0cb01d262410a99d3e1b98a25a012db5d683f3275ab52f78f1e446bd7e543c78f9d406b1dce2bb3997214534ae94e11c254658080f
DIST openssh-7.6p1-hpnssh14v12-r1.tar.xz 15440 BLAKE2B e140852a3ce63e4f744ed4b18b474cf88d09ca55509e5a16d26eef5cf8574466b472073eef56e19467932959d9ba7e941ab561d9ea0704dfee3fd08a6ba7ba8c SHA512 9d0450ec99fe550d790e471cb7815d0863788cf9c41dfef653d102f02be3d38a09e5103e537658279216a5815c1a075ded9f011e05ce216beee2c7daeea8c75a
DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c526e354a7d344a08742cb70ab1f4a41d325b31720f2fba5c4afa4db11f3fc87055c8c9c8bea37b29cc11dc8f39 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72
-DIST openssh-7.7p1-hpnssh14v15-gentoo1.patch.xz 22060 BLAKE2B 81a7f3d1346718c154b39920c126eb0b00ae43f1369d882b8a1bd0b885668805639d869581fb49a8e7c67b61d72a904fde45841e4396af426b136d6d2f0a0dc3 SHA512 7b437bc061677aeabe561ad74bb19bc6f85369119ad8a92fb430fb5c1394c2bb3afd472ee66b285362b2041f871c56633dc94fec33cb062c6b1817d63c1d4a78
+DIST openssh-7.7p1-hpnssh14v15-gentoo2.patch.xz 22060 BLAKE2B 9ee654f689d4b90bd0fe4f71d57b4a8d9d957012be3a23ff2baa6c45ae99e2f1e4daf5de24479a6a3eb761ee6847deb3c6c3021d4cbabc9089f605d8d7270efc SHA512 856d28ac89c14d01c40c7d7e93cfaebd74b091188b5b469550eb62aa5445177aec1a5f47c1e2f7173013712e98e5f9f5e46bbb3dbd4ec7c5ee8256ef45cda0f8
DIST openssh-7.7p1-ldap-20180327.patch.xz 19760 BLAKE2B f316ea65de3415b9ee19a621f36c5ce7e4bda7e1fe06e9edbc1e96e9d7296facf1a59dc79822939035c333a07b04a21d33c116fb74f36f1a93ac6849a4182166 SHA512 6439057839341169f9a198b25fdcbbddd50b0db0834aa762c16fb9b9b2e6b95b4ee9b4c6ad1cf2723750aacded4e6cba7f6036cdd91cf8d5e88eb21ea83790dd
DIST openssh-7.7p1-patches-1.1.tar.xz 16476 BLAKE2B fca2885a9e29faec40700ece37a995ba83e40bd2a6875129a5327770d8ee43663a7c063de33b4653994ed7332adb03730f613c047550d874190b95c66e2e9efa SHA512 aa5e33ce4bb4be16abf27ac1bade1dc85c51d82002be546402e0b8b0685de3ec7029f0f56bf1295ec346eb3960a6bed7cfc882722e57957a19a732f3174b3039
-DIST openssh-7.7p1-sctp-1.0.patch.xz 7380 BLAKE2B 6ad40972ece131ff148ede6ba94d63bffc606e0bcabb959d4c9056196cb6f4fddc285f97d7b49b73fde7ee84e3c981c07bddb058ad88eb7c7c2fe716e657c630 SHA512 bc5f50805ba25415f93f61b6654e5bcbaef673b0af48d339116ca9c94b6152afae294c5a9144adeb40190da97c2fc73b43e3ac7ac34feb4a647628327a7cac0a
+DIST openssh-7.7p1-sctp-1.1.patch.xz 7548 BLAKE2B 3b960c2377351955007005de560c2a3e8d0d059a0435e5beda14c63e444dad8b4357edaccd1cfe446c6268514f152b2bcfa7fa3612f1ae1324a31fecb0e85ac5 SHA512 093605865262a2b972db8c92990a49ed6178ed4567fb2626518c826c8472553d9be99a9e6052a6f5e545d81867b4118e9fd8a2c0c26a2739f1720b0f13282cba
DIST openssh-7.7p1-x509-11.3.1.patch.xz 362672 BLAKE2B 55b8b0ef00dc4d962a0db1115406b7b1e84110870c74198e9e4cb081b2ffde8daca67cb281c69d73b4c5cbffde361429d62634be194b57e888a0b434a0f42a37 SHA512 f84744f6d2e5a15017bce37bfa65ebb47dbafeac07ea9aab46bdc780b4062ff70687512d9d512cab81e3b9c701adb6ce17c5474f35cb4b49f57db2e2d45ac9ac
DIST openssh-7.7p1.tar.gz 1536900 BLAKE2B 7aee360f2cea5bfa3f8426fcbd66fde2568f05f9c8e623326b60f03b7c5f8abf223e178aa1d5958015b51627565bf5b1ace35b57f309638c908f5a7bf5500d21 SHA512 597252cb48209a0cb98ca1928a67e8d63e4275252f25bc37269204c108f034baade6ba0634e32ae63422fddd280f73096a6b31ad2f2e7a848dde75ca30e14261
DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e181b1d52b195e6adcd2a78d5c7bf57f33c8ed62c3affa434c8d31c07eae84b59f1a3968a3f2a92e702f9225b121127616cb9d61 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974
EBUILD openssh-7.5_p1-r4.ebuild 11184 BLAKE2B c6725a371359485803c89cb73b9efad9a69ed6255ff8f411574e218af71880c507567010a749c22bea5f1a12043acb01cbfe452e9aba50e0b508b737f7fb7576 SHA512 414033d873ea94e0a3f087a8739d4266bdb96b6e02702a0385f09911ee2c279666baa837048e825489478b7774126b1dafa48e1f354f50d0d6cfc73b446da286
EBUILD openssh-7.6_p1-r5.ebuild 11361 BLAKE2B e8f1c1c092beba9ded4301c500d85b25a06ffefd854e1142a0f60c3389aa648cee54b865c8f0ffbf3a45848e5c2f26b0bafd9f0d1e3a982db0a8dd0782cd6b69 SHA512 3389c069d119242c624ff93f6f2de1e74e582f761ccf810819d77035dc77273b87b036252c3daba824e38ad9ffa854dc1c0d8c259056cdabfcd40405c5d66072
-EBUILD openssh-7.7_p1-r100.ebuild 15950 BLAKE2B 3affcb3ffafa9acc8597d77d0cb0deb738e7b954abda30524b5b331de5dee3b2a3f4a12061bbbe9c467acc30d7fbe96267be0324875be7b2ef662fe52e5c5727 SHA512 c02ad19bafa70a55ca6d3484a6341efba7f71256fe2103ea48fc3e4de399307229aadd2a79b13ad53b9ed6b79cfdeb4f678c654cfbdb6f78bfc9cc54e7505ecb
-EBUILD openssh-7.7_p1-r4.ebuild 15636 BLAKE2B 214ea3d110b66919cd6a81927136cf059ea920a75f178b36f3de1468d177218e9af25f5c8cf100265baec50999e187ad63eeb13242fcc408beb4f9c5f6f5f1ef SHA512 48814f9719a2c799e731212dbc35a8712e7dc2ae6d859ad80270c0e5d4b45b8feaf5c24961e560958839626c9855508f7684a9897199b7485ba9c533c47bc697
+EBUILD openssh-7.7_p1-r101.ebuild 16048 BLAKE2B 67945733f1cb3c189b5105af90e658b42a181d2c5e25f0cafb421e538d772f36af02158c935ae28cc8d278a840e475d524fc77328c7f27a277bea04db7d97278 SHA512 e5e61f92022e26a9e7417ca6c4a53bb8bc81faa9cee64c4f291ef439b6972bcf4a4ca3790300405e77b1cfaf890c2465d19a644d835f603db27970cbfeab9dd1
+EBUILD openssh-7.7_p1-r5.ebuild 15733 BLAKE2B 664b64efcb66a0930f4e8e9e5b9b6a5d9eb1492019c4a1af6301bc2aceeae663516e3c4e6ba6995b455cc3c18110ebd708bb054f466bb06052bb5b5a14e9f23d SHA512 8577aaeac535d3f4e57f1b6e76b0f703347990305ff61b2551b4473885c5e53cd9b03b278dc18339c5184cae2ff99e7804487e03bcc67d1b9e58aeab9c35ebe3
MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-7.7_p1-r100.ebuild b/net-misc/openssh/openssh-7.7_p1-r101.ebuild
index 8aa36a58819a..d330358e032d 100644
--- a/net-misc/openssh/openssh-7.7_p1-r100.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r101.ebuild
@@ -9,8 +9,8 @@ inherit user flag-o-matic multilib autotools pam systemd versionator
# and _p? releases.
PARCH=${P/_}
-HPN_VER="14v15-gentoo1" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz"
-SCTP_VER="1.0" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+HPN_VER="14v15-gentoo2" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz"
+SCTP_VER="1.1" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
X509_VER="11.3.1" X509_PATCH="${PARCH}-x509-${X509_VER}.patch.xz"
LDAP_VER="20180327" LDAP_PATCH="${PARCH}-ldap-${LDAP_VER}.patch.xz"
@@ -191,7 +191,7 @@ src_prepare() {
einfo "Disabling known non-working MT AES cipher per default ..."
cat > "${T}"/disable_mtaes.conf <<- EOF
-
+
# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
# and therefore disabled per default.
DisableMTAES yes
@@ -328,40 +328,48 @@ src_test() {
[[ ${#failed[@]} -gt 0 ]] && die "Some tests failed: ${failed[*]}"
}
-src_install() {
- emake install-nokeys DESTDIR="${D}"
- fperms 600 /etc/ssh/sshd_config
- dobin contrib/ssh-copy-id
- newinitd "${FILESDIR}"/sshd.rc6.5 sshd
- newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
- newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
- if use pam ; then
- sed -i \
- -e "/^#UsePAM /s:.*:UsePAM yes:" \
- -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
- -e "/^#PrintMotd /s:.*:PrintMotd no:" \
- -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
- "${ED%/}"/etc/ssh/sshd_config || die
- fi
-
- # Gentoo tweaks to default config files
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+ # First the server config.
cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config
# Allow client to pass locale environment variables #367017
AcceptEnv LANG LC_*
EOF
+
+ # Then the client config.
cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config
# Send locale environment variables #367017
SendEnv LANG LC_*
EOF
+ if use pam ; then
+ sed -i \
+ -e "/^#UsePAM /s:.*:UsePAM yes:" \
+ -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+ -e "/^#PrintMotd /s:.*:PrintMotd no:" \
+ -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+ "${ED%/}"/etc/ssh/sshd_config || die
+ fi
+
if use livecd ; then
sed -i \
-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
"${ED%/}"/etc/ssh/sshd_config || die
fi
+}
+
+src_install() {
+ emake install-nokeys DESTDIR="${D}"
+ fperms 600 /etc/ssh/sshd_config
+ dobin contrib/ssh-copy-id
+ newinitd "${FILESDIR}"/sshd.rc6.5 sshd
+ newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+ newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+
+ tweak_ssh_configs
if use ldap && [[ -n ${LDAP_PATCH} ]] ; then
insinto /etc/openldap/schema/
diff --git a/net-misc/openssh/openssh-7.7_p1-r4.ebuild b/net-misc/openssh/openssh-7.7_p1-r5.ebuild
index d48f83135200..225b5cc04f02 100644
--- a/net-misc/openssh/openssh-7.7_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r5.ebuild
@@ -9,8 +9,8 @@ inherit user flag-o-matic multilib autotools pam systemd versionator
# and _p? releases.
PARCH=${P/_}
-HPN_VER="14v15-gentoo1" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz"
-SCTP_VER="1.0" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+HPN_VER="14v15-gentoo2" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz"
+SCTP_VER="1.1" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
X509_VER="11.3.1" X509_PATCH="${PARCH}-x509-${X509_VER}.patch.xz"
# Disable LDAP support until someone will rewrite the patch,
@@ -31,7 +31,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Probably want to drop ssl defaulting to on in a future version.
IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
REQUIRED_USE="ldns? ( ssl )
@@ -191,7 +191,7 @@ src_prepare() {
einfo "Disabling known non-working MT AES cipher per default ..."
cat > "${T}"/disable_mtaes.conf <<- EOF
-
+
# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
# and therefore disabled per default.
DisableMTAES yes
@@ -328,40 +328,48 @@ src_test() {
[[ ${#failed[@]} -gt 0 ]] && die "Some tests failed: ${failed[*]}"
}
-src_install() {
- emake install-nokeys DESTDIR="${D}"
- fperms 600 /etc/ssh/sshd_config
- dobin contrib/ssh-copy-id
- newinitd "${FILESDIR}"/sshd.rc6.5 sshd
- newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
- newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
- if use pam ; then
- sed -i \
- -e "/^#UsePAM /s:.*:UsePAM yes:" \
- -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
- -e "/^#PrintMotd /s:.*:PrintMotd no:" \
- -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
- "${ED%/}"/etc/ssh/sshd_config || die
- fi
-
- # Gentoo tweaks to default config files
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+ # First the server config.
cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config
# Allow client to pass locale environment variables #367017
AcceptEnv LANG LC_*
EOF
+
+ # Then the client config.
cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config
# Send locale environment variables #367017
SendEnv LANG LC_*
EOF
+ if use pam ; then
+ sed -i \
+ -e "/^#UsePAM /s:.*:UsePAM yes:" \
+ -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+ -e "/^#PrintMotd /s:.*:PrintMotd no:" \
+ -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+ "${ED%/}"/etc/ssh/sshd_config || die
+ fi
+
if use livecd ; then
sed -i \
-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
"${ED%/}"/etc/ssh/sshd_config || die
fi
+}
+
+src_install() {
+ emake install-nokeys DESTDIR="${D}"
+ fperms 600 /etc/ssh/sshd_config
+ dobin contrib/ssh-copy-id
+ newinitd "${FILESDIR}"/sshd.rc6.5 sshd
+ newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+ newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+
+ tweak_ssh_configs
if use ldap && [[ -n ${LDAP_PATCH} ]] ; then
insinto /etc/openldap/schema/
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 7c4394bf4228..c6cc6a39d6a9 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -13,7 +13,7 @@ DIST stunnel-5.45.tar.gz 706423 BLAKE2B 81c5355419de3b0bc88d59ea8c98d1a4523d7a1a
DIST stunnel-5.46.tar.gz 706499 BLAKE2B 6ece93015b2a59ec17fa60505bccb5e4444879d44fa0cea6e838aa56d178f61f26b8b9b469d8bf2991d4c094fd824eaed2b5214184f6a15e0c415c53b6f7d136 SHA512 2000e36d4d011a83e47afcaf19473e083da010d7b3909cb831c51975512257888615b5d64f4a4d78f48529d68c6740ea2be7f7935b0ab86de4535e290f78cc97
EBUILD stunnel-5.36.ebuild 2899 BLAKE2B a4c62a1a79157b5b24a8904dacbe45a44b22b53710b44a5bb5c3823e29df666024e8300d82cc6fc5e52a9f8cedad0beaaadc5ee4bec4d366f2544587009c73db SHA512 ffeac1d20a4a83fcda56ae36b81e7a230ae18ad786fdbd51024b0f87b013c9988538cb92d8757869b3337fc78cf25e605fa31fe3d54b437df59c3f1d4a8ec595
EBUILD stunnel-5.40.ebuild 2930 BLAKE2B b18d32b276cb28e83b8f99b5c495c929c3c6ddff54a7580be3387aa4d5e114feed917bdf4a7faa4136850cdea0ba019fdc3c86fb28268f23f23a125ceb7b896e SHA512 6034f34af01ed21b16474f1ec4a76249d9ee2f14e4312ecf8d7cb75f66f49e9e641328fa4904cc9adec6d9cb480e63187ed9bb9a6263846ef2eaf7a2d8f3eb20
-EBUILD stunnel-5.43.ebuild 2927 BLAKE2B a3a72f3fb99e44467e97b726769a668769bb57c971f415dd1adf6d61b8ea20015b639dddb7f048279a574bc83bf28ac6809471f98315e3455a3f6a68deeccfd4 SHA512 2c69dd162ddc2474117a2d9aaeecd52c2efb08a134f8e7e052de4710bf172dff749033a87844392d48d644c4d2d702aba10a43592deb3e83c96ca55c001f1f5e
+EBUILD stunnel-5.43.ebuild 2926 BLAKE2B 7481516e075b1a5f2b9483c17f62262016c543de7b5c088d884bccbca16606af6ad0c01f3d508e995927f43960cf9526dc5e80979ccc1384240ace0bd2984eaf SHA512 a38c2c7c96ba55466739316e2bbd6a428cb7e21005472ae6ab39e2b144dbdfc59371e988772c6fe1624e8e39db7b67eec8f486fb8fa7a69ea259f04a170b44be
EBUILD stunnel-5.44.ebuild 2930 BLAKE2B 2f027288047c1efa62cbcff7869b492422b925576e2f672a851f8c101de4c9a8dbe87d6746050eb5d6115ccaab81c5006b5ee046b3356cf161142c99c6ee6372 SHA512 af327981e004f8a56473fcfa88d8f5027991461a6ffc791db6a840919513dd0e0d3de47828e7a4d6425bef432b76d2d8a05b3a6ab742668e5da4051d44aead7d
EBUILD stunnel-5.45.ebuild 2930 BLAKE2B 95ade179eb9d81e66ea6fe7523a299c8e6dd58d43867568b8e22d22125f6a6111d1f8b988df153cb438afba2736db811507d87acf0f2b5b00469904c12657f34 SHA512 c8fca15345e1a955af0824d847dc0e06a220da7dcdff9a5144e567f54ea7e6c36a14d74fb407b5981249c3076811e7da2fcb668855cdcbca019aa27e464c9229
EBUILD stunnel-5.46.ebuild 2930 BLAKE2B 95ade179eb9d81e66ea6fe7523a299c8e6dd58d43867568b8e22d22125f6a6111d1f8b988df153cb438afba2736db811507d87acf0f2b5b00469904c12657f34 SHA512 c8fca15345e1a955af0824d847dc0e06a220da7dcdff9a5144e567f54ea7e6c36a14d74fb407b5981249c3076811e7da2fcb668855cdcbca019aa27e464c9229
diff --git a/net-misc/stunnel/stunnel-5.43.ebuild b/net-misc/stunnel/stunnel-5.43.ebuild
index e2b98da467ac..8e839a315575 100644
--- a/net-misc/stunnel/stunnel-5.43.ebuild
+++ b/net-misc/stunnel/stunnel-5.43.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="ipv6 libressl selinux stunnel3 tcpd"
DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 007c21a9b884..afacfacb73e4 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,8 @@
DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2018.06.04.tar.gz 2972929 BLAKE2B 77f1ef9b869ea1b3b98d4deb064d959d3d05ae1732c2277cb5e2143025efb91196d2acd446f24ddd7aafbbe7275c066fa6a032d4a57930b62fb9fbb95ca45e29 SHA512 f354cfc77c6532926bf2a20a47a4b603bdf81a2a15997f493785e76eb0688f13ec3d4b3217f7d6b02d9a83366fbd31d5be6f579551bb179ab6008b85ec3675b0
DIST youtube-dl-2018.06.11.tar.gz 2975160 BLAKE2B 71370535655385fc52f6b1eca19aed61dea239ae4d58a37166b8a0854a363b59ea1a3599952d89e5c41862f89a685b419834e360ad57b55ef3103fd1fb84f337 SHA512 fb11d9a5302f60562ed537cfff9a4c4dfa89665acdf8f19fe24dac0b0ebb1a5bb3c60b5a01efa42f738f611be5cc9fce43f952f2da057989105a7603c9a17a03
+DIST youtube-dl-2018.06.19.tar.gz 2989121 BLAKE2B 17fd6b6adc3235fabb34dc74e30dfc23775fabdf62550184f42b4c298ad6ac88c28aeccaf65a3791fa5d0f1be6ccecee4b56c35fc0bd087852742f3c98ed6f39 SHA512 04c8273afd363a7a9719b59e7f61d416b8b627a69f6eb28d5551cc81e105e002d20071b8eed32e83d3cd3f16280fe8401a2e53394b3b99abe45659444c8037c2
EBUILD youtube-dl-2017.11.15.ebuild 2376 BLAKE2B 184105b328f74b20fbb61357b33aeff4b3d4a984179398c9ebbd67a3973a0e0730b98e3414e52d7cf89c7bb15340491d110dc0480b033d4c49714c0cd3ff387c SHA512 baefa087e59c737053e923f7a384ab22ba727f3b9ffd02fad2d80d0fea957babe2ca40f19889eabbf4237416df9cdacfe4b5df2b106a3a7dd4fe1aed9c62a49f
-EBUILD youtube-dl-2018.06.04.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
EBUILD youtube-dl-2018.06.11.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
+EBUILD youtube-dl-2018.06.19.ebuild 3291 BLAKE2B f8333e3a08fa02124c38adc08986a9cae6b58e5bd9d881e9b93e23c03f64e5f80df6ae90b1ae9f0cd0061f0296a12e7c74e878284be274f7eb5732928c0534a0 SHA512 73bcd09adad379e668f2046b7c7e6f7dbac936c073de7e722f135f0222ca3d7eedc7ae05fbbae4deb69ba97a78f6e6d7e18b12f884cd2955b2d7ab57c6c8d036
EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.06.04.ebuild b/net-misc/youtube-dl/youtube-dl-2018.06.19.ebuild
index 37bffad45c8e..37bffad45c8e 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.06.04.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.06.19.ebuild