diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/dnsmasq-2.66 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/dnsmasq-2.66 deleted file mode 100644 index 34c1436bb1..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/dnsmasq-2.66 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup -DEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua ) conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) ) nls? ( sys-devel/gettext net-dns/libidn ) virtual/pkgconfig app-arch/xz-utils virtual/pkgconfig -DESCRIPTION=Small forwarding DNS server -EAPI=5 -HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/ -IUSE=auth-dns conntrack dbus +dhcp dhcp-tools idn ipv6 lua nls script selinux tftp linguas_de linguas_es linguas_fi linguas_fr linguas_id linguas_it linguas_no linguas_pl linguas_pt_BR linguas_ro -KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd -LICENSE=|| ( GPL-2 GPL-3 ) -RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua ) conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) ) nls? ( sys-devel/gettext net-dns/libidn ) selinux? ( sec-policy/selinux-dnsmasq ) -REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) s390? ( !conntrack ) -SLOT=0 -SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.66.tar.xz -_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 -_md5_=9026671cbf2678ba4fb17cd930836c0d diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/dnsmasq-2.72-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/dnsmasq-2.72-r2 deleted file mode 100644 index 8ca8e4e9eb..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/dnsmasq-2.72-r2 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup -DEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( || ( dev-lang/lua:0 dev-lang/lua:5.1 ) ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext net-dns/libidn ) app-arch/xz-utils dnssec? ( dev-libs/nettle[gmp] static? ( dev-libs/nettle[static-libs(+)] ) ) virtual/pkgconfig virtual/pkgconfig -DESCRIPTION=Small forwarding DNS server -EAPI=5 -HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html -IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn ipv6 lua nls script selinux static tftp linguas_de linguas_es linguas_fi linguas_fr linguas_id linguas_it linguas_no linguas_pl linguas_pt_BR linguas_ro -KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd -LICENSE=|| ( GPL-2 GPL-3 ) -RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( || ( dev-lang/lua:0 dev-lang/lua:5.1 ) ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext net-dns/libidn ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq ) -REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) -SLOT=0 -SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.72.tar.xz -_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 -_md5_=02ab2e68b6ed8d15302a940acdaf0b1c diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/dnsmasq-2.75 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/dnsmasq-2.75 index 13a240a785..6992e09aee 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/dnsmasq-2.75 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/dnsmasq-2.75 @@ -4,11 +4,11 @@ DESCRIPTION=Small forwarding DNS server EAPI=5 HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp linguas_de linguas_es linguas_fi linguas_fr linguas_id linguas_it linguas_no linguas_pl linguas_pt_BR linguas_ro -KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd +KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd LICENSE=|| ( GPL-2 GPL-3 ) RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext net-dns/libidn ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq ) REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) SLOT=0 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.75.tar.xz _eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 -_md5_=57dc4dfb84243ad70d7f837fe563207f +_md5_=b13cb371d1dcb556c48d955dd8cc7bcb diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/dnsmasq-2.76 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/dnsmasq-2.76 new file mode 100644 index 0000000000..1728f192d8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-dns/dnsmasq-2.76 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup +DEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext net-dns/libidn ) app-arch/xz-utils dnssec? ( dev-libs/nettle[gmp] static? ( dev-libs/nettle[static-libs(+)] ) ) virtual/pkgconfig virtual/pkgconfig +DESCRIPTION=Small forwarding DNS server +EAPI=6 +HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html +IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp linguas_de linguas_es linguas_fi linguas_fr linguas_id linguas_it linguas_no linguas_pl linguas_pt_BR linguas_ro +KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd +LICENSE=|| ( GPL-2 GPL-3 ) +RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext net-dns/libidn ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq ) +REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) +SLOT=0 +SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.76.tar.xz +_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 +_md5_=d31ee11b2d2cc0f5ac7652f96591e4fd diff --git a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/ChangeLog b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/ChangeLog index 5c2a87eac7..07a0dfb0a5 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/ChangeLog @@ -137,3 +137,65 @@ files/dnsmasq-init-dhcp-r1, files/dnsmasq-init-r2: use #!/sbin/openrc-run instead of #!/sbin/runscript + 26 May 2016; Tobias Klausmann dnsmasq-2.75.ebuild: + 2.75-r0: add alpha keyword + + Gentoo-Bug: 575674 + + Package-Manager: portage-2.3.0_rc1 + +*dnsmasq-2.76 (31 May 2016) + + 31 May 2016; Patrick McLean +dnsmasq-2.76.ebuild: + Version bump to 2.76, port to EAPI=6 + + Package-Manager: portage-2.3.0_rc1 + + 31 May 2016; Patrick McLean -dnsmasq-2.66.ebuild, + -dnsmasq-2.72-r2.ebuild, -files/dnsmasq-2.47-fbsd-config.patch, + -files/dnsmasq-2.66-dhcp-option-zero.patch, -files/dnsmasq-2.72-Fix-crash-ca + used-by-looking-up-servers.bind-when-many-servers-defined.patch, -files/dnsm + asq-2.72-Fix-crash-on-receipt-of-certain-malformed-DNS-requests.patch, + -files/dnsmasq.service: + Clean out old versions + + Package-Manager: portage-2.3.0_rc1 + + 03 Jun 2016; Patrick McLean dnsmasq-2.76.ebuild: + Fix for building with USE=dhcp-tools (bug #584700) + + Package-Manager: portage-2.3.0_rc1 + + 02 Jul 2016; Agostino Sarubbo dnsmasq-2.76.ebuild: + amd64 stable wrt bug #585280 + + Package-Manager: portage-2.2.28 + RepoMan-Options: --include-arches="amd64" + Signed-off-by: Agostino Sarubbo + + 02 Jul 2016; Agostino Sarubbo dnsmasq-2.76.ebuild: + x86 stable wrt bug #585280 + + Package-Manager: portage-2.2.28 + RepoMan-Options: --include-arches="x86" + Signed-off-by: Agostino Sarubbo + + 03 Jul 2016; Jeroen Roovers dnsmasq-2.76.ebuild: + Stable for HPPA PPC64 (bug #585280). + + Package-Manager: portage-2.3.0 + RepoMan-Options: --ignore-arches + + 04 Jul 2016; Tobias Klausmann dnsmasq-2.76.ebuild: + 2.76-r0: add alpha keyword + + Gentoo-Bug: 585280 + + Package-Manager: portage-2.3.0 + + 05 Jul 2016; Markus Meier dnsmasq-2.76.ebuild: + arm stable, bug #585280 + + Package-Manager: portage-2.3.0 + RepoMan-Options: --include-arches="arm" + diff --git a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/Manifest b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/Manifest index 8ca055e85f..a361674f3e 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/Manifest @@ -1,18 +1,11 @@ -AUX dnsmasq-2.47-fbsd-config.patch 505 SHA256 4e05e46b59254e718550cda505986b9b572a0716636fb6a5405a54df25cfa84a SHA512 9d2476c60b87f4515473e5b790ca3c6dd96105ecbda55fa385ce88290acbe8a16b6c48f9a6cbcc535662765aa4f07d182c0f5ebb4ffff1c98bb0cf6a8f4dd528 WHIRLPOOL e314020c11bc902f1dc29464785098ef0d10ebf14d8092fc1b8b673cea3d64e5212f82b85597ffe2d2bc150fbf51f27f560744a7ea12f2359c698e5ca80898cb -AUX dnsmasq-2.66-dhcp-option-zero.patch 4084 SHA256 8d51ddd44560ef96a2e880997e8d337ed9c8aff0747e22b82444f87aed3d6ac4 SHA512 afee1cbed8fdb64cf73e92e68ed051433ee00adcce279826b251dcebd0fbb5b8044aff95da6d5bd544034f7797330321eb2339347409b75baf0ab1133358b33b WHIRLPOOL a222586e7e64707e57dfd80ba509d28a3f9031d58ede163fa5e95ace6a1b9f8db5ca9c5f32e8515c9851627a23490291d37097c230ba89fbfddb9469061ea011 -AUX dnsmasq-2.72-Fix-crash-caused-by-looking-up-servers.bind-when-many-servers-defined.patch 1065 SHA256 5a7f3d0ce4cd97a65337ba5cc80136bff7ece204518d6bc956ab28845ca84178 SHA512 36c2195575fa91b91283bba5a3c04171aa42fe5fcaaeb4dc57387a4f9b514e5dfbb078a17866eed85b8abe2b819788f7d859cb8ef6107bb7212bb32e6f4fe032 WHIRLPOOL 067b7ea7d8394bf83076600215f8111f749cd2e42b121e2aa9edec36abdad1caebd1eebb6a7faa503ebcc81f83fad3fb85d483a80720d40360095322179c6608 -AUX dnsmasq-2.72-Fix-crash-on-receipt-of-certain-malformed-DNS-requests.patch 1528 SHA256 255e94a6cf3b6648431525c0a4df3cc713306dce955e2963eb4bb7a82dd67e28 SHA512 b5fc92b8a1da037146c9d5a6b57fc2f1b77dd4f643409575896a07939b4d694001198332fa75271bb59e6d46786619aeab82e6fc20e3e1aecd2a49e980674f24 WHIRLPOOL e1500564a2b2ed94adc22f1a9c99c9d648eba578ea6c156fa56a61395a39ef50ffaa5e35df581891004d86ffdde4b9471af4c71850f8981032fc87b7d5b93224 AUX dnsmasq-init-dhcp-r1 600 SHA256 4790cac7dc84dabe25c7c6a3b1dd00d3794c3b8659530f667559b3312eee4971 SHA512 bfc672b7e58f98401cd28d4a38e908f61bca1f2fa90a704a48af0176c707b975c044c67f137257a76aa2424e8a722e8fa8edeab2b8a96b452f076c95efa4a733 WHIRLPOOL 0bbdffd129d168974b1f373c8ac9e2157332a4a4631d4e7483173022adcd27351cd9fccf2a0d0e8fc907c1f13f9ff9c2773ffb4095fd5fdc41ebb951cd60dc64 AUX dnsmasq-init-r2 489 SHA256 10dbecd726998bcc475ecfba43640f23ef43c74ebbfbfb53a5c85258ee60133b SHA512 76373b51e9a32ce8806b2b28be3fa6e6cd814f14e197a0e535529c56c356be70d5204537eaea29219f5d0ea0415f0bf82921e36bbe8e876ed6d9dc155c892ae8 WHIRLPOOL 85c75435e604189eb5b1164365bd38b458dd457027f8bbfb3ffbdf837272113e73b2aeb21d24d2b900283e8d7e09ecc71b87dfb5272c0fe4a47704f5e726a968 AUX dnsmasq.confd-r1 170 SHA256 51c0672a70d5d6793d295d82db666d372fb081e8627318f67c88e48d08d254b5 SHA512 9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 WHIRLPOOL 86f364adcb5576bfb2cc84d13dd087bef987cae70eee1ae7816f0febc58ec637a97fea357c506456781eab116e257d06b1e45f7e2bbd81849251c15067a347ab -AUX dnsmasq.service 278 SHA256 2cca1e7ec70aee80c9d1f59e7f17b515e5fa66b08835ed0fddbe799d2b39db04 SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1 WHIRLPOOL efbb77d8a3ec69bd030f219ffb975ec0a5680f0d4da8b05bbb896db26c444c861fb47d96dfe8201f21acf5085fb465892ef33263de677390308b2328a8a7e33e AUX dnsmasq.service-r1 278 SHA256 2cca1e7ec70aee80c9d1f59e7f17b515e5fa66b08835ed0fddbe799d2b39db04 SHA512 3571417b23071d9c3cfaf6d00363adb2cb011d04f1ed38631ddecd6eaa2c9ed37e1435a1fd32c40b0de43b0a84dd1ac8691a0a29493b391bafbb843d581bafc1 WHIRLPOOL efbb77d8a3ec69bd030f219ffb975ec0a5680f0d4da8b05bbb896db26c444c861fb47d96dfe8201f21acf5085fb465892ef33263de677390308b2328a8a7e33e -DIST dnsmasq-2.66.tar.xz 401056 SHA256 5e143947527bcdc46a30f4b1bbdfbfa96333dd98bcecdac3b5b1d6cacfe06c75 SHA512 f0bde09f178ca15f4c28efb06901213af9a009b4476daa8a08bafc7682b9ffed13ac65c5c232acdf828382f321137de08b4a33108d22613b198fe30695b3362c WHIRLPOOL e749d24017c35fdbaaaf417decdf9316e235cf7f96f031caceee14d06b982c285b0e561f50597cd12b6a31ef554f7f2e22ca6234f44a6d8bb066dede99461166 -DIST dnsmasq-2.72.tar.xz 454048 SHA256 7d0bd23f5d74b3a6b26a75d5ffcf9db81d461b47cbe578cb65a83a98008600b1 SHA512 d84b89c987966a5f5880aa329833626b0a017628dd6aa667bdad880d1c5f101a386dddb439eb6983d58952a36f25670bf58df94281b89320f02895a3e6af4cec WHIRLPOOL 491eadb0060f372a0b7f5855fb57040c4baf37352732a2943fb4173aa28e875b91537f87085201f13e76ec5680e4ad681992829a5cef800833be0911298a793c DIST dnsmasq-2.75.tar.xz 472484 SHA256 640c4e1d4c298e42458419cd78cfc26acc549401b1a34d271cd3e0e4226941f1 SHA512 dc6f64e8f04179bba4ceea5acbda4da27398e3e7a87f07ed645c383b0cccef416c438a859decff7be25849e28db9e53912693cdbf7f01ddd9bbf1d5e6ae2a8ec WHIRLPOOL ff2d0c2cb51cae6f2db09321c116003cdc512940001a839424a6ba1ba47deadfe412d01a0e68285250f7dbd9bef454c99e302805defc91783f703863c344b182 -EBUILD dnsmasq-2.66.ebuild 3171 SHA256 8170e3f88fc93507f0a73283000e12251a2f3a5afc04d3aa937cb88b1803ee9b SHA512 95f58784c5eaabc3e05f2e39cded2964201c0587c0d8fed23628b49b09bf09d8b429e5c4145658a5c915ee6b7ba0710cd5f977c5b44f6ab1f48166818fab0cdf WHIRLPOOL 00f573e0c36292d7de08ff3dcdbb1e1e82c1f820427530a87648deaad740e72c66fb99642db8e2f92b0b66b9daed26db789b8cc886b4abc0d3a559a3e6ef084e -EBUILD dnsmasq-2.72-r2.ebuild 4426 SHA256 9a787454796c5cedf7320e13bf6c93d33bd7fff3356c616c4eefb6b88a0680ad SHA512 1159151f2ddf7ff1a412146e0cbe6f1d318c8b343f581e02ce579076033e5c9c0a9ab4394d8717377df109085a33a6f9179c53c635fe9c05b312bc308add3ce3 WHIRLPOOL 4f3cb6c8d542e25b561399d66c7e26d2a36236249a0a5216782de452085c8611d2e534c46982eeeec86e55fefaf3eda3b0efa4723c493d5bb9b377d15f845c90 -EBUILD dnsmasq-2.75.ebuild 4315 SHA256 b4ebfc968c26a30bce80d5df1d06d1066e7ba49944bacb2e61131603a786d9de SHA512 3a0e1da790eff58c496caeb3f58e2c1c7561abddfd695b75dc4c17f81618271de103a26181e9cf2e6e11577a88a3812c047df8228e1ed3e6039ca189a751bc5f WHIRLPOOL 44f73b3c969bf79d9d4fd9b119f90bf7482467fb161005cc49a0529d6c02e5c1b83d3fe0ef5eace0ce1e86e9e8b6ad2067f5e96cee9dddebe47f596dbfc18692 -MISC ChangeLog 5176 SHA256 5977ff8ed1a6cf768b57bca991b3b2440f01d9d171339bec9485e4f7b65bf287 SHA512 630eca1527d8693fdad1b8798ef1b6f976e57a5bfa0c24c65f15b1c828c6c6f0a09ca7701b20d1eeae21d77471181368fccbbdfc1a0e3d333acf4e58b8cbd1f1 WHIRLPOOL a607d0ed998e9fdd85687335ffd21e3b06bd86b1494492f58c4e825fbf23f4b12250cb94a5d0b2cab09af5618cb60fd2ef5c1a80075536bf15fa459d766d37c3 +DIST dnsmasq-2.76.tar.xz 480796 SHA256 4b92698dee19ca0cb2a8f2e48f1d2dffd01a21eb15d1fbed4cf085630c8c9f96 SHA512 8a930f3e7cdc0c291ce89bea8128a4b8438b9aa9e660a2ac037e0baa4c5c74f4482a8f83b0410066a759444b3c4e1cf62a9beb625e38509690227996de10e06a WHIRLPOOL e0710f879fd6f8e27581b8c400704660941601cd2077f32d7c2b3f9791c6be8404469770e74f7e1a03880507a32a30c19b89f6a953a757ad01305f829448f0bc +EBUILD dnsmasq-2.75.ebuild 4314 SHA256 2daeec02bee084dd31c4595f0eb4de4347eea97626da16608019025b0aa8b4d2 SHA512 815eba04b88eec0bc8362ec6735002f447aa69cf0ffc164a1436645b6f48cf018c68770b0002a8f0defd2c0d940e61c7c3934eb3abe0bd4fb755b678dcc70e93 WHIRLPOOL 44483eea830022cde44f8503a88586d69b32a38148d7d25852c31608f6a02fe961af34479b6716eb4830d2594f1f8a3d9e932db1c9f66929ef4a71ff911cd28b +EBUILD dnsmasq-2.76.ebuild 4249 SHA256 f730ee4461b859137fa088c1512199f78a3362855e683dc9490339751de878b4 SHA512 5ddb9ce2293fddfb37734b89f37449bb01b54f16d552327c51a6d6f61ffd736ff176d815b324efd71a3a29dae3a11aabaa7d14d132b59ff891e1041c769cfe98 WHIRLPOOL 68488c337667c2f03e78412fdcbd32113f0fcb562ea8b0c236746f149351d5e9e14061c7760d02100c69886dc7a7341cc8f0bc9047c5cd5d4bee02a1c8bc80aa +MISC ChangeLog 7118 SHA256 7176bdc0d2e61bf25f5096be9bc0f879709d90747201484c181ef15a9d3470da SHA512 d128e8fe9de954c9bf25e2f517deaa73f9516a7f0e0594241478867c50d61ef1131963bc287e0e5ad3f552989942e57d36f417474b8d7689970310e248a76774 WHIRLPOOL 01ba868e94aed12d5d03759183e55025cfe0e35fdc67b8bcf1e532e35bceab41747ca8a08dd48139e9159acb5eea9af178dc9e2ee0c31f0a521b27f18daac5bb MISC ChangeLog-2015 38329 SHA256 cd8d8df7e7c362a1f284d2ef412c4d9352a472427f25a4ac677b8e3f6a7bfae0 SHA512 80d2755dc22f94c4b35ae57522bab311541c328c703f897dd2427a158d5faccb3d2f55b222129a300f2dbdb53fe899d0d18ae6fd599639f201311ff05028a056 WHIRLPOOL 629bc81f6d6413e1a581cd65a984fadf7f0002ad7cc9862490fdf8d9c4786ce2e71b9b60a8dc0677ad9d483027eac97ac28a7a86483fd870fbae7ee4ea019ee8 MISC metadata.xml 904 SHA256 51ec0ab397565ea7290c7dd8bc053acd07fcb6e3a352e143cae83c936fd21661 SHA512 acfbab68fc21e313ed93c90ecaf3e47d0200fb208214bf86151e8cf52d58c4493fbea2b250324820bab37189a7ee7a50d84a5917aff3e34fa798e360d7d465c9 WHIRLPOOL 5144a4730e2a74678db0cc2db46d75810896df90085bcd1abf79f69712ef29ec1e01fe1f575b478ccf3e30309e247ca1a07e173867716dfd8b602795da062650 diff --git a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.66.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.66.ebuild deleted file mode 100644 index a5dfba9bdd..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.66.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils toolchain-funcs flag-o-matic user systemd - -DESCRIPTION="Small forwarding DNS server" -HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/" -SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="auth-dns conntrack dbus +dhcp dhcp-tools idn ipv6 lua nls script selinux tftp" -DM_LINGUAS="de es fi fr id it no pl pt_BR ro" -for dm_lingua in ${DM_LINGUAS}; do - IUSE+=" linguas_${dm_lingua}" -done - -CDEPEND="dbus? ( sys-apps/dbus ) - idn? ( net-dns/libidn ) - lua? ( dev-lang/lua ) - conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) ) - nls? ( - sys-devel/gettext - net-dns/libidn - )" - -DEPEND="${CDEPEND} - virtual/pkgconfig - app-arch/xz-utils" - -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-dnsmasq )" - -REQUIRED_USE="dhcp-tools? ( dhcp ) - lua? ( script ) - s390? ( !conntrack )" - -use_have() { - local NO_ONLY="" - if [ $1 == '-n' ]; then - NO_ONLY=1 - shift - fi - - local UWORD=${2:-$1} - # Switch to ^^ when we switch to EAPI=6. - #UWORD=${UWORD^^} - UWORD=$(tr '[:lower:]' '[:upper:]' <<<"${UWORD}") - - if ! use ${1}; then - echo " -DNO_${UWORD}" - elif [ -z "${NO_ONLY}" ]; then - echo " -DHAVE_${UWORD}" - fi -} - -pkg_setup() { - enewgroup dnsmasq - enewuser dnsmasq -1 -1 /dev/null dnsmasq -} - -src_prepare() { - # dnsmasq on FreeBSD wants the config file in a silly location, this fixes - epatch "${FILESDIR}/${P}-dhcp-option-zero.patch" - sed -i -r 's:lua5.[0-9]+:lua:' Makefile -} - -src_configure() { - COPTS="$(use_have -n auth-dns auth)" - COPTS+="$(use_have conntrack)" - COPTS+="$(use_have dbus)" - COPTS+="$(use_have -n dhcp)" - COPTS+="$(use_have idn)" - COPTS+="$(use_have -n ipv6)" - COPTS+="$(use_have lua luascript)" - COPTS+="$(use_have -n script)" - COPTS+="$(use_have -n tftp)" - COPTS+="$(use ipv6 && use dhcp || echo " -DNO_DHCP6")" -} - -src_compile() { - emake \ - PREFIX=/usr \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - COPTS="${COPTS}" \ - CONFFILE="/etc/${PN}.conf" \ - all$(use nls && echo "-i18n") - - use dhcp-tools && emake -C contrib/wrt \ - PREFIX=/usr \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - all -} - -src_install() { - emake \ - PREFIX=/usr \ - MANDIR=/usr/share/man \ - DESTDIR="${D}" \ - install$(use nls && echo "-i18n") - - local lingua - for lingua in ${DM_LINGUAS}; do - use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua} - done - rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/ - - dodoc CHANGELOG CHANGELOG.archive FAQ - dodoc -r logo - - dodoc CHANGELOG FAQ - dohtml *.html - - newinitd "${FILESDIR}"/dnsmasq-init-r2 dnsmasq - newconfd "${FILESDIR}"/dnsmasq.confd-r1 dnsmasq - - insinto /etc - newins dnsmasq.conf.example dnsmasq.conf - - if use dbus; then - insinto /etc/dbus-1/system.d - doins dbus/dnsmasq.conf - fi - - if use dhcp-tools; then - dosbin contrib/wrt/{dhcp_release,dhcp_lease_time} - doman contrib/wrt/{dhcp_release,dhcp_lease_time}.1 - fi - - systemd_dounit "${FILESDIR}"/dnsmasq.service -} diff --git a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.75.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.75.ebuild index 3aa391cf0d..a788339817 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.75.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.75.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd" IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp" DM_LINGUAS="de es fi fr id it no pl pt_BR ro" for dm_lingua in ${DM_LINGUAS}; do diff --git a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.76.ebuild similarity index 81% rename from sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild rename to sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.76.ebuild index b119b064ce..082dfa6034 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.76.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit eutils toolchain-funcs flag-o-matic user systemd @@ -12,8 +12,8 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn ipv6 lua nls script selinux static tftp" +KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp" DM_LINGUAS="de es fi fr id it no pl pt_BR ro" for dm_lingua in ${DM_LINGUAS}; do IUSE+=" linguas_${dm_lingua}" @@ -21,12 +21,7 @@ done CDEPEND="dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) - lua? ( - || ( - dev-lang/lua:0 - dev-lang/lua:5.1 - ) - ) + lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext @@ -69,9 +64,7 @@ use_have() { shift while [[ ${uword} ]]; do - # Switch to ^^ when we switch to EAPI=6. - #uword=${uword^^} - uword=$(tr '[:lower:]' '[:upper:]' <<<"${uword}") + uword="${uword^^}" if ! use "${useflag}"; then echo -n " -DNO_${uword}" @@ -96,11 +89,10 @@ pkg_setup() { } src_prepare() { + default + sed -i -r 's:lua5.[0-9]+:lua:' Makefile sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example - - epatch "${FILESDIR}"/${P}-Fix-crash-on-receipt-of-certain-malformed-DNS-requests.patch - epatch "${FILESDIR}"/${P}-Fix-crash-caused-by-looking-up-servers.bind-when-many-servers-defined.patch } src_configure() { @@ -108,6 +100,7 @@ src_configure() { COPTS+="$(use_have conntrack)" COPTS+="$(use_have dbus)" COPTS+="$(use_have idn)" + COPTS+="$(use_have -n inotify)" COPTS+="$(use_have -n dhcp dhcp dhcp6)" COPTS+="$(use_have -n ipv6 ipv6 dhcp6)" COPTS+="$(use_have lua luascript)" @@ -120,6 +113,7 @@ src_configure() { src_compile() { emake \ PREFIX=/usr \ + MANDIR=/usr/share/man \ CC="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" \ @@ -127,8 +121,9 @@ src_compile() { CONFFILE="/etc/${PN}.conf" \ all$(use nls && echo "-i18n") - use dhcp-tools && emake -C contrib/wrt \ + use dhcp-tools && emake -C contrib/lease-tools \ PREFIX=/usr \ + MANDIR=/usr/share/man \ CC="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" \ @@ -140,6 +135,7 @@ src_install() { emake \ PREFIX=/usr \ MANDIR=/usr/share/man \ + COPTS="${COPTS}" \ DESTDIR="${D}" \ install$(use nls && echo "-i18n") @@ -151,8 +147,8 @@ src_install() { dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example dodoc -r logo - dodoc CHANGELOG FAQ - dohtml *.html + docinto html/ + dodoc *.html newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN} newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN} @@ -173,12 +169,11 @@ src_install() { fi if use dhcp-tools; then - dosbin contrib/wrt/{dhcp_release,dhcp_lease_time} - doman contrib/wrt/{dhcp_release,dhcp_lease_time}.1 + dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time} + doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1 fi systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service - } pkg_preinst() { diff --git a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq-2.47-fbsd-config.patch b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq-2.47-fbsd-config.patch deleted file mode 100644 index 38a3679bd2..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq-2.47-fbsd-config.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur dnsmasq-2.47.orig/src/config.h dnsmasq-2.47/src/config.h ---- dnsmasq-2.47.orig/src/config.h 2009-02-05 07:14:24.000000000 -0500 -+++ dnsmasq-2.47/src/config.h 2009-03-30 00:04:52.000000000 -0400 -@@ -50,11 +50,7 @@ - #endif - - #ifndef CONFFILE --# if defined(__FreeBSD__) --# define CONFFILE "/usr/local/etc/dnsmasq.conf" --# else --# define CONFFILE "/etc/dnsmasq.conf" --# endif -+# define CONFFILE "/etc/dnsmasq.conf" - #endif - - #define DEFLEASE 3600 /* default lease time, 1 hour */ diff --git a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq-2.66-dhcp-option-zero.patch b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq-2.66-dhcp-option-zero.patch deleted file mode 100644 index 6c52a533f1..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq-2.66-dhcp-option-zero.patch +++ /dev/null @@ -1,134 +0,0 @@ -commit bd08ae67f9a0cae2ce15be885254cad9449d4551 -Author: Simon Kelley -Date: Fri Apr 19 10:22:06 2013 +0100 - - Allow option number zero in encapsulated DHCP options. - -diff --git a/src/dhcp-common.c b/src/dhcp-common.c -index f4fd088..8de4268 100644 ---- a/src/dhcp-common.c -+++ b/src/dhcp-common.c -@@ -512,7 +512,7 @@ void display_opts6(void) - } - #endif - --u16 lookup_dhcp_opt(int prot, char *name) -+int lookup_dhcp_opt(int prot, char *name) - { - const struct opttab_t *t; - int i; -@@ -528,10 +528,10 @@ u16 lookup_dhcp_opt(int prot, char *name) - if (strcasecmp(t[i].name, name) == 0) - return t[i].val; - -- return 0; -+ return -1; - } - --u16 lookup_dhcp_len(int prot, u16 val) -+int lookup_dhcp_len(int prot, int val) - { - const struct opttab_t *t; - int i; -diff --git a/src/dnsmasq.h b/src/dnsmasq.h -index 69ae7a7..41e2798 100644 ---- a/src/dnsmasq.h -+++ b/src/dnsmasq.h -@@ -1216,8 +1216,8 @@ void log_tags(struct dhcp_netid *netid, u32 xid); - int match_bytes(struct dhcp_opt *o, unsigned char *p, int len); - void dhcp_update_configs(struct dhcp_config *configs); - void display_opts(void); --u16 lookup_dhcp_opt(int prot, char *name); --u16 lookup_dhcp_len(int prot, u16 val); -+int lookup_dhcp_opt(int prot, char *name); -+int lookup_dhcp_len(int prot, int val); - char *option_string(int prot, unsigned int opt, unsigned char *val, - int opt_len, char *buf, int buf_len); - #ifdef HAVE_LINUX_NETWORK -diff --git a/src/option.c b/src/option.c -index b2596ec..2a61017 100644 ---- a/src/option.c -+++ b/src/option.c -@@ -750,6 +750,7 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags) - struct dhcp_netid *np = NULL; - u16 opt_len = 0; - int is6 = 0; -+ int option_ok = 0; - - new->len = 0; - new->flags = flags; -@@ -769,16 +770,19 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags) - { - new->opt = atoi(arg); - opt_len = 0; -+ option_ok = 1; - break; - } - - if (strstr(arg, "option:") == arg) - { -- new->opt = lookup_dhcp_opt(AF_INET, arg+7); -- opt_len = lookup_dhcp_len(AF_INET, new->opt); -- /* option: must follow tag and vendor string. */ -- if ((opt_len & OT_INTERNAL) && flags != DHOPT_MATCH) -- new->opt = 0; -+ if ((new->opt = lookup_dhcp_opt(AF_INET, arg+7)) != -1) -+ { -+ opt_len = lookup_dhcp_len(AF_INET, new->opt); -+ /* option: must follow tag and vendor string. */ -+ if (!(opt_len & OT_INTERNAL) || flags == DHOPT_MATCH) -+ option_ok = 1; -+ } - break; - } - #ifdef HAVE_DHCP6 -@@ -792,13 +796,16 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags) - { - new->opt = atoi(arg+8); - opt_len = 0; -+ option_ok = 1; - } - else - { -- new->opt = lookup_dhcp_opt(AF_INET6, arg+8); -- opt_len = lookup_dhcp_len(AF_INET6, new->opt); -- if ((opt_len & OT_INTERNAL) && flags != DHOPT_MATCH) -- new->opt = 0; -+ if ((new->opt = lookup_dhcp_opt(AF_INET6, arg+8)) != -1) -+ { -+ opt_len = lookup_dhcp_len(AF_INET6, new->opt); -+ if (!(opt_len & OT_INTERNAL) || flags == DHOPT_MATCH) -+ option_ok = 1; -+ } - } - /* option6:| must follow tag and vendor string. */ - is6 = 1; -@@ -821,7 +828,7 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags) - new->flags |= DHOPT_RFC3925; - if (flags == DHOPT_MATCH) - { -- new->opt = 1; /* avoid error below */ -+ option_ok = 1; - break; - } - } -@@ -848,16 +855,16 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags) - - if (opt_len == 0 && - !(new->flags & DHOPT_RFC3925)) -- opt_len = lookup_dhcp_len(AF_INET6 ,new->opt); -+ opt_len = lookup_dhcp_len(AF_INET6, new->opt); - } - else - #endif - if (opt_len == 0 && - !(new->flags & (DHOPT_VENDOR | DHOPT_ENCAPSULATE | DHOPT_RFC3925))) -- opt_len = lookup_dhcp_len(AF_INET ,new->opt); -+ opt_len = lookup_dhcp_len(AF_INET, new->opt); - - /* option may be missing with rfc3925 match */ -- if (new->opt == 0) -+ if (!option_ok) - ret_err(_("bad dhcp-option")); - - if (comma) diff --git a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-caused-by-looking-up-servers.bind-when-many-servers-defined.patch b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-caused-by-looking-up-servers.bind-when-many-servers-defined.patch deleted file mode 100644 index 57708b6f71..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-caused-by-looking-up-servers.bind-when-many-servers-defined.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 04b0ac05377936d121a36873bb63d492cde292c9 -Author: Simon Kelley -Date: Mon Apr 6 17:19:13 2015 +0100 - - Fix crash caused by looking up servers.bind when many servers defined. - -diff --git a/src/cache.c b/src/cache.c -index d7bea57..178d654 100644 ---- a/src/cache.c -+++ b/src/cache.c -@@ -1367,7 +1367,7 @@ int cache_make_stat(struct txt_record *t) - } - port = prettyprint_addr(&serv->addr, daemon->addrbuff); - lenp = p++; /* length */ -- bytes_avail = (p - buff) + bufflen; -+ bytes_avail = bufflen - (p - buff ); - bytes_needed = snprintf(p, bytes_avail, "%s#%d %u %u", daemon->addrbuff, port, queries, failed_queries); - if (bytes_needed >= bytes_avail) - { -@@ -1381,7 +1381,7 @@ int cache_make_stat(struct txt_record *t) - lenp = p - 1; - buff = new; - bufflen = newlen; -- bytes_avail = (p - buff) + bufflen; -+ bytes_avail = bufflen - (p - buff ); - bytes_needed = snprintf(p, bytes_avail, "%s#%d %u %u", daemon->addrbuff, port, queries, failed_queries); - } - *lenp = bytes_needed; diff --git a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-on-receipt-of-certain-malformed-DNS-requests.patch b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-on-receipt-of-certain-malformed-DNS-requests.patch deleted file mode 100644 index c6106db510..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-on-receipt-of-certain-malformed-DNS-requests.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit ad4a8ff7d9097008d7623df8543df435bfddeac8 -Author: Simon Kelley -Date: Thu Apr 9 21:48:00 2015 +0100 - - Fix crash on receipt of certain malformed DNS requests. - -diff --git a/src/rfc1035.c b/src/rfc1035.c -index 7a07b0c..a995ab5 100644 ---- a/src/rfc1035.c -+++ b/src/rfc1035.c -@@ -1198,7 +1198,10 @@ unsigned int extract_request(struct dns_header *header, size_t qlen, char *name, - size_t setup_reply(struct dns_header *header, size_t qlen, - struct all_addr *addrp, unsigned int flags, unsigned long ttl) - { -- unsigned char *p = skip_questions(header, qlen); -+ unsigned char *p; -+ -+ if (!(p = skip_questions(header, qlen))) -+ return 0; - - /* clear authoritative and truncated flags, set QR flag */ - header->hb3 = (header->hb3 & ~(HB3_AA | HB3_TC)) | HB3_QR; -@@ -1214,7 +1217,7 @@ size_t setup_reply(struct dns_header *header, size_t qlen, - SET_RCODE(header, NOERROR); /* empty domain */ - else if (flags == F_NXDOMAIN) - SET_RCODE(header, NXDOMAIN); -- else if (p && flags == F_IPV4) -+ else if (flags == F_IPV4) - { /* we know the address */ - SET_RCODE(header, NOERROR); - header->ancount = htons(1); -@@ -1222,7 +1225,7 @@ size_t setup_reply(struct dns_header *header, size_t qlen, - add_resource_record(header, NULL, NULL, sizeof(struct dns_header), &p, ttl, NULL, T_A, C_IN, "4", addrp); - } - #ifdef HAVE_IPV6 -- else if (p && flags == F_IPV6) -+ else if (flags == F_IPV6) - { - SET_RCODE(header, NOERROR); - header->ancount = htons(1); diff --git a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq.service b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq.service deleted file mode 100644 index 8e313bcfd9..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=A lightweight DHCP and caching DNS server -After=network.target - -[Service] -Type=simple -ExecStartPre=/usr/sbin/dnsmasq --test -ExecStart=/usr/sbin/dnsmasq -k --user=dnsmasq --group=dnsmasq -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target