sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Andra?? Levstik (14d24d2acccbfe70947d4ee1dd27a606dfc44f8b)

From: Andra?? Levstik <scm AT mail.sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (14d24d2acccbfe70947d4ee1dd27a606dfc44f8b)
Date: Sat, 24 Feb 2007 18:17:13 -0600

GIT changes to master grimoire by Andra?? Levstik <ruskie AT mages.ath.cx>:

ChangeLog | 1
audio-players/xmms2-scrobbler/BUILD | 1
audio-players/xmms2-scrobbler/DEPENDS | 3
audio-players/xmms2-scrobbler/DETAILS | 15 ++
audio-players/xmms2-scrobbler/FINAL | 7 +
audio-players/xmms2-scrobbler/HISTORY | 2
audio-players/xmms2-scrobbler/INSTALL | 3
dev/null |binary
net/dhcdbd/DEPENDS | 3
net/dhcdbd/DETAILS | 12 -
net/dhcdbd/HISTORY | 4
net/dhcdbd/dhcdbd-1.14.tar.gz.sig | 0
net/dhcp/CONFIGURE | 1
net/dhcp/DEPENDS | 7 -
net/dhcp/HISTORY | 9 +
net/dhcp/PRE_BUILD | 7 +
net/dhcp/PRE_SUB_DEPENDS | 7 +
net/dhcp/SUB_DEPENDS | 10 +
net/dhcp/dhcp-3.0.3-dhclient-dbus.patch | 84 ++++++++++++
net/dhcp/dhcp-3.0.3-x-option.patch | 216
++++++++++++++++++++++++++++++++
20 files changed, 384 insertions(+), 8 deletions(-)

New commits:
commit f8f976c8cff4624c2308357f2586fa6b0b0b8f82
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

dhcdbd: fixes as per bug #12831, note major update from 1.14 to 2.5
lot's of soceruty updates inbetween, filed separate bug #13564

commit 64af1c1f409c9a7c9589aa5955fb3ccc2cc76330
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

dhcp: fixing bug #12831

commit 7eb1f436cfd03063cc10181cf0a158b6bb306757
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

xmms2-scrobbler: new xmms2 client

diff --git a/ChangeLog b/ChangeLog
index 22be1b5..7d4e3c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2007-02-24 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* libs/event-loop: a ruby event-loop, new spell
+ * audio-players/xmms2-scrobbler: a new xmms2 client

