net-misc/dhcp: Bump the dhcp package now with upstream ldap
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@2318 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
@@ -1,5 +1,5 @@
|
||||
--- /usr/portage/net-misc/dhcp/dhcp-4.0.1.ebuild 2009-03-30 15:13:28.000000000 +0200
|
||||
+++ dhcp-4.0.1.ebuild 2009-07-08 19:11:15.121631116 +0200
|
||||
+++ dhcp-4.2.0.ebuild 2009-07-08 19:11:15.121631116 +0200
|
||||
@@ -4,22 +4,30 @@
|
||||
|
||||
inherit eutils flag-o-matic autotools
|
||||
|
||||
45
net-misc/dhcp/files/dhcp-4.2-bpf-nofallback.patch
Normal file
45
net-misc/dhcp/files/dhcp-4.2-bpf-nofallback.patch
Normal file
@@ -0,0 +1,45 @@
|
||||
diff -uNr dhcp-4.2.0.orig//common/bpf.c dhcp-4.2.0/common/bpf.c
|
||||
--- dhcp-4.2.0.orig//common/bpf.c 2010-08-24 21:05:43.000000000 +0200
|
||||
+++ dhcp-4.2.0/common/bpf.c 2010-08-24 21:08:59.000000000 +0200
|
||||
@@ -358,9 +358,9 @@
|
||||
struct iovec iov [3];
|
||||
int result;
|
||||
|
||||
- if (!strcmp (interface -> name, "fallback"))
|
||||
+/* if (!strcmp (interface -> name, "fallback"))
|
||||
return send_fallback (interface, packet, raw,
|
||||
- len, from, to, hto);
|
||||
+ len, from, to, hto); */
|
||||
|
||||
if (hto == NULL && interface->anycast_mac_addr.hlen)
|
||||
hto = &interface->anycast_mac_addr;
|
||||
@@ -537,7 +537,7 @@
|
||||
|
||||
void maybe_setup_fallback ()
|
||||
{
|
||||
- isc_result_t status;
|
||||
+/* isc_result_t status;
|
||||
struct interface_info *fbi = (struct interface_info *)0;
|
||||
if (setup_fallback (&fbi, MDL)) {
|
||||
if_register_fallback (fbi);
|
||||
@@ -548,7 +548,7 @@
|
||||
log_fatal ("Can't register I/O handle for %s: %s",
|
||||
fbi -> name, isc_result_totext (status));
|
||||
interface_dereference (&fbi, MDL);
|
||||
- }
|
||||
+ } */
|
||||
}
|
||||
|
||||
void
|
||||
diff -uNr dhcp-4.2.0.orig//includes/osdep.h dhcp-4.2.0/includes/osdep.h
|
||||
--- dhcp-4.2.0.orig//includes/osdep.h 2010-08-24 21:05:43.000000000 +0200
|
||||
+++ dhcp-4.2.0/includes/osdep.h 2010-08-24 21:06:07.000000000 +0200
|
||||
@@ -157,7 +157,7 @@
|
||||
Currently, all low-level packet interfaces use BSD sockets as a
|
||||
fallback. */
|
||||
|
||||
-#if defined (USE_BPF_SEND) || defined (USE_NIT_SEND) || \
|
||||
+#if defined (USE_NIT_SEND) || \
|
||||
defined (USE_DLPI_SEND) || defined (USE_UPF_SEND) || \
|
||||
defined (USE_LPF_SEND) || \
|
||||
(defined (USE_SOCKET_SEND) && defined (HAVE_SO_BINDTODEVICE))
|
||||
103
net-misc/dhcp/files/dhcp-4.2-no_isc_blurb.patch
Normal file
103
net-misc/dhcp/files/dhcp-4.2-no_isc_blurb.patch
Normal file
@@ -0,0 +1,103 @@
|
||||
Submitted By: Your Name (your at email dot address)
|
||||
Date: 2010-08-24
|
||||
Initial Package Version: 4.1
|
||||
Origin: Gentoo patch
|
||||
Upstream Status: unknown
|
||||
Description: remove isc blurb
|
||||
|
||||
diff -Naur dhcp-4.2.0.orig/client/dhclient.c dhcp-4.2.0/client/dhclient.c
|
||||
--- dhcp-4.2.0.orig/client/dhclient.c 2010-08-24 19:00:10.000000000 +0000
|
||||
+++ dhcp-4.2.0/client/dhclient.c 2010-08-24 19:00:35.000000000 +0000
|
||||
@@ -89,6 +89,8 @@
|
||||
|
||||
static isc_result_t write_duid(struct data_string *duid);
|
||||
|
||||
+extern int log_isc_blurb;
|
||||
+
|
||||
int
|
||||
main(int argc, char **argv) {
|
||||
int fd;
|
||||
@@ -408,6 +410,7 @@
|
||||
log_info("%s", "");
|
||||
} else {
|
||||
log_perror = 0;
|
||||
+ log_isc_blurb = 0;
|
||||
quiet_interface_discovery = 1;
|
||||
}
|
||||
|
||||
diff -Naur dhcp-4.2.0.orig/omapip/errwarn.c dhcp-4.2.0/omapip/errwarn.c
|
||||
--- dhcp-4.2.0.orig/omapip/errwarn.c 2010-08-24 19:00:10.000000000 +0000
|
||||
+++ dhcp-4.2.0/omapip/errwarn.c 2010-08-24 19:00:35.000000000 +0000
|
||||
@@ -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 @@
|
||||
IGNORE_RET (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 -Naur dhcp-4.2.0.orig/relay/dhcrelay.c dhcp-4.2.0/relay/dhcrelay.c
|
||||
--- dhcp-4.2.0.orig/relay/dhcrelay.c 2010-08-24 19:00:10.000000000 +0000
|
||||
+++ dhcp-4.2.0/relay/dhcrelay.c 2010-08-24 19:01:47.000000000 +0000
|
||||
@@ -133,6 +133,7 @@
|
||||
"Internet Systems Consortium DHCP Relay Agent";
|
||||
static const char url[] =
|
||||
"For info, please visit https://www.isc.org/software/dhcp/";
|
||||
+extern int log_isc_blurb;
|
||||
|
||||
#ifdef DHCPv6
|
||||
#define DHCRELAY_USAGE \
|
||||
@@ -228,6 +229,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 -Naur dhcp-4.2.0.orig/server/dhcpd.c dhcp-4.2.0/server/dhcpd.c
|
||||
--- dhcp-4.2.0.orig/server/dhcpd.c 2010-08-24 19:00:10.000000000 +0000
|
||||
+++ dhcp-4.2.0/server/dhcpd.c 2010-08-24 19:00:35.000000000 +0000
|
||||
@@ -63,6 +63,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
|
||||
Reference in New Issue
Block a user