From b24bd25253fe093f722ab576d29fdc41d04cb1ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Aug 2019 19:14:55 +0100 Subject: gentoo resync : 02.08.2019 --- .../files/dhcp-4.2.2-bind-parallel-build.patch | 14 -------- .../dhcp/files/dhcp-4.2.4-always-accept-4.patch | 29 ----------------- net-misc/dhcp/files/dhcp-4.3.4-bind-disable.patch | 38 ---------------------- 3 files changed, 81 deletions(-) delete mode 100644 net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch delete mode 100644 net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch delete mode 100644 net-misc/dhcp/files/dhcp-4.3.4-bind-disable.patch (limited to 'net-misc/dhcp/files') diff --git a/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch b/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch deleted file mode 100644 index 6136154f65a0..000000000000 --- a/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch +++ /dev/null @@ -1,14 +0,0 @@ -fix the bind subdir parallel builds - -https://bugs.gentoo.org/380717 - ---- a/bind/lib/export/isc/Makefile.in -+++ b/bind/lib/export/isc/Makefile.in -@@ -114,6 +114,7 @@ - -DLIBAGE=${LIBAGE} \ - -c ${srcdir}/version.c - -+${OBJS}: | subdirs - libisc.@SA@: ${OBJS} - ${AR} ${ARFLAGS} $@ ${OBJS} - ${RANLIB} $@ diff --git a/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch b/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch deleted file mode 100644 index 6cec86c9d9c4..000000000000 --- a/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://bugs.gentoo.org/437108 - -always accept the -4 option even if we don't have IPv6 support enabled. -the relay code does this already. - ---- a/client/dhclient.c -+++ b/client/dhclient.c -@@ -170,8 +170,8 @@ main(int argc, char **argv) { - if (!strcmp(argv[i], "-r")) { - release_mode = 1; - no_daemon = 1; --#ifdef DHCPv6 - } else if (!strcmp(argv[i], "-4")) { -+#ifdef DHCPv6 - if (local_family_set && local_family != AF_INET) - log_fatal("Client can only do v4 or v6, not " - "both."); ---- a/server/dhcpd.c -+++ b/server/dhcpd.c -@@ -373,8 +373,8 @@ main(int argc, char **argv) { - } else if (!strcmp (argv [i], "-q")) { - quiet = 1; - quiet_interface_discovery = 1; --#ifdef DHCPv6 - } else if (!strcmp(argv[i], "-4")) { -+#ifdef DHCPv6 - if (local_family_set && (local_family != AF_INET)) { - log_fatal("Server cannot run in both IPv4 and " - "IPv6 mode at the same time."); diff --git a/net-misc/dhcp/files/dhcp-4.3.4-bind-disable.patch b/net-misc/dhcp/files/dhcp-4.3.4-bind-disable.patch deleted file mode 100644 index be0c032ae763..000000000000 --- a/net-misc/dhcp/files/dhcp-4.3.4-bind-disable.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- dhcp-4.3.4/bind/Makefile.in -+++ dhcp-4.3.4/bind/Makefile.in -@@ -40,6 +40,7 @@ - @BIND_ATF_TRUE@all: bind1 atf bind2 - - bind1: -+disable: - # Extract the source from the tarball, if it hasn't been already. - @if test -d ${bindsrcdir} ; then \ - echo ${bindsrcdir} already unpacked... ; \ -@@ -68,6 +69,7 @@ - fi - - atf: -+disable: - # Build and copy the ATF support if not yet installed. - @if test -d ./atf ; then \ - echo ATF support already installed ; \ -@@ -82,6 +84,7 @@ - @CROSS_COMPILING_TRUE@bind2: bind2-hostgen - - bind2-noguest: -+disable: - # Build and install the export libraries - # No need to do anything if we already have something installed. - @if test -d ${binddir}/lib ; then \ -@@ -98,6 +101,7 @@ - fi - - bind2-hostgen: -+disable: - # Build and install the export libraries - # No need to do anything if we already have something installed. - @if test -d ${binddir}/lib ; then \ ---- dhcp-4.3.4/bind/test -+++ dhcp-4.3.4/bind/test -@@ -0,0 +1 @@ -+--disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --with-gssapi=no --enable-threads=no @BINDCONFIG@ --with-export-includedir=${binddir}/include --with-export-libdir=${binddir}/lib -- cgit v1.2.3