2007-02-19 Juuso Alasuutari <iuso AT sourcemage.org>
* audio-creation/jack-rack: Moved from audio-soft.
diff --git a/audio-players/xmms2-scrobbler/BUILD
b/audio-players/xmms2-scrobbler/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-players/xmms2-scrobbler/BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-players/xmms2-scrobbler/DEPENDS
b/audio-players/xmms2-scrobbler/DEPENDS
new file mode 100755
index 0000000..ee3cc48
--- /dev/null
+++ b/audio-players/xmms2-scrobbler/DEPENDS
@@ -0,0 +1,3 @@
+depends event-loop &&
+depends xmms2 &&
+sub_depends xmms2 CLIENTLIB_RUBY
diff --git a/audio-players/xmms2-scrobbler/DETAILS
b/audio-players/xmms2-scrobbler/DETAILS
new file mode 100755
index 0000000..e13238d
--- /dev/null
+++ b/audio-players/xmms2-scrobbler/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=xmms2-scrobbler
+ VERSION=0.1.2
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=ftp://ftp.code-monkey.de/pub/xmms2-scrobbler/$SOURCE
+ WEB_SITE=http://code-monkey.de/pages/xmms2-scrobbler
+ ENTERED=20070224
+
SOURCE_HASH=sha512:8df9a28aaaf5da8b8096a5b8674a5c9cc349439794750a3af64cd1633143ace06631e14a6b0a438b2e62e26d0c9ff47639ad24237417b4a08012df4632071bcc
+ LICENSE[0]=BSD
+ SHORT="XMMS2-Scrobbler is an Audioscrobbler client for XMMS2"
+cat << EOF
+XMMS2-Scrobbler is an Audioscrobbler client for XMMS2.
+It depends on the XMMS2 Ruby bindings
+(which ship with XMMS2) and the event-loop package.
+EOF
diff --git a/audio-players/xmms2-scrobbler/FINAL
b/audio-players/xmms2-scrobbler/FINAL
new file mode 100755
index 0000000..615f993
--- /dev/null
+++ b/audio-players/xmms2-scrobbler/FINAL
@@ -0,0 +1,7 @@
+message "********************************************************"
+message "* Copy the config template from *"
+message "* /usr/share/doc/xmms2-scrobbler/config.sample *"
+message "* to your proper xmms2 config dir *"
+message "* ~/.config/xmms2/clients/xmms2-scrobbler *"
+message "*and edit the parameters to get xmms2-scrobbler to work*"
+message "********************************************************"
diff --git a/audio-players/xmms2-scrobbler/HISTORY
b/audio-players/xmms2-scrobbler/HISTORY
new file mode 100644
index 0000000..d0ec20c
--- /dev/null
+++ b/audio-players/xmms2-scrobbler/HISTORY
@@ -0,0 +1,2 @@
+2007-02-24 Felsen <martin AT makl.de>
+ * DEPENDS, DETAILS, HISTORY, BUILD, INSTALL, FINAL: created this spell
diff --git a/audio-players/xmms2-scrobbler/INSTALL
b/audio-players/xmms2-scrobbler/INSTALL
new file mode 100755
index 0000000..0f4ea5a
--- /dev/null
+++ b/audio-players/xmms2-scrobbler/INSTALL
@@ -0,0 +1,3 @@
+PREFIX=${INSTALL_ROOT}/usr rake install &&
+mkdir -vp /usr/share/docs/$SPELL &&
+message "user: your-username\npassword: your-password" >
/usr/share/docs/$SPELL/config.sample
diff --git a/net/dhcdbd/DEPENDS b/net/dhcdbd/DEPENDS
index 64841ac..54a2f93 100755
--- a/net/dhcdbd/DEPENDS
+++ b/net/dhcdbd/DEPENDS
@@ -1,2 +1,3 @@
depends dbus &&
-depends dhcpcd
+depends dhcp &&
+sub_depends dhcp DBUS
diff --git a/net/dhcdbd/DETAILS b/net/dhcdbd/DETAILS
index d4ba92a..b24a6d2 100755
--- a/net/dhcdbd/DETAILS
+++ b/net/dhcdbd/DETAILS
@@ -1,14 +1,14 @@
SPELL=dhcdbd
- VERSION=1.14
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=2.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://people.redhat.com/jvdias/dhcdbd/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE_URL[0]=http://people.redhat.com/dcantrel/dhcdbd/$SOURCE
+
SOURCE_HASH=sha512:2a14f8f6562af87c144032fac2d95ecf4aea34b25c05522df7de991a41b0a8d5c360f08f603169b40b7dc890d00a993118e5c55ea98ce1c0d0bf44b8a5789cfe
LICENSE[0]=GPL
KEYWORDS="net"
- WEB_SITE=http://people.redhat.com/jvdias/dhcdbd/
+ WEB_SITE=http://people.redhat.com/dcantrel/dhcdbd
ENTERED=20060424
- PATCHLVEL=1
+ SECURITY_PATCH=1
SHORT='DHCP D-BUS Daemon'
cat << EOF
Red Hat's DHCP D-BUS Daemon.
diff --git a/net/dhcdbd/HISTORY b/net/dhcdbd/HISTORY
index ab3c42e..e52ac6d 100644
--- a/net/dhcdbd/HISTORY
+++ b/net/dhcdbd/HISTORY
@@ -1,3 +1,7 @@
+2007-02-25 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: SECURITY_PATCH++, version update to 2.5
+ * DEPENDS: added some subdepends as per bug #12831
+
2006-08-14 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: added, fix for dbus 0.9X
diff --git a/net/dhcdbd/dhcdbd-1.14.tar.gz.sig
b/net/dhcdbd/dhcdbd-1.14.tar.gz.sig
deleted file mode 100644
index 87dd185..0000000
Binary files a/net/dhcdbd/dhcdbd-1.14.tar.gz.sig and /dev/null differ
diff --git a/net/dhcp/CONFIGURE b/net/dhcp/CONFIGURE
new file mode 100755
index 0000000..2982532
--- /dev/null
+++ b/net/dhcp/CONFIGURE
@@ -0,0 +1 @@
+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 b691337..46eeddb 100755
--- a/net/dhcp/DEPENDS
+++ b/net/dhcp/DEPENDS
@@ -1 +1,6 @@
-depends groff
+depends groff &&
+if [[ "$DHCP_DBUS" == "y" ]]
+then
+depends dbus &&
+depends dbus-glib
+fi
diff --git a/net/dhcp/HISTORY b/net/dhcp/HISTORY
index da8d560..9d52a52 100644
--- a/net/dhcp/HISTORY
+++ b/net/dhcp/HISTORY
@@ -1,3 +1,12 @@
+2007-02-25 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * CONFIGURE: added to pick dbus enabler code or not
+ * PRE_BUILD: added to apply necessary patches
+ * PRE_SUB_DEPENDS: added for dhcdbd depends
+ * SUB_DEPENDS: added for dhcdbd depends
+ * dhcp-3.0.3-dhclient-dbus.patch: added from bug #12831
+ * dhcp-3.0.3-x-option.patch: added from bug #12831
+ * DEPENDS: added optional deps
+
2007-02-17 Elisamuel Resto <ryuji AT sourcemage.org>
* INSTALL: Added $INSTALL_ROOT for the targets and removed
the $SOURCE_DIRECTORY as per the comment on sm-commit
diff --git a/net/dhcp/PRE_BUILD b/net/dhcp/PRE_BUILD
new file mode 100755
index 0000000..e2f74c8
--- /dev/null
+++ b/net/dhcp/PRE_BUILD
@@ -0,0 +1,7 @@
+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/PRE_SUB_DEPENDS b/net/dhcp/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..cbe9d30
--- /dev/null
+++ b/net/dhcp/PRE_SUB_DEPENDS
@@ -0,0 +1,7 @@
+. $GRIMOIRE/is_depends_enabled.function
+case $THIS_SUB_DEPENDS in
+ DBUS) message "Checking for existing sub_depends"
+ is_depends_enabled $SPELL dbus ;;
+*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/net/dhcp/SUB_DEPENDS b/net/dhcp/SUB_DEPENDS
new file mode 100755
index 0000000..9df58ba
--- /dev/null
+++ b/net/dhcp/SUB_DEPENDS
@@ -0,0 +1,10 @@
+persistent_add DHCP_DBUS1
+case "$THIS_SUB_DEPENDS" in
+ DBUS) message "Requested sub_depends"
+ DHCP_DBUS1=y &&
+ depends dbus &&
+ depends dbus-glib
+ ;;
+*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/net/dhcp/dhcp-3.0.3-dhclient-dbus.patch
b/net/dhcp/dhcp-3.0.3-dhclient-dbus.patch
new file mode 100644
index 0000000..579d72f
--- /dev/null
+++ b/net/dhcp/dhcp-3.0.3-dhclient-dbus.patch
@@ -0,0 +1,84 @@
+--- 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
new file mode 100644
index 0000000..5f5c1a8
--- /dev/null
+++ b/net/dhcp/dhcp-3.0.3-x-option.patch
@@ -0,0 +1,216 @@
+--- 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

[SM-Commit] GIT changes to master grimoire by Andra?? Levstik (14d24d2acccbfe70947d4ee1dd27a606dfc44f8b), Andra?? Levstik, 02/24/2007