1 files changed, 0 insertions, 96 deletions
diff --git a/net-misc/dhcp/files/dhcp-4.1-no_isc_blurb.patch b/net-misc/dhcp/files/dhcp-4.1-no_isc_blurb.patch
deleted file mode 100644
index 1afdf21a934e..000000000000
--- a/net-misc/dhcp/files/dhcp-4.1-no_isc_blurb.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -uNr dhcp-4.1.0.ORIG/client/dhclient.c dhcp-4.1.0/client/dhclient.c
---- dhcp-4.1.0.ORIG/client/dhclient.c	2009-07-09 15:29:40.000000000 +0100
-+++ dhcp-4.1.0/client/dhclient.c	2009-07-09 15:30:19.000000000 +0100
-@@ -87,6 +87,8 @@
- 
- static isc_result_t write_duid(struct data_string *duid);
- 
-+extern int log_isc_blurb;
-+
- int
- main(int argc, char **argv) {
- 	int fd;
-@@ -385,6 +387,7 @@
- 		log_info("%s", "");
- 	} else {
- 		log_perror = 0;
-+		log_isc_blurb = 0;
- 		quiet_interface_discovery = 1;
- 	}
- 
-diff -uNr dhcp-4.1.0.ORIG/omapip/errwarn.c dhcp-4.1.0/omapip/errwarn.c
---- dhcp-4.1.0.ORIG/omapip/errwarn.c	2009-07-09 15:29:40.000000000 +0100
-+++ dhcp-4.1.0/omapip/errwarn.c	2009-07-09 15:29:52.000000000 +0100
-@@ -43,6 +43,8 @@
- int log_perror = 1;
- #endif
- int log_priority;
-+int log_isc_blurb=1;
-+
- void (*log_cleanup) (void);
- 
- #define CVT_BUF_MAX 1023
-@@ -74,7 +76,9 @@
- 	  write (STDERR_FILENO, "\n", 1);
-   }
- 
--#if !defined (NOMINUM)
-+#if !defined(NOMINUM)
-+  if ( log_isc_blurb )
-+  {
-   log_error ("%s", "");
-   log_error ("If you did not get this software from ftp.isc.org, please");
-   log_error ("get the latest from ftp.isc.org and install that before");
-@@ -92,7 +96,12 @@
-   log_error ("the README file.");
-   log_error ("%s", "");
-   log_error ("exiting.");
-+  }else
-+  {
-+      log_error ("exiting.");
-+  }
- #endif
-+
-   if (log_cleanup)
- 	  (*log_cleanup) ();
-   exit (1);
-diff -uNr dhcp-4.1.0.ORIG/relay/dhcrelay.c dhcp-4.1.0/relay/dhcrelay.c
---- dhcp-4.1.0.ORIG/relay/dhcrelay.c	2009-07-09 15:29:40.000000000 +0100
-+++ dhcp-4.1.0/relay/dhcrelay.c	2009-07-09 15:31:53.000000000 +0100
-@@ -130,6 +130,7 @@
- static char arr[] = "All rights reserved.";
- static char message[] = "Internet Systems Consortium DHCP Relay Agent";
- static char url[] = "For info, please visit http://www.isc.org/sw/dhcp/";
-+extern int log_isc_blurb;
- 
- #ifdef DHCPv6
- #define DHCRELAY_USAGE \
-@@ -219,6 +220,7 @@
- 		} else if (!strcmp(argv[i], "-q")) {
- 			quiet = 1;
- 			quiet_interface_discovery = 1;
-+			log_isc_blurb = 0;
- 		} else if (!strcmp(argv[i], "-p")) {
- 			if (++i == argc)
- 				usage();
-diff -uNr dhcp-4.1.0.ORIG/server/dhcpd.c dhcp-4.1.0/server/dhcpd.c
---- dhcp-4.1.0.ORIG/server/dhcpd.c	2009-07-09 15:29:40.000000000 +0100
-+++ dhcp-4.1.0/server/dhcpd.c	2009-07-09 15:29:52.000000000 +0100
-@@ -62,6 +62,9 @@
- struct iaddr server_identifier;
- int server_identifier_matched;
- 
-+
-+extern int log_isc_blurb;
-+
- #if defined (NSUPDATE)
- 
- /* This stuff is always executed to figure the default values for certain
-@@ -367,6 +370,7 @@
- 			lftest = 1;
- 			log_perror = -1;
- 		} else if (!strcmp (argv [i], "-q")) {
-+			log_isc_blurb = 0;
- 			quiet = 1;
- 			quiet_interface_discovery = 1;
- #ifdef DHCPv6