Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6263f900bfcc37e1b34e50c7fe94d0c173bfdffe)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6263f900bfcc37e1b34e50c7fe94d0c173bfdffe)
  • Date: Wed, 4 Jul 2012 14:24:06 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/dhcp/BUILD | 5
net/dhcp/CONFIGURE | 1
net/dhcp/DEPENDS | 18 +-
net/dhcp/DETAILS | 9 -
net/dhcp/HISTORY | 16 ++
net/dhcp/INSTALL | 3
net/dhcp/PRE_BUILD | 7 -
net/dhcp/SUB_DEPENDS | 7 -
net/dhcp/dhcp-3.0.3-dhclient-dbus.patch | 84 ------------
net/dhcp/dhcp-3.0.3-x-option.patch | 216
--------------------------------
net/dhcp/init.d/dhcp | 6
net/dhcp/init.d/dhcp.conf | 7 -
12 files changed, 51 insertions(+), 328 deletions(-)

New commits:
commit 6263f900bfcc37e1b34e50c7fe94d0c173bfdffe
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

dhcp: => 4.2.4

diff --git a/net/dhcp/BUILD b/net/dhcp/BUILD
new file mode 100755
index 0000000..9d4a7ed
--- /dev/null
+++ b/net/dhcp/BUILD
@@ -0,0 +1,5 @@
+OPTS="$DHCP_OPTS $OPTS" &&
+
+make_single &&
+default_build &&
+make_normal
diff --git a/net/dhcp/CONFIGURE b/net/dhcp/CONFIGURE
deleted file mode 100755
index 2982532..0000000
--- a/net/dhcp/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query DHCP_DBUS "Do you want to apply the dbus patches for dhcdbd?" n
diff --git a/net/dhcp/DEPENDS b/net/dhcp/DEPENDS
index 46eeddb..cff9be0 100755
--- a/net/dhcp/DEPENDS
+++ b/net/dhcp/DEPENDS
@@ -1,6 +1,14 @@
depends groff &&
-if [[ "$DHCP_DBUS" == "y" ]]
-then
-depends dbus &&
-depends dbus-glib
-fi
+
+optional_depends openldap \
+ "--with-ldap" \
+ "--without-ldap" \
+ "for OpenLDAP support in dhcpd" &&
+
+if is_depends_enabled $SPELL openldap; then
+ config_query_option DHCP_OPTS "Enable OpenLDAP crypto support in dhcpd
(needs openldap compiled with TLS/SSL)?" n \
+ "--with-ldapcrypto" \
+ "--without-ldapcrypto"
+fi &&
+
+suggest_depends dbus "" "" "for D-Bus support in DHCP client"
diff --git a/net/dhcp/DETAILS b/net/dhcp/DETAILS
index 9e0aa53..379b72a 100755
--- a/net/dhcp/DETAILS
+++ b/net/dhcp/DETAILS
@@ -1,10 +1,11 @@
SPELL=dhcp
- VERSION=4.1.1
+ VERSION=4.2.4
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.asc
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.isc.org/isc/dhcp/$SOURCE
- SOURCE2_URL[0]=ftp://ftp.isc.org/isc/dhcp/$SOURCE2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=ftp://ftp.isc.org/isc/dhcp/$VERSION/$SOURCE
+ SOURCE2_URL[0]=ftp://ftp.isc.org/isc/dhcp/$VERSION/$SOURCE2
SOURCE_GPG=isc.gpg:$SOURCE2:UPSTREAM_KEY
WEB_SITE=http://www.isc.org/products/DHCP
LICENSE=http://www.isc.org/products/DHCP/dhcp-copyright.html
diff --git a/net/dhcp/HISTORY b/net/dhcp/HISTORY
index 9f96e7c..72c5a23 100644
--- a/net/dhcp/HISTORY
+++ b/net/dhcp/HISTORY
@@ -1,3 +1,19 @@
+2012-07-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.4; SECURITY_PATCH++ (several CVEs
since
+ 4.1.1); updated source urls; quoting paths
+ * CONFIGURE: dropped; dbus support for dhclient was added by upstream
+ * dhcp-3.0.3-dhclient-dbus.patch, dhcp-3.0.3-x-option.patch: removed
+ deprecated patches
+ * PRE_BUILD: dropped, not needed anymore
+ * DEPENDS: added missing openldap optional dependency; removed
dbus-glib
+ * INSTALL: use INSTALL_ROOT
+ * SUB_DEPENDS: only dbus is required to check here
+ * BUILD: added, to use DHCP_OPTS and fix multijob build
+ * init.d/dhcp: corrected leases path; added DHCPD_ARGS; force -q flag
+ (suppresses printing copyright message and other useless info for
init)
+ * init.d/dhcp.conf: added DHCPD_ARGS; corrected description (multiple
+ interfaces can be used)
+
2010-05-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* isc.gpg: removed, as it was still incomplete and there is a section
level one
diff --git a/net/dhcp/INSTALL b/net/dhcp/INSTALL
index 464282e..67f5531 100755
--- a/net/dhcp/INSTALL
+++ b/net/dhcp/INSTALL
@@ -1,3 +1,4 @@
-make LIBDIR=/usr/lib INCDIR=/usr/include install &&
+make LIBDIR="$INSTALL_ROOT/usr/lib" \
+ INCDIR="$INSTALL_ROOT/usr/include" install &&
install -m 644 client/dhclient.conf
$INSTALL_ROOT/etc/dhclient.conf.example &&
install -m 644 server/dhcpd.conf $INSTALL_ROOT/etc/dhcpd.conf.example
diff --git a/net/dhcp/PRE_BUILD b/net/dhcp/PRE_BUILD
deleted file mode 100755
index e2f74c8..0000000
--- a/net/dhcp/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if [[ $DHCP_DBUS == y ]] ||
- [[ $DHCP_DBUS1 == y ]]; then
-patch -p0 < $SPELL_DIRECTORY/dhcp-3.0.3-dhclient-dbus.patch &&
-patch -p1 < $SPELL_DIRECTORY/dhcp-3.0.3-x-option.patch
-fi
diff --git a/net/dhcp/SUB_DEPENDS b/net/dhcp/SUB_DEPENDS
index 9df58ba..411d255 100755
--- a/net/dhcp/SUB_DEPENDS
+++ b/net/dhcp/SUB_DEPENDS
@@ -1,9 +1,6 @@
-persistent_add DHCP_DBUS1
case "$THIS_SUB_DEPENDS" in
- DBUS) message "Requested sub_depends"
- DHCP_DBUS1=y &&
- depends dbus &&
- depends dbus-glib
+ DBUS) message "Requested sub_depends" &&
+ depends dbus
;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
diff --git a/net/dhcp/dhcp-3.0.3-dhclient-dbus.patch
b/net/dhcp/dhcp-3.0.3-dhclient-dbus.patch
deleted file mode 100644
index 579d72f..0000000
--- a/net/dhcp/dhcp-3.0.3-dhclient-dbus.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- client/scripts/bsdos
-+++ client/scripts/bsdos
-@@ -47,6 +47,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
---- client/scripts/freebsd
-+++ client/scripts/freebsd
-@@ -57,6 +57,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
---- client/scripts/linux
-+++ client/scripts/linux
-@@ -69,6 +69,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
---- client/scripts/netbsd
-+++ client/scripts/netbsd
-@@ -47,6 +47,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
---- client/scripts/openbsd
-+++ client/scripts/openbsd
-@@ -47,6 +47,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
---- client/scripts/solaris
-+++ client/scripts/solaris
-@@ -47,6 +47,11 @@
- . /etc/dhcp/dhclient-exit-hooks
- fi
- # probably should do something with exit status of the local script
-+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
-+ dbus-send --system --dest=com.redhat.dhcp \
-+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
-+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
-+ fi
- exit $exit_status
- }
-
diff --git a/net/dhcp/dhcp-3.0.3-x-option.patch
b/net/dhcp/dhcp-3.0.3-x-option.patch
deleted file mode 100644
index 5f5c1a8..0000000
--- a/net/dhcp/dhcp-3.0.3-x-option.patch
+++ /dev/null
@@ -1,216 +0,0 @@
---- dhcp-3.0.2/common/parse.c.extended_option_environment 2005-04-05
17:49:36.513062562 -0400
-+++ dhcp-3.0.2/common/parse.c 2005-04-05 17:49:36.580052656 -0400
-@@ -1270,6 +1270,10 @@
- option_hash_add (option -> universe -> hash,
- (const char *)option -> name,
- 0, option, MDL);
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+ if ( new_option_info_tree != 0L )
-+ add_new_option_info( option );
-+#endif
- return 1;
- }
-
---- dhcp-3.0.2/common/tables.c.extended_option_environment 2004-09-01
13:06:35.000000000 -0400
-+++ dhcp-3.0.2/common/tables.c 2005-04-05 18:04:23.915838623 -0400
-@@ -1238,3 +1238,40 @@
- fqdn_universe.name, 0,
- &fqdn_universe, MDL);
- }
-+
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+#include <search.h>
-+
-+void *new_option_info_tree = 0L;
-+
-+static int new_option_info_comparator( const void* p1, const void *p2 )
-+{
-+ uint32_t ocode1 = (((const struct option*)p1)->universe->index << 8)
-+ |(((const struct option*)p1)->code),
-+ ocode2 = (((const struct option*)p2)->universe->index << 8)
-+ |(((const struct option*)p2)->code);
-+ return( (ocode1 == ocode2)
-+ ? 0
-+ :( ( ocode1 > ocode2 )
-+ ? 1
-+ : -1
-+ )
-+ );
-+}
-+
-+void *add_new_option_info( struct option *option )
-+{
-+ if ( option->universe->index >= fqdn_universe.index )
-+ return 0L;
-+ if ( new_option_info_tree == GENERATE_NEW_OPTION_INFO )
-+ new_option_info_tree = (void*)0L;
-+ return tsearch( option, &(new_option_info_tree),
new_option_info_comparator );
-+}
-+
-+void *lookup_new_option_info( struct option *option )
-+{
-+ if ( new_option_info_tree == GENERATE_NEW_OPTION_INFO )
-+ return 0L;
-+ return tfind( option, &(new_option_info_tree),
new_option_info_comparator );
-+}
-+#endif
---- dhcp-3.0.2/includes/dhcpd.h.extended_option_environment 2004-11-24
12:39:16.000000000 -0500
-+++ dhcp-3.0.2/includes/dhcpd.h 2005-04-05 17:49:36.613047777 -0400
-@@ -1800,6 +1800,13 @@
- void initialize_common_option_spaces PROTO ((void));
- struct universe *config_universe;
-
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+#define GENERATE_NEW_OPTION_INFO ((void*)1)
-+extern void *new_option_info_tree;
-+extern void *add_new_option_info( struct option*);
-+extern void *lookup_new_option_info( struct option *);
-+#endif
-+
- /* stables.c */
- #if defined (FAILOVER_PROTOCOL)
- extern failover_option_t null_failover_option;
---- dhcp-3.0.2/client/dhclient.c.extended_option_environment 2005-04-05
17:49:36.566054726 -0400
-+++ dhcp-3.0.2/client/dhclient.c 2005-04-05 17:49:36.617047185 -0400
-@@ -74,7 +74,9 @@
- int onetry=0;
- int quiet=0;
- int nowait=0;
--
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+int extended_option_environment = 0;
-+#endif
- static void usage PROTO ((void));
-
- void do_release(struct client_state *);
-@@ -204,6 +206,11 @@
- } else if (!strcmp (argv [i], "--version")) {
- log_info ("isc-dhclient-%s", DHCP_VERSION);
- exit (0);
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+ } else if (!strcmp (argv [i], "-x")) {
-+ extended_option_environment = 1;
-+ new_option_info_tree = GENERATE_NEW_OPTION_INFO;
-+#endif
- } else if (argv [i][0] == '-') {
- usage ();
- } else {
-@@ -572,7 +579,11 @@
- log_info (arr);
- log_info (url);
-
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+ log_error ("Usage: dhclient [-1dqr] [-nwx] [-p <port>] %s",
-+#else
- log_error ("Usage: dhclient [-1dqr] [-nw] [-p <port>] %s",
-+#endif
- "[-s server]");
- log_error (" [-cf config-file] [-lf lease-file]%s",
- "[-pf pid-file] [-e VAR=val]");
-@@ -2529,8 +2540,28 @@
- struct envadd_state {
- struct client_state *client;
- const char *prefix;
-+ struct universe *universe;
- };
-
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+static
-+void build_universe_info_envvar
-+( struct option_cache *oc,
-+ struct packet *p, struct lease *l,
-+ struct client_state *client,
-+ struct option_state *in_o,
-+ struct option_state *cf_o,
-+ struct binding_scope **scope,
-+ struct universe *u, void *es
-+)
-+{
-+ char info_name[512], info_data[512];
-+ snprintf(info_name, 512, "%s._universe_.", oc->option->universe->name);
-+ snprintf(info_data, 512, "%u:%s", oc->option->code,oc->option->format);
-+ client_envadd( client, info_name, oc->option->name, info_data );
-+}
-+#endif
-+
- void client_option_envadd (struct option_cache *oc,
- struct packet *packet, struct lease *lease,
- struct client_state *client_state,
-@@ -2547,6 +2578,31 @@
- in_options, cfg_options, scope, oc, MDL)) {
- if (data.len) {
- char name [256];
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+ if ( extended_option_environment )
-+ {
-+ if( ( oc->option->universe != &dhcp_universe
)
-+ &&( oc->option->universe->index >
fqdn_universe.index )
-+ &&( es->universe != oc->option->universe )
-+ )
-+ {
-+ es->universe = oc->option->universe;
-+ (*(es->universe->foreach))
-+ ( (struct packet *)0, (struct
lease *)0,
-+ client_state,
-+ in_options, cfg_options,
-+ scope, es->universe, es,
-+ build_universe_info_envvar
-+ );
-+ }else
-+ if ( lookup_new_option_info(oc->option) != 0L
)
-+ build_universe_info_envvar
-+ ( oc, packet, lease,
client_state,
-+ in_options, cfg_options,
scope,
-+ oc->option->universe, es
-+ );
-+ }
-+#endif
- if (dhcp_option_ev_name (name, sizeof name,
- oc -> option)) {
- client_envadd (es -> client, es -> prefix,
-@@ -2575,6 +2631,7 @@
-
- es.client = client;
- es.prefix = prefix;
-+ es.universe = 0L;
-
- client_envadd (client,
- prefix, "ip_address", "%s", piaddr (lease -> address));
-@@ -2788,7 +2845,14 @@
- s = option -> name;
- if (j + 1 == buflen)
- return 0;
-+#ifdef EXTENDED_NEW_OPTION_INFO
-+ if ( ! extended_option_environment )
-+ buf [j++] = '_';
-+ else
-+ buf [j++] = '.';
-+#else
- buf [j++] = '_';
-+#endif
- }
- ++i;
- } while (i != 2);
---- dhcp-3.0.2/client/dhclient.8.extended_option_environment 2004-09-29
19:01:46.000000000 -0400
-+++ dhcp-3.0.2/client/dhclient.8 2005-04-05 17:49:36.619046889 -0400
-@@ -78,6 +78,9 @@
- .B -w
- ]
- [
-+.B -x
-+]
-+[
- .I if0
- [
- .I ...ifN
-@@ -252,6 +255,10 @@
- supplying the
- .B -nw
- flag.
-+.PP
-+The -x argument enables eXtended option information to be created in the
-+-s dhclient-script environment, which would allow applications running
-+in that environment to handle options they do not know about in advance.
- .SH CONFIGURATION
- The syntax of the dhclient.conf(5) file is discussed separately.
- .SH OMAPI
diff --git a/net/dhcp/init.d/dhcp b/net/dhcp/init.d/dhcp
index 0890691..4607cc1 100644
--- a/net/dhcp/init.d/dhcp
+++ b/net/dhcp/init.d/dhcp
@@ -4,11 +4,11 @@

RUNLEVEL=3
PROGRAM=/usr/sbin/dhcpd
-ARGS="$DEVICE"
+ARGS="-q $DHCPD_ARGS $DEVICE"
NEEDS="+network +remote_fs"

. /etc/init.d/smgl_init

-if [ ! -f /var/state/dhcp/dhcpd.leases ] ; then
- touch /var/state/dhcp/dhcpd.leases
+if [ ! -f /var/db/dhcpd.leases ] ; then
+ touch /var/db/dhcpd.leases
fi
diff --git a/net/dhcp/init.d/dhcp.conf b/net/dhcp/init.d/dhcp.conf
index 61a2b07..1a0898c 100644
--- a/net/dhcp/init.d/dhcp.conf
+++ b/net/dhcp/init.d/dhcp.conf
@@ -1,3 +1,6 @@
-# Device which you want the DHCP server to listen on
+# Device(s) which you want the DHCP server to listen on
# Leave blank if you want to listen on all devices
-DEVICE=eth1
+DEVICE="eth1"
+
+# For the arguments and description see dhcpd(8)
+DHCPD_ARGS=""



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6263f900bfcc37e1b34e50c7fe94d0c173bfdffe), Vlad Glagolev, 07/04/2012

Archive powered by MHonArc 2.6.24.

Top of Page