astlinux-commits — Commits to the AstLinux SVN repository

[Astlinux-commits] SF.net SVN: astlinux:[7295] branches/1.0/package/wide-dhcpv6/wide-dhcpv6.mk

[<abe...@us...>]

Revision: 7295
          http://sourceforge.net/p/astlinux/code/7295
Author:   abelbeck
Date:     2015-10-30 12:43:29 +0000 (Fri, 30 Oct 2015)
Log Message:
-----------
wide-dhcpv6, don't build/install dhcp6ctl since we don't really need it

Modified Paths:
--------------
    branches/1.0/package/wide-dhcpv6/wide-dhcpv6.mk

Modified: branches/1.0/package/wide-dhcpv6/wide-dhcpv6.mk
===================================================================
--- branches/1.0/package/wide-dhcpv6/wide-dhcpv6.mk	2015-10-28 17:23:39 UTC (rev 7294)
+++ branches/1.0/package/wide-dhcpv6/wide-dhcpv6.mk	2015-10-30 12:43:29 UTC (rev 7295)
@@ -13,12 +13,11 @@
 	--sysconfdir=/etc/wide-dhcpv6 \
 	ac_cv_func_setpgrp_void=yes
 
-## Only build client and control
-WIDE_DHCPV6_MAKE_OPT = dhcp6c dhcp6ctl
+## Only build client
+WIDE_DHCPV6_MAKE_OPT = dhcp6c
 
 define WIDE_DHCPV6_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/dhcp6c $(TARGET_DIR)/usr/sbin/
-	$(INSTALL) -D -m 0755 $(@D)/dhcp6ctl $(TARGET_DIR)/usr/sbin/
 	ln -sf /tmp/etc/wide-dhcpv6 $(TARGET_DIR)/etc/wide-dhcpv6
 endef
 
@@ -26,7 +25,6 @@
 
 define WIDE_DHCPV6_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/usr/sbin/dhcp6c
-	rm -f $(TARGET_DIR)/usr/sbin/dhcp6ctl
 	rm -f $(TARGET_DIR)/etc/wide-dhcpv6
 endef
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7294] branches/1.0/docs/ChangeLog.txt

[<abe...@us...>]

Revision: 7294
          http://sourceforge.net/p/astlinux/code/7294
Author:   abelbeck
Date:     2015-10-28 17:23:39 +0000 (Wed, 28 Oct 2015)
Log Message:
-----------
update ChangeLog

Modified Paths:
--------------
    branches/1.0/docs/ChangeLog.txt

Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt	2015-10-28 17:10:33 UTC (rev 7293)
+++ branches/1.0/docs/ChangeLog.txt	2015-10-28 17:23:39 UTC (rev 7294)
@@ -5,10 +5,44 @@
 === docs/ChangeLog.txt
 =========================================================
 
+Additions for AstLinux 1.2.5:
+=============================
+
+Released **TBD**
+
+** System
+
+-- Monit, version bump to 5.15
+
+-- libsodium, version bump to 1.0.5
+
+** Networking
+
+-- iperf3, new package, iperf3 is becomming more common, sits along side the old iperf since they are not compatible
+
+-- ntpd/sntp, version bump to 4.2.8p4, security fixes: CVE-2015-7871 plus 12 other low/medium-severity vulnerabilities
+
+-- fping, version bump to 3.13
+
+-- sipgrep, version bump to 2.1.0
+
+** Asterisk
+
+-- Asterisk 1.8.32.3 (no change), 11.20.0 (version bump) and 13.6.0 (version bump)
+
+-- DAHDI, dahdi-linux 2.8.0.1 (no change) and dahdi-tools 2.8.0 (no change)
+
+-- pjsip 2.4 (no change)
+
+** Web Interface
+
+-- No Change
+
+
 Additions for AstLinux 1.2.4.1:
 ===============================
 
-Released **TBD**
+Released 2015-10-28
 
 ** System
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7293] branches/1.0/package/monit

[<abe...@us...>]

Revision: 7293
          http://sourceforge.net/p/astlinux/code/7293
Author:   abelbeck
Date:     2015-10-28 17:10:33 +0000 (Wed, 28 Oct 2015)
Log Message:
-----------
monit, version bump to 5.15

Modified Paths:
--------------
    branches/1.0/package/monit/monit-0100-localhost-sendmail.patch
    branches/1.0/package/monit/monit.mk

Modified: branches/1.0/package/monit/monit-0100-localhost-sendmail.patch
===================================================================
--- branches/1.0/package/monit/monit-0100-localhost-sendmail.patch	2015-10-28 15:59:00 UTC (rev 7292)
+++ branches/1.0/package/monit/monit-0100-localhost-sendmail.patch	2015-10-28 17:10:33 UTC (rev 7293)
@@ -70,7 +70,7 @@
  
 --- monit/src/spawn.c.orig	2014-12-13 12:50:23.000000000 -0600
 +++ monit/src/spawn.c	2014-12-13 13:16:12.000000000 -0600
-@@ -243,3 +243,88 @@
+@@ -244,3 +244,89 @@
  
  }
  
@@ -94,7 +94,8 @@
 +        pid = fork();
 +        if (pid < 0) {
 +                LogError("Cannot fork a new process -- %s\n", STRERROR);
-+                exit(1);
++                pthread_sigmask(SIG_SETMASK, &save, NULL);
++                return;
 +        }
 +
 +        if (pid == 0) {

Modified: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk	2015-10-28 15:59:00 UTC (rev 7292)
+++ branches/1.0/package/monit/monit.mk	2015-10-28 17:10:33 UTC (rev 7293)
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MONIT_VERSION = 5.14
+MONIT_VERSION = 5.15
 MONIT_SITE = http://mmonit.com/monit/dist
 MONIT_DEPENDENCIES = host-bison host-flex
 #

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7292] branches/1.0/package/libsodium/libsodium.mk

[<abe...@us...>]

Revision: 7292
          http://sourceforge.net/p/astlinux/code/7292
Author:   abelbeck
Date:     2015-10-28 15:59:00 +0000 (Wed, 28 Oct 2015)
Log Message:
-----------
libsodium, version bump to 1.0.5

Modified Paths:
--------------
    branches/1.0/package/libsodium/libsodium.mk

Modified: branches/1.0/package/libsodium/libsodium.mk
===================================================================
--- branches/1.0/package/libsodium/libsodium.mk	2015-10-28 15:28:10 UTC (rev 7291)
+++ branches/1.0/package/libsodium/libsodium.mk	2015-10-28 15:59:00 UTC (rev 7292)
@@ -3,7 +3,7 @@
 # libsodium
 #
 #############################################################
-LIBSODIUM_VERSION = 1.0.3
+LIBSODIUM_VERSION = 1.0.5
 LIBSODIUM_SOURCE = libsodium-$(LIBSODIUM_VERSION).tar.gz
 LIBSODIUM_SITE = http://download.dnscrypt.org/libsodium/releases
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7291] branches/1.0/package/ntp/ntp.mk

[<abe...@us...>]

Revision: 7291
          http://sourceforge.net/p/astlinux/code/7291
Author:   abelbeck
Date:     2015-10-28 15:28:10 +0000 (Wed, 28 Oct 2015)
Log Message:
-----------
ntp, version bump to 4.2.8p4, security fixes: CVE-2015-7871 plus 12 other low- and medium-severity vulnerabilities

Modified Paths:
--------------
    branches/1.0/package/ntp/ntp.mk

Modified: branches/1.0/package/ntp/ntp.mk
===================================================================
--- branches/1.0/package/ntp/ntp.mk	2015-10-28 15:02:04 UTC (rev 7290)
+++ branches/1.0/package/ntp/ntp.mk	2015-10-28 15:28:10 UTC (rev 7291)
@@ -3,16 +3,17 @@
 # ntp
 #
 #############################################################
-NTP_VERSION = 4.2.8p3
+NTP_VERSION = 4.2.8p4
 NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz
-NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
+NTP_SITE = --no-check-certificate https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
 NTP_DEPENDENCIES = host-bison host-flex host-pkg-config
 
-NTP_CONF_OPT = --with-shared \
-		--program-transform-name=s,,, \
-		--with-yielding-select=yes \
-		--enable-ipv6=no \
-		--without-ntpsnmpd
+NTP_CONF_OPT = \
+	--with-shared \
+	--program-transform-name=s,,, \
+	--with-yielding-select=yes \
+	--enable-ipv6=no \
+	--without-ntpsnmpd
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 NTP_CONF_OPT += --with-crypto

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7290] branches/1.0/package/fping/fping.mk

[<abe...@us...>]

Revision: 7290
          http://sourceforge.net/p/astlinux/code/7290
Author:   abelbeck
Date:     2015-10-28 15:02:04 +0000 (Wed, 28 Oct 2015)
Log Message:
-----------
fping, version bump to 3.13

Modified Paths:
--------------
    branches/1.0/package/fping/fping.mk

Modified: branches/1.0/package/fping/fping.mk
===================================================================
--- branches/1.0/package/fping/fping.mk	2015-10-28 14:47:21 UTC (rev 7289)
+++ branches/1.0/package/fping/fping.mk	2015-10-28 15:02:04 UTC (rev 7290)
@@ -3,7 +3,7 @@
 # fping
 #
 #############################################################
-FPING_VERSION = 3.10
+FPING_VERSION = 3.13
 FPING_SITE = http://fping.org/dist
 FPING_SOURCE = fping-$(FPING_VERSION).tar.gz
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7289] branches/1.0/package/sipgrep/sipgrep.mk

[<abe...@us...>]

Revision: 7289
          http://sourceforge.net/p/astlinux/code/7289
Author:   abelbeck
Date:     2015-10-28 14:47:21 +0000 (Wed, 28 Oct 2015)
Log Message:
-----------
sipgrep, version bump to 2.1.0

Modified Paths:
--------------
    branches/1.0/package/sipgrep/sipgrep.mk

Modified: branches/1.0/package/sipgrep/sipgrep.mk
===================================================================
--- branches/1.0/package/sipgrep/sipgrep.mk	2015-10-27 22:44:42 UTC (rev 7288)
+++ branches/1.0/package/sipgrep/sipgrep.mk	2015-10-28 14:47:21 UTC (rev 7289)
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SIPGREP_VERSION = 2.0.0
+SIPGREP_VERSION = 2.1.0
 SIPGREP_SOURCE = sipgrep-$(SIPGREP_VERSION).tar.gz
 SIPGREP_SITE = http://files.astlinux.org
 #SIPGREP_SITE = https://github.com/adubovikov/sipgrep/releases

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7288] branches/1.0

[<abe...@us...>]

Revision: 7288
          http://sourceforge.net/p/astlinux/code/7288
Author:   abelbeck
Date:     2015-10-27 22:44:42 +0000 (Tue, 27 Oct 2015)
Log Message:
-----------
wide-dhcpv6, new package, disabled for now.  Adds DHCPv6 client support but configuration is missing. Includes 10 patches from the Debian project to make it current.  Much smaller than dibbler.

Modified Paths:
--------------
    branches/1.0/astlinux-ast11.config
    branches/1.0/astlinux-ast13.config
    branches/1.0/astlinux18.config
    branches/1.0/initrd.config
    branches/1.0/package/Config.in
    branches/1.0/runnix-uclibc.config
    branches/1.0/runnix.config

Added Paths:
-----------
    branches/1.0/package/wide-dhcpv6/
    branches/1.0/package/wide-dhcpv6/Config.in
    branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0001-Fix-manpages.patch
    branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0002-Don-t-strip-binaries.patch
    branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0003-Close-inherited-file-descriptors.patch
    branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0004-GNU-libc6-fixes.patch
    branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0005-Update-ifid-on-interface-restart.patch
    branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0006-Add-new-feature-dhcp6c-profiles.patch
    branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0007-Adding-ifid-option-to-the-dhcp6c.conf-prefix-interfa.patch
    branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0008-Close-file-descriptors-on-exec.patch
    branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0009-Fix-renewal-of-IA-NA.patch
    branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0010-Call-client-script-after-interfaces-have-been-update.patch
    branches/1.0/package/wide-dhcpv6/wide-dhcpv6.mk

Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config	2015-10-26 21:58:09 UTC (rev 7287)
+++ branches/1.0/astlinux-ast11.config	2015-10-27 22:44:42 UTC (rev 7288)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7286-dirty Configuration
-# Mon Oct 26 16:51:59 2015
+# Buildroot 2011.08-svn7287-dirty Configuration
+# Tue Oct 27 17:37:38 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -799,6 +799,7 @@
 # BR2_PACKAGE_VPNC is not set
 BR2_PACKAGE_VSFTPD=y
 # BR2_PACKAGE_VTUN is not set
+# BR2_PACKAGE_WIDE_DHCPV6 is not set
 # BR2_PACKAGE_WIRELESS_TOOLS is not set
 # BR2_PACKAGE_WPA_SUPPLICANT is not set
 

Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config	2015-10-26 21:58:09 UTC (rev 7287)
+++ branches/1.0/astlinux-ast13.config	2015-10-27 22:44:42 UTC (rev 7288)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7286-dirty Configuration
-# Mon Oct 26 16:52:01 2015
+# Buildroot 2011.08-svn7287-dirty Configuration
+# Tue Oct 27 17:37:39 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -799,6 +799,7 @@
 # BR2_PACKAGE_VPNC is not set
 BR2_PACKAGE_VSFTPD=y
 # BR2_PACKAGE_VTUN is not set
+# BR2_PACKAGE_WIDE_DHCPV6 is not set
 # BR2_PACKAGE_WIRELESS_TOOLS is not set
 # BR2_PACKAGE_WPA_SUPPLICANT is not set
 

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2015-10-26 21:58:09 UTC (rev 7287)
+++ branches/1.0/astlinux18.config	2015-10-27 22:44:42 UTC (rev 7288)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7286-dirty Configuration
-# Mon Oct 26 16:51:52 2015
+# Buildroot 2011.08-svn7287-dirty Configuration
+# Tue Oct 27 17:37:36 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -799,6 +799,7 @@
 # BR2_PACKAGE_VPNC is not set
 BR2_PACKAGE_VSFTPD=y
 # BR2_PACKAGE_VTUN is not set
+# BR2_PACKAGE_WIDE_DHCPV6 is not set
 # BR2_PACKAGE_WIRELESS_TOOLS is not set
 # BR2_PACKAGE_WPA_SUPPLICANT is not set
 

Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config	2015-10-26 21:58:09 UTC (rev 7287)
+++ branches/1.0/initrd.config	2015-10-27 22:44:42 UTC (rev 7288)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7286-dirty Configuration
-# Mon Oct 26 16:52:31 2015
+# Buildroot 2011.08-svn7287-dirty Configuration
+# Tue Oct 27 17:37:43 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -645,6 +645,7 @@
 # BR2_PACKAGE_VPNC is not set
 # BR2_PACKAGE_VSFTPD is not set
 # BR2_PACKAGE_VTUN is not set
+# BR2_PACKAGE_WIDE_DHCPV6 is not set
 # BR2_PACKAGE_WIRELESS_TOOLS is not set
 # BR2_PACKAGE_WPA_SUPPLICANT is not set
 

Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in	2015-10-26 21:58:09 UTC (rev 7287)
+++ branches/1.0/package/Config.in	2015-10-27 22:44:42 UTC (rev 7288)
@@ -552,6 +552,7 @@
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/wget/Config.in"
 endif
+source "package/wide-dhcpv6/Config.in"
 source "package/wireless_tools/Config.in"
 source "package/wpa_supplicant/Config.in"
 

Added: branches/1.0/package/wide-dhcpv6/Config.in
===================================================================
--- branches/1.0/package/wide-dhcpv6/Config.in	                        (rev 0)
+++ branches/1.0/package/wide-dhcpv6/Config.in	2015-10-27 22:44:42 UTC (rev 7288)
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_WIDE_DHCPV6
+	bool "wide-dhcpv6"
+	help
+	  WIDE-DHCPv6 is an open-source implementation of Dynamic Host Configuration Protocol
+	  for IPv6 (DHCPv6) originally developed by the KAME project.
+
+	  This package installs the client component.
+
+	  http://sourceforge.net/projects/wide-dhcpv6/
+
+	  Debian Patches:
+	  http://git.famille-corbier.net/?p=packages/wide-dhcpv6.git;a=summary
+	  http://http.debian.net/debian/pool/main/w/wide-dhcpv6/wide-dhcpv6_20080615-13.debian.tar.xz
+

Added: branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0001-Fix-manpages.patch
===================================================================
--- branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0001-Fix-manpages.patch	                        (rev 0)
+++ branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0001-Fix-manpages.patch	2015-10-27 22:44:42 UTC (rev 7288)
@@ -0,0 +1,168 @@
+From e9fd60840eb125dcd55aab859dd838a47c02931f Mon Sep 17 00:00:00 2001
+From: Jeremie Corbier <jer...@fa...>
+Date: Tue, 6 Apr 2010 15:51:03 +0200
+Subject: [PATCH] Fix manpages
+
+This patch fixes wide-dhcpv6 manpages (paths, typos, ...).
+
+Signed-off-by: Jeremie Corbier <je...@fa...>
+---
+ dhcp6c.8      |    8 ++++----
+ dhcp6c.conf.5 |    4 ++--
+ dhcp6ctl.8    |   13 ++++++-------
+ dhcp6relay.8  |    1 -
+ dhcp6s.8      |   10 +++++-----
+ dhcp6s.conf.5 |    2 +-
+ 6 files changed, 18 insertions(+), 20 deletions(-)
+
+diff --git a/dhcp6c.8 b/dhcp6c.8
+index 6824ae0..1d69c9d 100644
+--- a/dhcp6c.8
++++ b/dhcp6c.8
+@@ -114,13 +114,13 @@ In either case,
+ will send DHCPv6 Release messages to release resources assigned from servers.
+ .\"
+ .Sh FILES
+-.Bl -tag -width /usr/local/etc/dhcp6c.conf -compact
++.Bl -tag -width /etc/wide-dhcpv6/dhcp6c.conf -compact
+ .It Pa /var/run/dhcp6c.pid
+ is the default file that contains pid of the currently running
+ .Nm dhcp6c .
+-.It Pa /usr/local/etc/dhcp6c.conf
++.It Pa /etc/wide-dhcpv6/dhcp6c.conf
+ is the default configuration file.
+-.It Pa /var/db/dhcp6c_duid
++.It Pa /var/lib/dhcpv6/dhcp6c_duid
+ is the file to store the client's DUID.
+ .El
+ .Sh Configuration Script
+@@ -203,6 +203,6 @@ command first appeared in WIDE/KAME IPv6 protocol stack kit.
+ is incomplete and violates DHCPv6 protocol spec, in several aspects.
+ In particular, temporary address assignment is intentionally omitted.
+ .Pp
+-Information Refresh Time Option is not recognied in Info-req mode, since
++Information Refresh Time Option is not recognized in Info-req mode, since
+ .Nm
+ terminates after it receives a REPLY message.
+diff --git a/dhcp6c.conf.5 b/dhcp6c.conf.5
+index 611ab4f..5fc03d3 100644
+--- a/dhcp6c.conf.5
++++ b/dhcp6c.conf.5
+@@ -36,7 +36,7 @@
+ .Nd DHCPv6 client configuration file
+ .\"
+ .Sh SYNOPSIS
+-.Pa /usr/local/etc/dhcp6c.conf
++.Pa /etc/wide-dhcpv6/dhcp6c.conf
+ .\"
+ .Sh DESCRIPTION
+ The
+@@ -630,7 +630,7 @@ execute the
+ .Xr openssl 1
+ command (when available) as follows,
+ .Bd -literal -offset
+-% openssl rand -base64 16
++% openssl rand \-base64 16
+ .Ed
+ .Pp
+ and copy the output to the
+diff --git a/dhcp6ctl.8 b/dhcp6ctl.8
+index 86ea0e1..e11889b 100644
+--- a/dhcp6ctl.8
++++ b/dhcp6ctl.8
+@@ -85,12 +85,11 @@ Use
+ .Ar keyfile
+ to provide the shared secret to communicate with the process.
+ The default file name used when unspecified is
+-.Pa /usr/local/etc/dhcp6cctlkey
++.Pa /etc/wide-dhcpv6/dhcp6cctlkey
+ with a client,
+ and
+-.Pa /usr/local/etc/dhcp6sctlkey
++.Pa /etc/wide-dhcpv6/dhcp6sctlkey
+ with a server.
+-
+ .It Fl p Ar port
+ Specify
+ .Ar port
+@@ -99,7 +98,7 @@ The default port number used when unspecified is 5546 for a client,
+ and 5547 for a server.
+ .It Fl s Ar address
+ Specify
+-.A address
++.Ar address
+ as the listening address of the process.
+ The default address used when unspecified is ::1.
+ .El
+@@ -183,10 +182,10 @@ information (if any) and exits.
+ .El
+ .\"
+ .Sh FILES
+-.Bl -tag -width /usr/local/etc/dhcp6cctlkey -compact
+-.It Pa /usr/local/etc/dhcp6cctlkey
++.Bl -tag -width /etc/wide-dhcpv6/dhcp6cctlkey -compact
++.It Pa /etc/wide-dhcpv6/dhcp6cctlkey
+ is the default key file to communicate with a client.
+-.It Pa /usr/local/etc/dhcp6sctlkey
++.It Pa /etc/wide-dhcpv6/dhcp6sctlkey
+ is the default key file to communicate with a server.
+ .El
+ .\"
+diff --git a/dhcp6relay.8 b/dhcp6relay.8
+index 4f761b0..7ad8ada 100644
+--- a/dhcp6relay.8
++++ b/dhcp6relay.8
+@@ -107,7 +107,6 @@ to dump the process ID of
+ is the default file that contains pid of the currently running
+ .Nm .
+ .El
+-
+ .Sh SEE ALSO
+ .Xr dhcp6c 8 ,
+ .Xr dhcp6s 8
+diff --git a/dhcp6s.8 b/dhcp6s.8
+index 888117a..29dcc7b 100644
+--- a/dhcp6s.8
++++ b/dhcp6s.8
+@@ -102,7 +102,7 @@ Use
+ to store the shared secret to authenticate the communication with
+ .Nm dhcp6ctl .
+ The default file name used when unspecified is
+-.Pa /usr/local/etc/dhcp6sctlkey .
++.Pa /etc/wide-dhcpv6/dhcp6sctlkey .
+ The default name is intentionally same as that for
+ .Nm dhcp6ctl
+ so that the server and the control command can share the file when
+@@ -122,12 +122,12 @@ to dump the process ID of
+ .El
+ .\"
+ .Sh FILES
+-.Bl -tag -width /usr/local/etc/dhcp6s.conf -compact
+-.It Pa /usr/local/etc/dhcp6s.conf
++.Bl -tag -width /etc/wide-dhcpv6/dhcp6s.conf -compact
++.It Pa /etc/wide-dhcpv6/dhcp6s.conf
+ is the default configuration file.
+-.It Pa /var/db/dhcp6s_duid
++.It Pa /var/lib/dhcpv6/dhcp6s_duid
+ is the default file to store the server's DUID.
+-.It Pa /usr/local/etc/dhcp6sctlkey
++.It Pa /etc/wide-dhcpv6/dhcp6sctlkey
+ is the default key file to communicate with the control command.
+ See
+ .Xr dhcp6ctl 8
+diff --git a/dhcp6s.conf.5 b/dhcp6s.conf.5
+index 1206764..2cb08ce 100644
+--- a/dhcp6s.conf.5
++++ b/dhcp6s.conf.5
+@@ -36,7 +36,7 @@
+ .Nd DHCPv6 server configuration file
+ .\"
+ .Sh SYNOPSIS
+-.Pa /usr/local/etc/dhcp6s.conf
++.Pa /etc/wide-dhcpv6/dhcp6s.conf
+ .\"
+ .Sh DESCRIPTION
+ The
+-- 
+1.5.6.5
+

Added: branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0002-Don-t-strip-binaries.patch
===================================================================
--- branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0002-Don-t-strip-binaries.patch	                        (rev 0)
+++ branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0002-Don-t-strip-binaries.patch	2015-10-27 22:44:42 UTC (rev 7288)
@@ -0,0 +1,28 @@
+From 30c43a801bd5b4bb96c878d2efc97042511fea92 Mon Sep 17 00:00:00 2001
+From: Jeremie Corbier <jer...@fa...>
+Date: Tue, 6 Apr 2010 15:51:06 +0200
+Subject: [PATCH] Don't strip binaries
+
+This patch prevents wide-dhcpv6 build system from stripping built binaries.
+
+Signed-off-by: Jeremie Corbier <je...@fa...>
+---
+ Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index a39596f..de25f48 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -103,7 +103,7 @@ $(srcdir)/ianaopts.h: gentab.pl bootp-dhcp-parameters
+ 
+ install::
+ 	-mkdir -p $(sbindir) $(mandir)/man5 $(mandir)/man8
+-	$(INSTALL_PROGRAM) -s -o $(user) -g $(group) $(TARGET) $(sbindir)
++	$(INSTALL_PROGRAM) -o $(user) -g $(group) $(TARGET) $(sbindir)
+ 	$(INSTALL_DATA) -o $(user) -g $(group) dhcp6c.8 $(mandir)/man8
+ 	$(INSTALL_DATA) -o $(user) -g $(group) dhcp6s.8 $(mandir)/man8
+ 	$(INSTALL_DATA) -o $(user) -g $(group) dhcp6relay.8 $(mandir)/man8
+-- 
+1.5.6.5
+

Added: branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0003-Close-inherited-file-descriptors.patch
===================================================================
--- branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0003-Close-inherited-file-descriptors.patch	                        (rev 0)
+++ branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0003-Close-inherited-file-descriptors.patch	2015-10-27 22:44:42 UTC (rev 7288)
@@ -0,0 +1,80 @@
+From 2bb6f1769a5c3ea4f669382801c9bb2b74881d48 Mon Sep 17 00:00:00 2001
+From: Jeremie Corbier <jer...@fa...>
+Date: Tue, 6 Apr 2010 15:51:08 +0200
+Subject: [PATCH] Close inherited file descriptors
+
+wide-dhcpv6 binaries should close inherited fds.
+
+Signed-off-by: Jeremie Corbier <je...@fa...>
+---
+ dhcp6c.c     |    7 ++++++-
+ dhcp6relay.c |    6 ++++++
+ dhcp6s.c     |    5 +++++
+ 3 files changed, 17 insertions(+), 1 deletions(-)
+
+diff --git a/dhcp6c.c b/dhcp6c.c
+index 1caaaa5..b5f5ed7 100644
+--- a/dhcp6c.c
++++ b/dhcp6c.c
+@@ -159,6 +159,7 @@ main(argc, argv)
+ 	char *progname;
+ 	FILE *pidfp;
+ 	struct dhcp6_if *ifp;
++	int fd;
+ 
+ #ifndef HAVE_ARC4RANDOM
+ 	srandom(time(NULL) & getpid());
+@@ -205,8 +206,12 @@ main(argc, argv)
+ 		exit(0);
+ 	}
+ 
+-	if (foreground == 0)
++	if (foreground == 0) {
++		for (fd = 3; fd < 1024; fd++)
++			close(fd);
++
+ 		openlog(progname, LOG_NDELAY|LOG_PID, LOG_DAEMON);
++	}
+ 
+ 	setloglevel(debug);
+ 
+diff --git a/dhcp6relay.c b/dhcp6relay.c
+index fb84ce3..eb0bce9 100644
+--- a/dhcp6relay.c
++++ b/dhcp6relay.c
+@@ -207,8 +207,14 @@ main(argc, argv)
+ 	}
+ 
+ 	if (foreground == 0) {
++		int fd;
++
+ 		if (daemon(0, 0) < 0)
+ 			err(1, "daemon");
++
++		for (fd = 3; fd < 1024; fd++)
++			close(fd);
++
+ 		openlog(progname, LOG_NDELAY|LOG_PID, LOG_DAEMON);
+ 	}
+ 	setloglevel(debug);
+diff --git a/dhcp6s.c b/dhcp6s.c
+index 544afff..494e571 100644
+--- a/dhcp6s.c
++++ b/dhcp6s.c
+@@ -316,8 +316,13 @@ main(argc, argv)
+ 	}
+ 
+ 	if (foreground == 0) {
++		int fd;
++
+ 		if (daemon(0, 0) < 0)
+ 			err(1, "daemon");
++
++		for (fd = 3; fd < 1024; fd++)
++			close(fd);
+ 	}
+ 
+ 	/* dump current PID */
+-- 
+1.5.6.5
+

Added: branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0004-GNU-libc6-fixes.patch
===================================================================
--- branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0004-GNU-libc6-fixes.patch	                        (rev 0)
+++ branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0004-GNU-libc6-fixes.patch	2015-10-27 22:44:42 UTC (rev 7288)
@@ -0,0 +1,6710 @@
+From 78c2ba34951f378f847aaeb0b82fa6be9014ad46 Mon Sep 17 00:00:00 2001
+From: Jeremie Corbier <jer...@fa...>
+Date: Tue, 6 Apr 2010 15:51:10 +0200
+Subject: [PATCH] GNU libc6 fixes
+
+Fixes for recent libc releases.
+
+Signed-off-by: Jeremie Corbier <je...@fa...>
+---
+ addrconf.c          |   16 +-
+ cftoken.c           |   12 +-
+ cftoken.l           |   12 +-
+ common.c            |  226 +++++++++++++-------------
+ common.h            |    2 +-
+ config.c            |  268 +++++++++++++++---------------
+ configure           |   50 ++++++-
+ configure.in        |    7 +
+ dhcp6.h             |    7 +
+ dhcp6_ctl.c         |   40 +++---
+ dhcp6c.c            |  246 ++++++++++++++--------------
+ dhcp6c_ia.c         |   86 +++++-----
+ dhcp6c_script.c     |   36 ++--
+ dhcp6relay.c        |  118 +++++++-------
+ dhcp6relay_script.c |   28 ++--
+ dhcp6s.c            |  446 +++++++++++++++++++++++++-------------------------
+ if.c                |   12 +-
+ lease.c             |   14 +-
+ prefixconf.c        |   24 ++--
+ timer.c             |    6 +-
+ 20 files changed, 859 insertions(+), 797 deletions(-)
+
+diff --git a/addrconf.c b/addrconf.c
+index d98373f..98d03e5 100644
+--- a/addrconf.c
++++ b/addrconf.c
+@@ -122,7 +122,7 @@ update_address(ia, addr, dhcpifp, ctlp, callback)
+ 	if (addr->vltime != DHCP6_DURATION_INFINITE &&
+ 	    (addr->pltime == DHCP6_DURATION_INFINITE ||
+ 	    addr->pltime > addr->vltime)) {
+-		dprintf(LOG_INFO, FNAME, "invalid address %s: "
++		debug_printf(LOG_INFO, FNAME, "invalid address %s: "
+ 		    "pltime (%lu) is larger than vltime (%lu)",
+ 		    in6addr2str(&addr->addr, 0),
+ 		    addr->pltime, addr->vltime);
+@@ -131,7 +131,7 @@ update_address(ia, addr, dhcpifp, ctlp, callback)
+ 
+ 	if (iac_na == NULL) {
+ 		if ((iac_na = malloc(sizeof(*iac_na))) == NULL) {
+-			dprintf(LOG_NOTICE, FNAME, "memory allocation failed");
++			debug_printf(LOG_NOTICE, FNAME, "memory allocation failed");
+ 			return (-1);
+ 		}
+ 		memset(iac_na, 0, sizeof(*iac_na));
+@@ -152,7 +152,7 @@ update_address(ia, addr, dhcpifp, ctlp, callback)
+ 	/* search for the given address, and make a new one if it fails */
+ 	if ((sa = find_addr(&iac_na->statefuladdr_head, addr)) == NULL) {
+ 		if ((sa = malloc(sizeof(*sa))) == NULL) {
+-			dprintf(LOG_NOTICE, FNAME, "memory allocation failed");
++			debug_printf(LOG_NOTICE, FNAME, "memory allocation failed");
+ 			return (-1);
+ 		}
+ 		memset(sa, 0, sizeof(*sa));
+@@ -169,7 +169,7 @@ update_address(ia, addr, dhcpifp, ctlp, callback)
+ 	sa->addr.pltime = addr->pltime;
+ 	sa->addr.vltime = addr->vltime;
+ 	sa->dhcpif = dhcpifp;
+-	dprintf(LOG_DEBUG, FNAME, "%s an address %s pltime=%lu, vltime=%lu",
++	debug_printf(LOG_DEBUG, FNAME, "%s an address %s pltime=%lu, vltime=%lu",
+ 	    sacreate ? "create" : "update",
+ 	    in6addr2str(&addr->addr, 0), addr->pltime, addr->vltime);
+ 
+@@ -194,7 +194,7 @@ update_address(ia, addr, dhcpifp, ctlp, callback)
+ 		if (sa->timer == NULL) {
+ 			sa->timer = dhcp6_add_timer(addr_timo, sa);
+ 			if (sa->timer == NULL) {
+-				dprintf(LOG_NOTICE, FNAME,
++				debug_printf(LOG_NOTICE, FNAME,
+ 				    "failed to add stateful addr timer");
+ 				remove_addr(sa); /* XXX */
+ 				return (-1);
+@@ -233,7 +233,7 @@ remove_addr(sa)
+ {
+ 	int ret;
+ 
+-	dprintf(LOG_DEBUG, FNAME, "remove an address %s",
++	debug_printf(LOG_DEBUG, FNAME, "remove an address %s",
+ 	    in6addr2str(&sa->addr.addr, 0));
+ 
+ 	if (sa->timer)
+@@ -343,7 +343,7 @@ na_renew_data_free(evd)
+ 	struct dhcp6_list *ial;
+ 
+ 	if (evd->type != DHCP6_EVDATA_IANA) {
+-		dprintf(LOG_ERR, FNAME, "assumption failure");
++		debug_printf(LOG_ERR, FNAME, "assumption failure");
+ 		exit(1);
+ 	}
+ 
+@@ -362,7 +362,7 @@ addr_timo(arg)
+ 	struct ia *ia;
+ 	void (*callback)__P((struct ia *));
+ 
+-	dprintf(LOG_DEBUG, FNAME, "address timeout for %s",
++	debug_printf(LOG_DEBUG, FNAME, "address timeout for %s",
+ 	    in6addr2str(&sa->addr.addr, 0));
+ 
+ 	ia = sa->ctl->iacna_ia;
+diff --git a/cftoken.c b/cftoken.c
+index fcccc5a..0f6c1bf 100644
+--- a/cftoken.c
++++ b/cftoken.c
+@@ -2475,10 +2475,10 @@ cfdebug_print(w, t, l)
+ 	int l;
+ {
+ 	if (w) {
+-		dprintf(LOG_DEBUG, FNAME,
++		debug_printf(LOG_DEBUG, FNAME,
+ 		    "<%d>%s [%s] (%d)", yy_start, w, t, l);
+ 	} else {
+-		dprintf(LOG_DEBUG, FNAME,
++		debug_printf(LOG_DEBUG, FNAME,
+ 		    "<%d>[%s] (%d)", yy_start, t, l);
+ 	}
+ }
+@@ -2494,7 +2494,7 @@ yyerror0(int level, char *s, va_list ap)
+ 	if (bp < ep)
+ 		bp += vsnprintf(bp, ep - bp, s, ap);
+ 
+-	dprintf(level, FNAME, ebuf);
++	debug_printf(level, FNAME, ebuf);
+ }
+ 
+ void
+@@ -2532,7 +2532,7 @@ cfswitch_buffer(incl)
+ 	FILE *fp;
+ 
+ 	if (incstackp >= MAX_INCLUDE_DEPTH) {
+-		dprintf(LOG_ERR, FNAME, "cfparse: includes nested too deeply");
++		debug_printf(LOG_ERR, FNAME, "cfparse: includes nested too deeply");
+ 		return (-1);
+ 	}
+ 	incstack[incstackp].path = configfilename;
+@@ -2541,7 +2541,7 @@ cfswitch_buffer(incl)
+ 
+ 	fp = fopen(path, "r");
+ 	if (fp == NULL) {
+-		dprintf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s",
++		debug_printf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s",
+ 			path, strerror(errno));
+ 		if (errno == ENOENT)
+ 			return (0);
+@@ -2563,7 +2563,7 @@ cfparse(conf)
+ {
+ 	configfilename = conf;
+ 	if ((yyin = fopen(configfilename, "r")) == NULL) {
+-		dprintf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s",
++		debug_printf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s",
+ 			configfilename, strerror(errno));
+ 		if (errno == ENOENT)
+ 			return (0);
+diff --git a/cftoken.l b/cftoken.l
+index ece7fbb..ad4128d 100644
+--- a/cftoken.l
++++ b/cftoken.l
+@@ -340,10 +340,10 @@ cfdebug_print(w, t, l)
+ 	int l;
+ {
+ 	if (w) {
+-		dprintf(LOG_DEBUG, FNAME,
++		debug_printf(LOG_DEBUG, FNAME,
+ 		    "<%d>%s [%s] (%d)", yy_start, w, t, l);
+ 	} else {
+-		dprintf(LOG_DEBUG, FNAME,
++		debug_printf(LOG_DEBUG, FNAME,
+ 		    "<%d>[%s] (%d)", yy_start, t, l);
+ 	}
+ }
+@@ -359,7 +359,7 @@ yyerror0(int level, char *s, va_list ap)
+ 	if (bp < ep)
+ 		bp += vsnprintf(bp, ep - bp, s, ap);
+ 
+-	dprintf(level, FNAME, ebuf);
++	debug_printf(level, FNAME, ebuf);
+ }
+ 
+ void
+@@ -397,7 +397,7 @@ cfswitch_buffer(incl)
+ 	FILE *fp;
+ 
+ 	if (incstackp >= MAX_INCLUDE_DEPTH) {
+-		dprintf(LOG_ERR, FNAME, "cfparse: includes nested too deeply");
++		debug_printf(LOG_ERR, FNAME, "cfparse: includes nested too deeply");
+ 		return (-1);
+ 	}
+ 	incstack[incstackp].path = configfilename;
+@@ -406,7 +406,7 @@ cfswitch_buffer(incl)
+ 
+ 	fp = fopen(path, "r");
+ 	if (fp == NULL) {
+-		dprintf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s",
++		debug_printf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s",
+ 			path, strerror(errno));
+ 		if (errno == ENOENT)
+ 			return (0);
+@@ -428,7 +428,7 @@ cfparse(conf)
+ {
+ 	configfilename = conf;
+ 	if ((yyin = fopen(configfilename, "r")) == NULL) {
+-		dprintf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s",
++		debug_printf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s",
+ 			configfilename, strerror(errno));
+ 		if (errno == ENOENT)
+ 			return (0);
+diff --git a/common.c b/common.c
+index f35399c..cc4abcc 100644
+--- a/common.c
++++ b/common.c
+@@ -265,7 +265,7 @@ dhcp6_add_listval(head, type, val, sublist)
+ 	struct dhcp6_listval *lv = NULL;
+ 
+ 	if ((lv = malloc(sizeof(*lv))) == NULL) {
+-		dprintf(LOG_ERR, FNAME,
++		debug_printf(LOG_ERR, FNAME,
+ 		    "failed to allocate memory for list entry");
+ 		goto fail;
+ 	}
+@@ -298,7 +298,7 @@ dhcp6_add_listval(head, type, val, sublist)
+ 			goto fail;
+ 		break;
+ 	default:
+-		dprintf(LOG_ERR, FNAME,
++		debug_printf(LOG_ERR, FNAME,
+ 		    "unexpected list value type (%d)", type);
+ 		goto fail;
+ 	}
+@@ -361,7 +361,7 @@ dhcp6_get_addr(optlen, cp, type, list)
+ 	void *val;
+ 
+ 	if (optlen % sizeof(struct in6_addr) || optlen == 0) {
+-		dprintf(LOG_INFO, FNAME,
++		debug_printf(LOG_INFO, FNAME,
+ 		    "malformed DHCP option: type %d, len %d", type, optlen);
+ 		return -1;
+ 	}
+@@ -371,14 +371,14 @@ dhcp6_get_addr(optlen, cp, type, list)
+ 		memcpy(&valaddr, val, sizeof(valaddr));
+ 		if (dhcp6_find_listval(list,
+ 		    DHCP6_LISTVAL_ADDR6, &valaddr, 0)) {
+-			dprintf(LOG_INFO, FNAME, "duplicated %s address (%s)",
++			debug_printf(LOG_INFO, FNAME, "duplicated %s address (%s)",
+ 			    dhcp6optstr(type), in6addr2str(&valaddr, 0));
+ 			continue;
+ 		}
+ 
+ 		if (dhcp6_add_listval(list, DHCP6_LISTVAL_ADDR6,
+ 		    &valaddr, NULL) == NULL) {
+-			dprintf(LOG_ERR, FNAME,
++			debug_printf(LOG_ERR, FNAME,
+ 			    "failed to copy %s address", dhcp6optstr(type));
+ 			return -1;
+ 		}
+@@ -405,7 +405,7 @@ dhcp6_set_addr(type, list, p, optep, len)
+ 	tmpbuf = NULL;
+ 	optlen = dhcp6_count_list(list) * sizeof(struct in6_addr);
+ 	if ((tmpbuf = malloc(optlen)) == NULL) {
+-		dprintf(LOG_ERR, FNAME,
++		debug_printf(LOG_ERR, FNAME,
+ 		    "memory allocation failed for %s options",
+ 		    dhcp6optstr(type));
+ 		return -1;
+@@ -438,10 +438,10 @@ dhcp6_get_domain(optlen, cp, type, list)
+ 
+ 		if (dnsdecode((u_char **)(void *)&val,
+ 		    (u_char *)(cp + optlen), name, sizeof(name)) == NULL) {
+-			dprintf(LOG_INFO, FNAME, "failed to "
++			debug_printf(LOG_INFO, FNAME, "failed to "
+ 			    "decode a %s domain name",
+ 			    dhcp6optstr(type));
+-			dprintf(LOG_INFO, FNAME,
++			debug_printf(LOG_INFO, FNAME,
+ 			    "malformed DHCP option: type %d, len %d",
+ 			     type, optlen);
+ 			return -1;
+@@ -452,7 +452,7 @@ dhcp6_get_domain(optlen, cp, type, list)
+ 
+ 		if (dhcp6_add_listval(list,
+ 		    DHCP6_LISTVAL_VBUF, &vb, NULL) == NULL) {
+-			dprintf(LOG_ERR, FNAME, "failed to "
++			debug_printf(LOG_ERR, FNAME, "failed to "
+ 			    "copy a %s domain name", dhcp6optstr(type));
+ 			return -1;
+ 		}
+@@ -485,7 +485,7 @@ dhcp6_set_domain(type, list, p, optep, len)
+ 
+ 	tmpbuf = NULL;
+ 	if ((tmpbuf = malloc(optlen)) == NULL) {
+-		dprintf(LOG_ERR, FNAME, "memory allocation failed for "
++		debug_printf(LOG_ERR, FNAME, "memory allocation failed for "
+ 		    "%s domain options", dhcp6optstr(type));
+ 		return -1;
+ 	}
+@@ -497,14 +497,14 @@ dhcp6_set_domain(type, list, p, optep, len)
+ 		nlen = dnsencode((const char *)d->val_vbuf.dv_buf,
+ 		    name, sizeof (name));
+ 		if (nlen < 0) {
+-			dprintf(LOG_ERR, FNAME,
++			debug_printf(LOG_ERR, FNAME,
+ 			    "failed to encode a %s domain name",
+ 			    dhcp6optstr(type));
+ 			free(tmpbuf);
+ 			return -1;
+ 		}
+ 		if (ep - cp < nlen) {
+-			dprintf(LOG_ERR, FNAME,
++			debug_printf(LOG_ERR, FNAME,
+ 			    "buffer length for %s domain name is too short",
+ 			    dhcp6optstr(type));
+ 			free(tmpbuf);
+@@ -530,7 +530,7 @@ dhcp6_create_event(ifp, state)
+ 	struct dhcp6_event *ev;
+ 
+ 	if ((ev = malloc(sizeof(*ev))) == NULL) {
+-		dprintf(LOG_ERR, FNAME,
++		debug_printf(LOG_ERR, FNAME,
+ 		    "failed to allocate memory for an event");
+ 		return (NULL);
+ 	}
+@@ -548,7 +548,7 @@ dhcp6_remove_event(ev)
+ {
+ 	struct dhcp6_serverinfo *sp, *sp_next;
+ 
+-	dprintf(LOG_DEBUG, FNAME, "removing an event on %s, state=%s",
++	debug_printf(LOG_DEBUG, FNAME, "removing an event on %s, state=%s",
+ 	    ev->ifp->ifname, dhcp6_event_statestr(ev));
+ 
+ 	dhcp6_remove_evdata(ev);
+@@ -562,7 +562,7 @@ dhcp6_remove_event(ev)
+ 	for (sp = ev->servers; sp; sp = sp_next) {
+ 		sp_next = sp->next;
+ 
+-		dprintf(LOG_DEBUG, FNAME, "removing server (ID: %s)",
++		debug_printf(LOG_DEBUG, FNAME, "removing server (ID: %s)",
+ 		    duidstr(&sp->optinfo.serverID));
+ 		dhcp6_clear_options(&sp->optinfo);
+ 		if (sp->authparam != NULL)
+@@ -649,14 +649,14 @@ dhcp6_auth_replaycheck(method, prev, current)
+ 	char bufcurrent[] = "ffff ffff ffff ffff";
+ 
+ 	if (method != DHCP6_AUTHRDM_MONOCOUNTER) {
+-		dprintf(LOG_ERR, FNAME, "unsupported replay detection "
++		debug_printf(LOG_ERR, FNAME, "unsupported replay detection "
+ 		    "method (%d)", method);
+ 		return (-1);
+ 	}
+ 
+ 	(void)sprint_uint64(bufprev, sizeof(bufprev), prev);
+ 	(void)sprint_uint64(bufcurrent, sizeof(bufcurrent), current);
+-	dprintf(LOG_DEBUG, FNAME, "previous: %s, current: %s",
++	debug_printf(LOG_DEBUG, FNAME, "previous: %s, current: %s",
+ 	    bufprev, bufcurrent);
+ 
+ 	prev = ntohq(prev);
+@@ -667,7 +667,7 @@ dhcp6_auth_replaycheck(method, prev, current)
+ 	 * whether the serial number is increasing or not.
+ 	 */
+         if (prev == (current ^ 0x8000000000000000ULL)) {
+-		dprintf(LOG_INFO, FNAME, "detected a singular point");
++		debug_printf(LOG_INFO, FNAME, "detected a singular point");
+ 		return (1);
+ 	}
+ 
+@@ -688,7 +688,7 @@ getifaddr(addr, ifnam, prefix, plen, strong, ignoreflags)
+ 	int error = -1;
+ 
+ 	if (getifaddrs(&ifap) != 0) {
+-		dprintf(LOG_WARNING, FNAME,
++		debug_printf(LOG_WARNING, FNAME,
+ 			"getifaddrs failed: %s", strerror(errno));
+ 		return (-1);
+ 	}
+@@ -765,7 +765,7 @@ getifidfromaddr(addr, ifidp)
+ 	int retval = -1;
+ 
+ 	if (getifaddrs(&ifap) != 0) {
+-		dprintf(LOG_WARNING, FNAME,
++		debug_printf(LOG_WARNING, FNAME,
+ 			"getifaddrs failed: %s", strerror(errno));
+ 		return (-1);
+ 	}
+@@ -781,7 +781,7 @@ getifidfromaddr(addr, ifidp)
+ 
+ 	if (ifa != NULL) {
+ 		if ((ifid = if_nametoindex(ifa->ifa_name)) == 0) {
+-			dprintf(LOG_ERR, FNAME,
++			debug_printf(LOG_ERR, FNAME,
+ 			    "if_nametoindex failed for %s", ifa->ifa_name);
+ 			goto end;
+ 		}
+@@ -999,20 +999,20 @@ get_duid(idfile, duid)
+ 	char tmpbuf[256];	/* DUID should be no more than 256 bytes */
+ 
+ 	if ((fp = fopen(idfile, "r")) == NULL && errno != ENOENT)
+-		dprintf(LOG_NOTICE, FNAME, "failed to open DUID file: %s",
++		debug_printf(LOG_NOTICE, FNAME, "failed to open DUID file: %s",
+ 		    idfile);
+ 
+ 	if (fp) {
+ 		/* decode length */
+ 		if (fread(&len, sizeof(len), 1, fp) != 1) {
+-			dprintf(LOG_ERR, FNAME, "DUID file corrupted");
++			debug_printf(LOG_ERR, FNAME, "DUID file corrupted");
+ 			goto fail;
+ 		}
+ 	} else {
+ 		int l;
+ 
+ 		if ((l = gethwid(tmpbuf, sizeof(tmpbuf), NULL, &hwtype)) < 0) {
+-			dprintf(LOG_INFO, FNAME,
++			debug_printf(LOG_INFO, FNAME,
+ 			    "failed to get a hardware address");
+ 			goto fail;
+ 		}
+@@ -1022,18 +1022,18 @@ get_duid(idfile, duid)
+ 	memset(duid, 0, sizeof(*duid));
+ 	duid->duid_len = len;
+ 	if ((duid->duid_id = (char *)malloc(len)) == NULL) {
+-		dprintf(LOG_ERR, FNAME, "failed to allocate memory");
++		debug_printf(LOG_ERR, FNAME, "failed to allocate memory");
+ 		goto fail;
+ 	}
+ 
+ 	/* copy (and fill) the ID */
+ 	if (fp) {
+ 		if (fread(duid->duid_id, len, 1, fp) != 1) {
+-			dprintf(LOG_ERR, FNAME, "DUID file corrupted");
++			debug_printf(LOG_ERR, FNAME, "DUID file corrupted");
+ 			goto fail;
+ 		}
+ 
+-		dprintf(LOG_DEBUG, FNAME,
++		debug_printf(LOG_DEBUG, FNAME,
+ 		    "extracted an existing DUID from %s: %s",
+ 		    idfile, duidstr(duid));
+ 	} else {
+@@ -1047,27 +1047,27 @@ get_duid(idfile, duid)
+ 		dp->dh6_duid1_time = htonl((u_long)(t64 & 0xffffffff));
+ 		memcpy((void *)(dp + 1), tmpbuf, (len - sizeof(*dp)));
+ 
+-		dprintf(LOG_DEBUG, FNAME, "generated a new DUID: %s",
++		debug_printf(LOG_DEBUG, FNAME, "generated a new DUID: %s",
+ 		    duidstr(duid));
+ 	}
+ 
+ 	/* save the (new) ID to the file for next time */
+ 	if (!fp) {
+ 		if ((fp = fopen(idfile, "w+")) == NULL) {
+-			dprintf(LOG_ERR, FNAME,
++			debug_printf(LOG_ERR, FNAME,
+ 			    "failed to open DUID file for save");
+ 			goto fail;
+ 		}
+ 		if ((fwrite(&len, sizeof(len), 1, fp)) != 1) {
+-			dprintf(LOG_ERR, FNAME, "failed to save DUID");
++			debug_printf(LOG_ERR, FNAME, "failed to save DUID");
+ 			goto fail;
+ 		}
+ 		if ((fwrite(duid->duid_id, len, 1, fp)) != 1) {
+-			dprintf(LOG_ERR, FNAME, "failed to save DUID");
++			debug_printf(LOG_ERR, FNAME, "failed to save DUID");
+ 			goto fail;
+ 		}
+ 
+-		dprintf(LOG_DEBUG, FNAME, "saved generated DUID to %s",
++		debug_printf(LOG_DEBUG, FNAME, "saved generated DUID to %s",
+ 		    idfile);
+ 	}
+ 
+@@ -1104,7 +1104,7 @@ getifhwaddr(const char *ifname, char *buf, u_int16_t *hwtypep, int ppa)
+ 	dl_phys_addr_req_t dlpar;
+ 	dl_phys_addr_ack_t *dlpaa;
+ 
+-	dprintf(LOG_DEBUG, FNAME, "trying %s ppa %d", ifname, ppa);
++	debug_printf(LOG_DEBUG, FNAME, "trying %s ppa %d", ifname, ppa);
+ 
+ 	if (ifname[0] == '\0')
+ 		return (-1);
+@@ -1239,7 +1239,7 @@ gethwid(buf, len, ifname, hwtypep)
+ 
+ 		if ((root = di_init("/", DINFOSUBTREE | DINFOMINOR |
+ 		    DINFOPROP)) == DI_NODE_NIL) {
+-			dprintf(LOG_INFO, FNAME, "di_init failed");
++			debug_printf(LOG_INFO, FNAME, "di_init failed");
+ 			return (-1);
+ 		}
+ 		parms.buf = buf;
+@@ -1283,7 +1283,7 @@ gethwid(buf, len, ifname, hwtypep)
+ 		default:
+ 			continue; /* XXX */
+ 		}
+-		dprintf(LOG_DEBUG, FNAME, "found an interface %s for DUID",
++		debug_printf(LOG_DEBUG, FNAME, "found an interface %s for DUID",
+ 		    ifa->ifa_name);
+ 		memcpy(buf, LLADDR(sdl), sdl->sdl_alen);
+ 		l = sdl->sdl_alen; /* sdl will soon be freed */
+@@ -1296,7 +1296,7 @@ gethwid(buf, len, ifname, hwtypep)
+ 		if (sll->sll_hatype != ARPHRD_ETHER)
+ 			continue;
+ 		*hwtypep = ARPHRD_ETHER;
+-		dprintf(LOG_DEBUG, FNAME, "found an interface %s for DUID",
++		debug_printf(LOG_DEBUG, FNAME, "found an interface %s for DUID",
+ 		    ifa->ifa_name);
+ 		memcpy(buf, sll->sll_addr, sll->sll_halen);
+ 		l = sll->sll_halen; /* sll will soon be freed */
+@@ -1512,12 +1512,12 @@ dhcp6_get_options(p, ep, optinfo)
+ 		cp = (char *)(p + 1);
+ 		np = (struct dhcp6opt *)(cp + optlen);
+ 
+-		dprintf(LOG_DEBUG, FNAME, "get DHCP option %s, len %d",
++		debug_printf(LOG_DEBUG, FNAME, "get DHCP option %s, len %d",
+ 		    dhcp6optstr(opt), optlen);
+ 
+ 		/* option length field overrun */
+ 		if (np > ep) {
+-			dprintf(LOG_INFO, FNAME, "malformed DHCP options");
++			debug_printf(LOG_INFO, FNAME, "malformed DHCP options");
+ 			goto fail;
+ 		}
+ 
+@@ -1527,10 +1527,10 @@ dhcp6_get_options(p, ep, optinfo)
+ 				goto malformed;
+ 			duid0.duid_len = optlen;
+ 			duid0.duid_id = cp;
+-			dprintf(LOG_DEBUG, "",
++			debug_printf(LOG_DEBUG, "",
+ 				"  DUID: %s", duidstr(&duid0));
+ 			if (duidcpy(&optinfo->clientID, &duid0)) {
+-				dprintf(LOG_ERR, FNAME, "failed to copy DUID");
++				debug_printf(LOG_ERR, FNAME, "failed to copy DUID");
+ 				goto fail;
+ 			}
+ 			break;
+@@ -1539,9 +1539,9 @@ dhcp6_get_options(p, ep, optinfo)
+ 				goto malformed;
+ 			duid0.duid_len = optlen;
+ 			duid0.duid_id = cp;
+-			dprintf(LOG_DEBUG, "", "  DUID: %s", duidstr(&duid0));
++			debug_printf(LOG_DEBUG, "", "  DUID: %s", duidstr(&duid0));
+ 			if (duidcpy(&optinfo->serverID, &duid0)) {
+-				dprintf(LOG_ERR, FNAME, "failed to copy DUID");
++				debug_printf(LOG_ERR, FNAME, "failed to copy DUID");
+ 				goto fail;
+ 			}
+ 			break;
+@@ -1550,14 +1550,14 @@ dhcp6_get_options(p, ep, optinfo)
+ 				goto malformed;
+ 			memcpy(&val16, cp, sizeof(val16));
+ 			num16 = ntohs(val16);
+-			dprintf(LOG_DEBUG, "", "  status code: %s",
++			debug_printf(LOG_DEBUG, "", "  status code: %s",
+ 			    dhcp6_stcodestr(num16));
+ 
+ 			/* need to check duplication? */
+ 
+ 			if (dhcp6_add_listval(&optinfo->stcode_list,
+ 			    DHCP6_LISTVAL_STCODE, &num16, NULL) == NULL) {
+-				dprintf(LOG_ERR, FNAME, "failed to copy "
++				debug_printf(LOG_ERR, FNAME, "failed to copy "
+ 				    "status code");
+ 				goto fail;
+ 			}
+@@ -1574,13 +1574,13 @@ dhcp6_get_options(p, ep, optinfo)
+ 				memcpy(&opttype, val, sizeof(u_int16_t));
+ 				num = (int)ntohs(opttype);
+ 
+-				dprintf(LOG_DEBUG, "",
++				debug_printf(LOG_DEBUG, "",
+ 					"  requested option: %s",
+ 					dhcp6optstr(num));
+ 
+ 				if (dhcp6_find_listval(&optinfo->reqopt_list,
+ 				    DHCP6_LISTVAL_NUM, &num, 0)) {
+-					dprintf(LOG_INFO, FNAME, "duplicated "
++					debug_printf(LOG_INFO, FNAME, "duplicated "
+ 					    "option type (%s)",
+ 					    dhcp6optstr(opttype));
+ 					goto nextoption;
+@@ -1588,7 +1588,7 @@ dhcp6_get_options(p, ep, optinfo)
+ 
+ 				if (dhcp6_add_listval(&optinfo->reqopt_list,
+ 				    DHCP6_LISTVAL_NUM, &num, NULL) == NULL) {
+-					dprintf(LOG_ERR, FNAME,
++					debug_printf(LOG_ERR, FNAME,
+ 					    "failed to copy requested option");
+ 					goto fail;
+ 				}
+@@ -1599,10 +1599,10 @@ dhcp6_get_options(p, ep, optinfo)
+ 		case DH6OPT_PREFERENCE:
+ 			if (optlen != 1)
+ 				goto malformed;
+-			dprintf(LOG_DEBUG, "", "  preference: %d",
++			debug_printf(LOG_DEBUG, "", "  preference: %d",
+ 			    (int)*(u_char *)cp);
+ 			if (optinfo->pref != DH6OPT_PREF_UNDEF) {
+-				dprintf(LOG_INFO, FNAME,
++				debug_printf(LOG_INFO, FNAME,
+ 				    "duplicated preference option");
+ 			} else
+ 				optinfo->pref = (int)*(u_char *)cp;
+@@ -1612,11 +1612,11 @@ dhcp6_get_options(p, ep, optinfo)
+ 				goto malformed;
+ 			memcpy(&val16, cp, sizeof(val16));
+ 			val16 = ntohs(val16);
+-			dprintf(LOG_DEBUG, "", "  elapsed time: %lu",
++			debug_printf(LOG_DEBUG, "", "  elapsed time: %lu",
+ 			    (u_int32_t)val16);
+ 			if (optinfo->elapsed_time !=
+ 			    DH6OPT_ELAPSED_TIME_UNDEF) {
+-				dprintf(LOG_INFO, FNAME,
++				debug_printf(LOG_INFO, FNAME,
+ 				    "duplicated elapsed time option");
+ 			} else
+ 				optinfo->elapsed_time = val16;
+@@ -1637,7 +1637,7 @@ dhcp6_get_options(p, ep, optinfo)
+ 			 * [RFC3315 Section 21.4.2]
+ 			 */
+ 			if (optinfo->authproto != DHCP6_AUTHPROTO_UNDEF) {
+-				dprintf(LOG_INFO, FNAME, "found more than one "
++				debug_printf(LOG_INFO, FNAME, "found more than one "
+ 				    "authentication option");
+ 				goto fail;
+ 			}
+@@ -1648,7 +1648,7 @@ dhcp6_get_options(p, ep, optinfo)
+ 			memcpy(&optinfo->authrd, cp, sizeof(optinfo->authrd));
+ 			cp += sizeof(optinfo->authrd);
+ 
+-			dprintf(LOG_DEBUG, "", "  %s", sprint_auth(optinfo));
++			debug_printf(LOG_DEBUG, "", "  %s", sprint_auth(optinfo));
+ 
+ 			authinfolen =
+ 			    optlen - (sizeof(struct dhcp6opt_auth) - 4);
+@@ -1670,7 +1670,7 @@ dhcp6_get_options(p, ep, optinfo)
+ 				optinfo->delayedauth_realmval =
+ 				    malloc(optinfo->delayedauth_realmlen);
+ 				if (optinfo->delayedauth_realmval == NULL) {
+-					dprintf(LOG_WARNING, FNAME, "failed "
++					debug_printf(LOG_WARNING, FNAME, "failed "
+ 					    "allocate memory for auth realm");
+ 					goto fail;
+ 				}
+@@ -1687,7 +1687,7 @@ dhcp6_get_options(p, ep, optinfo)
+ 				optinfo->delayedauth_offset = cp - bp;
+ 				cp += 16;
+ 
+-				dprintf(LOG_DEBUG, "", "  auth key ID: %x, "
++				debug_printf(LOG_DEBUG, "", "  auth key ID: %x, "
+ 				    "offset=%d, realmlen=%d",
+ 				    optinfo->delayedauth_keyid,
+ 				    optinfo->delayedauth_offset,
+@@ -1698,7 +1698,7 @@ dhcp6_get_options(p, ep, optinfo)
+ 				break;
+ #endif
+ 			default:
+-				dprintf(LOG_INFO, FNAME,
++				debug_printf(LOG_INFO, FNAME,
+ 				    "unsupported authentication protocol: %d",
+ 				    *cp);
+ 				goto fail;
+@@ -1779,14 +1779,14 @@ dhcp6_get_options(p, ep, optinfo)
+ 			ia.t1 = ntohl(optia.dh6_ia_t1);
+ 			ia.t2 = ntohl(optia.dh6_ia_t2);
+ 
+-			dprintf(LOG_DEBUG, "",
++			debug_printf(LOG_DEBUG, "",
+ 			    "  IA_PD: ID=%lu, T1=%lu, T2=%lu",
+ 			    ia.iaid, ia.t1, ia.t2);
+ 
+ 			/* duplication check */
+ 			if (dhcp6_find_listval(&optinfo->iapd_list,
+ 			    DHCP6_LISTVAL_IAPD, &ia, 0)) {
+-				dprintf(LOG_INFO, FNAME,
++				debug_printf(LOG_INFO, FNAME,
+ 				    "duplicated IA_PD %lu", ia.iaid);
+ 				break; /* ignore this IA_PD */
+ 			}
+@@ -1813,7 +1813,7 @@ dhcp6_get_options(p, ep, optinfo)
+ 				goto malformed;
+ 			memcpy(&val32, cp, sizeof(val32));
+ 			val32 = ntohl(val32);
+-			dprintf(LOG_DEBUG, "",
++			debug_printf(LOG_DEBUG, "",
+ 			    "   information refresh time: %lu", val32);
+ 			if (val32 < DHCP6_IRT_MINIMUM) {
+ 				/*
+@@ -1823,13 +1823,13 @@ dhcp6_get_options(p, ep, optinfo)
+ 				 * [draft-ietf-dhc-lifetime-02.txt,
+ 				 *  Section 3.2]
+ 				 */
+-				dprintf(LOG_INFO, FNAME,
++				debug_printf(LOG_INFO, FNAME,
+ 				    "refresh time is too small (%d), adjusted",
+ 				    val32);
+ 				val32 = DHCP6_IRT_MINIMUM;
+ 			}
+ 			if (optinfo->refreshtime != DH6OPT_REFRESHTIME_UNDEF) {
+-				dprintf(LOG_INFO, FNAME,
++				debug_printf(LOG_INFO, FNAME,
+ 				    "duplicated refresh time option");
+ 			} else
+ 				optinfo->refreshtime = (int64_t)val32;
+@@ -1843,14 +1843,14 @@ dhcp6_get_options(p, ep, optinfo)
+ 			ia.t1 = ntohl(optia.dh6_ia_t1);
+ 			ia.t2 = ntohl(optia.dh6_ia_t2);
+ 
+-			dprintf(LOG_DEBUG, "",
++			debug_printf(LOG_DEBUG, "",
+ 			    "  IA_NA: ID=%lu, T1=%lu, T2=%lu",
+ 			    ia.iaid, ia.t1, ia.t2);
+ 
+ 			/* duplication check */
+ 			if (dhcp6_find_listval(&optinfo->iana_list,
+ 			    DHCP6_LISTVAL_IANA, &ia, 0)) {
+-				dprintf(LOG_INFO, FNAME,
++				debug_printf(LOG_INFO, FNAME,
+ 				    "duplicated IA_NA %lu", ia.iaid);
+ 				break; /* ignore this IA_NA */
+ 			}
+@@ -1874,7 +1874,7 @@ dhcp6_get_options(p, ep, optinfo)
+ 			break;
+ 		default:
+ 			/* no option specific behavior */
+-			dprintf(LOG_INFO, FNAME,
++			debug_printf(LOG_INFO, FNAME,
+ 			    "unknown or unexpected DHCP6 option %s, len %d",
+ 			    dhcp6optstr(opt), optlen);
+ 			break;
+@@ -1884,7 +1884,7 @@ dhcp6_get_options(p, ep, optinfo)
+ 	return (0);
+ 
+   malformed:
+-	dprintf(LOG_INFO, FNAME, "malformed DHCP option: type %d, len %d",
++	debug_printf(LOG_INFO, FNAME, "malformed DHCP option: type %d, len %d",
+ 	    opt, optlen);
+   fail:
+ 	dhcp6_clear_options(optinfo);
+@@ -1967,11 +1967,11 @@ copyin_option(type, p, ep, list)
+ 		cp = (char *)(p + 1);
+ 		np = (struct dhcp6opt *)(cp + optlen);
+ 
+-		dprintf(LOG_DEBUG, FNAME, "get DHCP option %s, len %d",
++		debug_printf(LOG_DEBUG, FNAME, "get DHCP option %s, len %d",
+ 		    dhcp6optstr(opt), optlen);
+ 
+ 		if (np > ep) {
+-			dprintf(LOG_INFO, FNAME, "malformed DHCP option");
++			debug_printf(LOG_INFO, FNAME, "malformed DHCP option");
+ 			goto fail;
+ 		}
+ 
+@@ -1979,7 +1979,7 @@ copyin_option(type, p, ep, list)
+ 		case DH6OPT_IA_PD_PREFIX:
+ 			/* check option context */
+ 			if (type != DH6OPT_IA_PD) {
+-				dprintf(LOG_INFO, FNAME,
++				debug_printf(LOG_INFO, FNAME,
+ 				    "%s is an invalid position for %s",
+ 				    dhcp6optstr(type), dhcp6optstr(opt));
+ 				goto fail;
+@@ -1991,7 +1991,7 @@ copyin_option(type, p, ep, list)
+ 			/* copy and convert option values */
+ 			memcpy(&opt_iapd_prefix, p, sizeof(opt_iapd_prefix));
+ 			if (opt_iapd_prefix.dh6_iapd_prefix_prefix_len > 128) {
+-				dprintf(LOG_INFO, FNAME,
++				debug_printf(LOG_INFO, FNAME,
+ 				    "invalid prefix length (%d)",
+ 				    opt_iapd_prefix.dh6_iapd_prefix_prefix_len);
+ 				goto malformed;
+@@ -2006,7 +2006,7 @@ copyin_option(type, p, ep, list)
+ 			/* clear padding bits in the prefix address */
+ 			prefix6_mask(&iapd_prefix.addr, iapd_prefix.plen);
+ 
+-			dprintf(LOG_DEBUG, FNAME, "  IA_PD prefix: "
++			debug_printf(LOG_DEBUG, FNAME, "  IA_PD prefix: "
+ 			    "%s/%d pltime=%lu vltime=%lu",
+ 			    in6addr2str(&iapd_prefix.addr, 0),
+ 			    iapd_prefix.plen,
+@@ -2014,7 +2014,7 @@ copyin_option(type, p, ep, list)
+ 
+ 			if (dhcp6_find_listval(list, DHCP6_LISTVAL_PREFIX6,
+ 			    &iapd_prefix, 0)) {
+-				dprintf(LOG_INFO, FNAME, 
++				debug_printf(LOG_INFO, FNAME, 
+ 				    "duplicated IA_PD prefix "
+ 				    "%s/%d pltime=%lu vltime=%lu",
+ 				    in6addr2str(&iapd_prefix.addr, 0),
+@@ -2041,7 +2041,7 @@ copyin_option(type, p, ep, list)
+ 		case DH6OPT_IAADDR:
+ 			/* check option context */
+ 			if (type != DH6OPT_IA_NA) {
+-				dprintf(LOG_INFO, FNAME,
++				debug_printf(LOG_INFO, FNAME,
+ 				    "%s is an invalid position for %s",
+ 				    dhcp6optstr(type), dhcp6optstr(opt));
+ 				goto fail;
+@@ -2057,14 +2057,14 @@ copyin_option(type, p, ep, list)
+ 			memcpy(&ia_addr.addr, &opt_ia_addr.dh6_ia_addr_addr,
+ 			    sizeof(ia_addr.addr));
+ 
+-			dprintf(LOG_DEBUG, FNAME, "  IA_NA address: "
++			debug_printf(LOG_DEBUG, FNAME, "  IA_NA address: "
+ 			    "%s pltime=%lu vltime=%lu",
+ 			    in6addr2str(&ia_addr.addr, 0),
+ 			    ia_addr.pltime, ia_addr.vltime);
+ 
+ 			if (dhcp6_find_listval(list,
+ 			    DHCP6_LISTVAL_STATEFULADDR6, &ia_addr, 0)) {
+-				dprintf(LOG_INFO, FNAME, 
++				debug_printf(LOG_INFO, FNAME, 
+ 				    "duplicated IA_NA address"
+ 				    "%s pltime=%lu vltime=%lu",
+ 				    in6addr2str(&ia_addr.addr, 0),
+@@ -2093,7 +2093,7 @@ copyin_option(type, p, ep, list)
+ 			    type != DH6OPT_IA_PD_PREFIX &&
+ 			    type != DH6OPT_IA_NA &&
+ 			    type != DH6OPT_IAADDR) {
+-				dprintf(LOG_INFO, FNAME,
++				debug_printf(LOG_INFO, FNAME,
+ 				    "%s is an invalid position for %s",
+ 				    dhcp6optstr(type), dhcp6optstr(opt));
+ 				goto nextoption; /* or discard the message? */
+@@ -2107,13 +2107,13 @@ copyin_option(type, p, ep, list)
+ 			opt_stcode.dh6_stcode_code =
+ 			    ntohs(opt_stcode.dh6_stcode_code);
+ 
+-			dprintf(LOG_DEBUG, "", "  status code: %s",
++			debug_printf(LOG_DEBUG, "", "  status code: %s",
+ 			    dhcp6_stcodestr(opt_stcode.dh6_stcode_code));
+ 
+ 			/* duplication check */
+ 			if (dhcp6_find_listval(list, DHCP6_LISTVAL_STCODE,
+ 			    &opt_stcode.dh6_stcode_code, 0)) {
+-				dprintf(LOG_INFO, FNAME,
++				debug_printf(LOG_INFO, FNAME,
+ 				    "duplicated status code (%d)",
+ 				    opt_stcode.dh6_stcode_code);
+ 				goto nextoption;
+@@ -2133,7 +2133,7 @@ copyin_option(type, p, ep, list)
+ 	return (0);
+ 
+   malformed:
+-	dprintf(LOG_INFO, "", "  malformed DHCP option: type %d", opt);
++	debug_printf(LOG_INFO, "", "  malformed DHCP option: type %d", opt);
+ 
+   fail:
+ 	dhcp6_clear_list(&sublist);
+@@ -2221,7 +2221,7 @@ copy_option(type, len, val, optp, ep, totallenp)
+ 	struct dhcp6opt *opt = *optp, opth;
+ 
+ 	if ((void *)ep - (void *)optp < len + sizeof(struct dhcp6opt)) {
+-		dprintf(LOG_INFO, FNAME,
++		debug_printf(LOG_INFO, FNAME,
+ 		    "option buffer short for %s", dhcp6optstr(type));
+ 		return (-1);
+ 	}
+@@ -2233,7 +2233,7 @@ copy_option(type, len, val, optp, ep, totallenp)
+ 
+ 	*optp = (struct dhcp6opt *)((char *)(opt + 1) + len);
+  	*totallenp += sizeof(struct dhcp6opt) + len;
+-	dprintf(LOG_DEBUG, FNAME, "set %s (len %d)", dhcp6optstr(type), len);
++	debug_printf(LOG_DEBUG, FNAME, "set %s (len %d)", dhcp6optstr(type), len);
+ 
+ 	return (0);
+ }
+@@ -2269,21 +2269,21 @@ dhcp6_set_options(type, optbp, optep, optinfo)
+ 
+ 		tmpbuf = NULL;
+ 		if ((optlen = copyout_option(NULL, NULL, op)) < 0) {
+-			dprintf(LOG_INFO, FNAME,
++			debug_printf(LOG_INFO, FNAME,
+ 			    "failed to count option length");
+ 			goto fail;
+ 		}
+ 		if ((void *)optep - (void *)p < optlen) {
+-			dprintf(LOG_INFO, FNAME, "short buffer");
++			debug_printf(LOG_INFO, FNAME, "short buffer");
+ 			goto fail;
+ 		}
+ 		if ((tmpbuf = malloc(optlen)) == NULL) {
+-			dprintf(LOG_NOTICE, FNAME,
++			debug_printf(LOG_NOTICE, FNAME,
+ 			    "memory allocation failed for IA_NA options");
+ 			goto fail;
+ 		}
+ 		if (copyout_option(tmpbuf, tmpbuf + optlen, op) < 0) {
+-			dprintf(LOG_ERR, FNAME,
++			debug_printf(LOG_ERR, FNAME,
+ 			    "failed to construct an IA_NA option");
+ 			goto fail;
+ 		}
+@@ -2340,7 +2340,7 @@ dhcp6_set_options(type, optbp, optep, optinfo)
+ 		buflen = dhcp6_count_list(&optinfo->reqopt_list) *
+ 			sizeof(u_int16_t);
+ 		if ((tmpbuf = malloc(buflen)) == NULL) {
+-			dprintf(LOG_ERR, FNAME,
++			debug_printf(LOG_ERR, FNAME,
+ 			    "memory allocation failed for options");
+ 			goto fail;
+ 		}
+@@ -2355,7 +2355,7 @@ dhcp6_set_options(type, optbp, optep, optinfo)
+ 			 */
+ 			if (opt->val_num == DH6OPT_REFRESHTIME &&
+ 			    type != DH6_INFORM_REQ) {
+-				dprintf(LOG_DEBUG, FNAME,
++				debug_printf(LOG_DEBUG, FNAME,
+ 				    "refresh time option is not requested "
+ 				    "for %s", dhcp6msgstr(type));
+ 			}
+@@ -2423,21 +2423,21 @@ dhcp6_set_options(type, optbp, optep, optinfo)
+ 
+ 		tmpbuf = NULL;
+ 		if ((optlen = copyout_option(NULL, NULL, op)) < 0) {
+-			dprintf(LOG_INFO, FNAME,
++			debug_printf(LOG_INFO, FNAME,
+ 			    "failed to count option length");
+ 			goto fail;
+ 		}
+ 		if ((void *)optep - (void *)p < optlen) {
+-			dprintf(LOG_INFO, FNAME, "short buffer");
++			debug_printf(LOG_INFO, FNAME, "short buffer");
+ 			goto fail;
+ 		}
+ 		if ((tmpbuf = malloc(optlen)) == NULL) {
+-			dprintf(LOG_NOTICE, FNAME,
++			debug_printf(LOG_NOTICE, FNAME,
+ 			    "memory allocation failed for IA_PD options");
+ 			goto fail;
+ 		}
+ 		if (copyout_option(tmpbuf, tmpbuf + optlen, op) < 0) {
+-			dprintf(LOG_ERR, FNAME,
++			debug_printf(LOG_ERR, FNAME,
+ 			    "failed to construct an IA_PD option");
+ 			goto fail;
+ 		}
+@@ -2492,13 +2492,13 @@ dhcp6_set_options(type, optbp, optep, optinfo)
+ 				break;
+ #endif
+ 			default:
+-				dprintf(LOG_ERR, FNAME,
++				debug_printf(LOG_ERR, FNAME,
+ 				    "unexpected authentication protocol");
+ 				goto fail;
+ 			}
+ 		}
+ 		if ((auth = malloc(authlen)) == NULL) {
+-			dprintf(LOG_WARNING, FNAME, "failed to allocate "
++			debug_printf(LOG_WARNING, FNAME, "failed to allocate "
+ 			    "memory for authentication information");
+ 			goto fail;
+ 		}
+@@ -2534,7 +2534,7 @@ dhcp6_set_options(type, optbp, optep, optinfo)
+ 				optinfo->delayedauth_offset =
+ 				    ((char *)p - (char *)optbp) + authlen - 16;
+ 
+-				dprintf(LOG_DEBUG, FNAME,
++				debug_printf(LOG_DEBUG, FNAME,
+ 				    "key ID %x, offset %d",
+ 				    optinfo->delayedauth_keyid,
+ 				    optinfo->delayedauth_offset); 
+@@ -2543,7 +2543,7 @@ dhcp6_set_options(type, optbp, optep, optinfo)
+ 			case DHCP6_AUTHPROTO_RECONFIG:
+ #endif
+ 			default:
+-				dprintf(LOG_ERR, FNAME,
++				debug_printf(LOG_ERR, FNAME,
+ 				    "unexpected authentication protocol");
+ 				free(auth);
+ 				goto fail;
+@@ -2695,7 +2695,7 @@ copyout_option(p, ep, optval)
+ 		 * we encounter an unknown option.  this should be an internal
+ 		 * error.
+ 		 */
+-		dprintf(LOG_ERR, FNAME, "unknown option: code %d",
++		debug_printf(LOG_ERR, FNAME, "unknown option: code %d",
+ 		    optval->type);
+ 		return (-1);
+ 	}
+@@ -2721,7 +2721,7 @@ copyout_option(p, ep, optval)
+ 	if (!p)
+ 		return(optlen);
+ 
+-	dprintf(LOG_DEBUG, FNAME, "set %s", dhcp6optstr(opttype));
++	debug_printf(LOG_DEBUG, FNAME, "set %s", dhcp6optstr(opttype));
+ 	if (ep - p < headlen) /* check it just in case */
+ 		return (-1);
+ 
+@@ -2812,7 +2812,7 @@ dhcp6_set_timeoparam(ev)
+ 		ev->max_retrans_cnt = REL_MAX_RC;
+ 		break;
+ 	default:
+-		dprintf(LOG_ERR, FNAME, "unexpected event state %d on %s",
++		debug_printf(LOG_ERR, FNAME, "unexpected event state %d on %s",
+ 		    ev->state, ev->ifp->ifname);
+ 		exit(1);
+ 	}
+@@ -2870,7 +2870,7 @@ dhcp6_reset_timer(ev)
+ 
+ 	statestr = dhcp6_event_statestr(ev);
+ 
+-	dprintf(LOG_DEBUG, FNAME, "reset a timer on %s, "
++	debug_printf(LOG_DEBUG, FNAME, "reset a timer on %s, "
+ 		"state=%s, timeo=%d, retrans=%d",
+ 		ev->ifp->ifname, statestr, ev->timeouts, ev->retrans);
+ }
+@@ -2881,7 +2881,7 @@ duidcpy(dd, ds)
+ {
+ 	dd->duid_len = ds->duid_len;
+ 	if ((dd->duid_id = malloc(dd->duid_len)) == NULL) {
+-		dprintf(LOG_ERR, FNAME, "memory allocation failed");
++		debug_printf(LOG_ERR, FNAME, "memory allocation failed");
+ 		return (-1);
+ 	}
+ 	memcpy(dd->duid_id, ds->duid_id, dd->duid_len);
+@@ -2929,17 +2929,17 @@ get_rdvalue(rdm, rdvalue, rdsize)
+ 	u_int32_t u32, l32;
+ 
+ 	if (rdm != DHCP6_AUTHRDM_MONOCOUNTER) {
+-		dprintf(LOG_INFO, FNAME, "unsupported RDM (%d)", rdm);
++		debug_printf(LOG_INFO, FNAME, "unsupported RDM (%d)", rdm);
+ 		return (-1);
+ 	}
+ 	if (rdsize != sizeof(u_int64_t)) {
+-		dprintf(LOG_INFO, FNAME, "unsupported RD size (%d)", rdsize);
++		debug_printf(LOG_INFO, FNAME, "unsupported RD size (%d)", rdsize);
+ 		return (-1);
+ 	}
+ 
+ #if defined(HAVE_CLOCK_GETTIME)
+ 	if (clock_gettime(CLOCK_REALTIME, &tp)) {
+-		dprintf(LOG_WARNING, FNAME, "clock_gettime failed: %s",
++		debug_printf(LOG_WARNING, FNAME, "clock_gettime failed: %s",
+ 		    strerror(errno));
+ 		return (-1);
+ 	}
+@@ -2952,7 +2952,7 @@ get_rdvalue(rdm, rdvalue, rdsize)
+ 	l32 = (u_int32_t)nsec;
+ #else
+ 	if (gettimeofday(&tv, NULL) != 0) {
+-		dprintf(LOG_WARNING, FNAME, "gettimeofday failed: %s",
++		debug_printf(LOG_WARNING, FNAME, "gettimeofday failed: %s",
+ 		    strerror(errno));
+ 		return (-1);
+ 	}
+@@ -3207,7 +3207,7 @@ setloglevel(debuglevel)
+ }
+ 
+ void
+-dprintf(int level, const char *fname, const char *fmt, ...)
++debug_printf(int level, const char *fname, const char *fmt, ...)
+ {
+ 	va_list ap;
+ 	char logbuf[LINE_MAX];
+@@ -3293,7 +3293,7 @@ ifaddrconf(cmd, ifname, addr, plen, pltime, vltime)
+ 	}
+ 
+ 	if ((s = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
+-		dprintf(LOG_ERR, FNAME, "can't open a temporary socket: %s",
++		debug_printf(LOG_ERR, FNAME, "can't open a temporary socket: %s",
+ 		    strerror(errno));
+ 		return (-1);
+ 	}
+@@ -3311,7 +3311,7 @@ ifaddrconf(cmd, ifname, addr, plen, pltime, vltime)
+ 	memset(&ifr, 0, sizeof(ifr));
+ 	strncpy(ifr.ifr_name, ifname, IFNAMSIZ - 1);
+ 	if (ioctl(s, SIOGIFINDEX, &ifr) < 0) {
+-		dprintf(LOG_NOTICE, FNAME, "failed to get the index of %s: %s",
++		debug_printf(LOG_NOTICE, FNAME, "failed to get the index of %s: %s",
+ 		    ifname, strerror(errno));
+ 		close(s); 
+ 		return (-1); 
+@@ -3325,7 +3325,7 @@ ifaddrconf(cmd, ifname, addr, plen, pltime, vltime)
+ #endif
+ 
+ 	if (ioctl(s, ioctl_cmd, &req)) {
+-		dprintf(LOG_NOTICE, FNAME, "failed to %s an address on %s: %s",
++		debug_printf(LOG_NOTICE, FNAME, "failed to %s an address on %s: %s",
+ 		    cmdstr, ifname, strerror(errno));
+ 		close(s);
+ 		return (-1);
+@@ -3334,14 +3334,14 @@ ifaddrconf(cmd, ifname, addr, plen, pltime, vltime)
+ #ifdef __sun__
+ 	memcpy(&req.lifr_addr, addr, sizeof (*addr));
+ 	if (ioctl(s, SIOCSLIFADDR, &req) == -1) {
+-		dprintf(LOG_NOTICE, FNAME, "failed to %s new address on %s: %s",
++		debug_printf(LOG_NOTICE, FNAME, "failed to %s new address on %s: %s",
+ 		    cmdstr, ifname, strerror(errno));
+ 		close(s);
+ 		return (-1);
+ 	}
+ #endif
+ 
+-	dprintf(LOG_DEBUG, FNAME, "%s an address %s/%d on %s", cmdstr,
++	debug_printf(LOG_DEBUG, FNAME, "%s an address %s/%d on %s", cmdstr,
+ 	    addr2str((struct sockaddr *)addr), plen, ifname);
+ 
+ 	close(s);
+@@ -3357,13 +3357,13 @@ safefile(path)
+ 
+ 	/* no setuid */
+ 	if (getuid() != geteuid()) {
+-		dprintf(LOG_NOTICE, FNAME,
++		debug_printf(LOG_NOTICE, FNAME,
+ 		    "setuid'ed execution not allowed");
+ 		return (-1);
+ 	}
+ 
+ 	if (lstat(path, &s) != 0) {
+-		dprintf(LOG_NOTICE, FNAME, "lstat failed: %s",
++		debug_printf(LOG_NOTICE, FNAME, "lstat failed: %s",
+ 		    strerror(errno));
+ 		return (-1);
+ 	}
+@@ -3371,7 +3371,7 @@ safefile(path)
+ 	/* the file must be owned by the running uid */
+ 	myuid = getuid();
+ 	if (s.st_uid != myuid) {
+-		dprintf(LOG_NOTICE, FNAME, "%s has invalid owner uid", path);
++		debug_printf(LOG_NOTICE, FNAME, "%s has invalid owner uid", path);
+ 		return (-1);
+ 	}
+ 
+@@ -3379,7 +3379,7 @@ safefile(path)
+ 	case S_IFREG:
+ 		break;
+ 	default:
+-		dprintf(LOG_NOTICE, FNAME, "%s is an invalid file type 0x%o",
++		debug_printf(LOG_NOTICE, FNAME, "%s is an invalid file type 0x%o",
+ 		    path, (s.st_mode & S_IFMT));
+ 		return (-1);
+ 	}
+diff --git a/common.h b/common.h
+index 7366c25..9fd8008 100644
+--- a/common.h
++++ b/common.h
+@@ -155,7 +155,7 @@ extern char *in6addr2str __P((struct in6_addr *, int));
+ extern int in6_addrscopebyif __P((struct in6_addr *, char *));
+ extern int in6_scope __P((struct in6_addr *));
+ extern void setloglevel __P((int));
+-extern void dprintf __P((int, const char *, const char *, ...));
++extern void debug_printf __P((int, const char *, const char *, ...));
+ extern int get_duid __P((char *, struct duid *));
+ extern void dhcp6_init_options __P((struct dhcp6_optinfo *));
+ extern void dhcp6_clear_options __P((struct dhcp6_optinfo *));
+diff --git a/config.c b/config.c
+index 383c12a..3721545 100644
+--- a/config.c
++++ b/config.c
+@@ -156,13 +156,13 @@ configure_interface(iflist)
+ 		struct cf_list *cfl;
+ 
+ 		if (if_nametoindex(ifp->name) == 0) {
+-			dprintf(LOG_ERR, FNAME, "invalid interface(%s): %s",
++			debug_printf(LOG_ERR, FNAME, "invalid interface(%s): %s",
+ 			    ifp->name, strerror(errno));
+ 			goto bad;
+ 		}
+ 
+ 		if ((ifc = malloc(sizeof(*ifc))) == NULL) {
+-			dprintf(LOG_ERR, FNAME,
++			debug_printf(LOG_ERR, FNAME,
+ 			    "memory allocation for %s failed", ifp->name);
+ 			goto bad;
+ 		}
+@@ -171,7 +171,7 @@ configure_interface(iflist)
+ 		dhcp6_ifconflist = ifc;
+ 
+ 		if ((ifc->ifname = strdup(ifp->name)) == NULL) {
+-			dprintf(LOG_ERR, FNAME, "failed to copy ifname");
++			debug_printf(LOG_ERR, FNAME, "failed to copy ifname");
+ 			goto bad;
+ 		}
+ 
+@@ -183,7 +183,7 @@ configure_interface(iflist)
+ 			switch(cfl->type) {
+ 			case DECL_REQUEST:
+ 				if (dhcp6_mode != DHCP6_MODE_CLIENT) {
+-					dprintf(LOG_INFO, FNAME, "%s:%d "
++					debug_printf(LOG_INFO, FNAME, "%s:%d "
+ 						"client-only configuration",
+ 						configfilename,
+ 						cfl->line);
+@@ -208,7 +208,7 @@ configure_interface(iflist)
+ 				break;
+ 			case DECL_INFO_ONLY:
+ 				if (dhcp6_mode != DHCP6_MODE_CLIENT) {
+-					dprintf(LOG_INFO, FNAME, "%s:%d "
++					debug_printf(LOG_INFO, FNAME, "%s:%d "
+ 						"client-only configuration",
+ 						configfilename, cfl->line);
+ 					goto bad;
+@@ -217,7 +217,7 @@ configure_interface(iflist)
+ 				break;
+ 			case DECL_PREFERENCE:
+ 				if (dhcp6_mode != DHCP6_MODE_SERVER) {
+-					dprintf(LOG_INFO, FNAME, "%s:%d "
++					debug_printf(LOG_INFO, FNAME, "%s:%d "
+ 						"server-only configuration",
+ 						configfilename, cfl->line);
+ 					goto bad;
+@@ -225,7 +225,7 @@ configure_interface(iflist)
+ 				ifc->server_pref = (int)cfl->num;
+ 				if (ifc->server_pref < 0 ||
+ 				    ifc->server_pref > 255) {
+-					dprintf(LOG_INFO, FNAME, "%s:%d "
++					debug_printf(LOG_INFO, FNAME, "%s:%d "
+ 						"bad value: %d",
+ 						configfilename, cfl->line,
+ 						ifc->server_pref);
+@@ -234,13 +234,13 @@ configure_interface(iflist)
+ 				break;
+ 			case DECL_SCRIPT:
+ 				if (dhcp6_mode != DHCP6_MODE_CLIENT) {
+-					dprintf(LOG_INFO, FNAME, "%s:%d "
++					debug_printf(LOG_INFO, FNAME, "%s:%d "
+ 						"client-only configuration",
+ 						configfilename, cfl->line);
+ 					goto bad;
+ 				}
+ 				if (ifc->scriptpath) {
+-					dprintf(LOG_INFO, FNAME,
++					debug_printf(LOG_INFO, FNAME,
+ 					    "%s:%d duplicated configuration",
+ 					    configfilename, cfl->line);
+ 					goto bad;
+@@ -248,13 +248,13 @@ configure_interface(iflist)
+ 				cp = cfl->ptr;
+ 				ifc->scriptpath = strdup(cp + 1);
+ 				if (ifc->scriptpath == NULL) {
+-					dprintf(LOG_NOTICE, FNAME,
++					debug_printf(LOG_NOTICE, FNAME,
+ 					    "failed to copy script path");
+ 					goto bad;
+ 				}
+ 				cp = ifc->scriptpath;
+ 				if (*cp != '/') {
+-					dprintf(LOG_INFO, FNAME,
++					debug_printf(LOG_INFO, FNAME,
+ 					    "script must be an absolute path");
+ 					goto bad;
+ 				}
+@@ -272,7 +272,7 @@ configure_interface(iflist)
+ 						if (strcmp(spec->name, pool->name) == 0)
+ 							break;
+ 					if (pool == NULL) {
+-						dprintf(LOG_ERR, FNAME, "%s:%d "
++						debug_printf(LOG_ERR, FNAME, "%s:%d "
+ 							"pool '%s' not found",
+ 							configfilename, cfl->line,
+ 					   		spec->name);
+@@ -281,7 +281,7 @@ configure_interface(iflist)
+ 					if (spec->vltime != DHCP6_DURATION_INFINITE &&
+ 						(spec->pltime == DHCP6_DURATION_INFINITE ||
+ 						spec->pltime > spec->vltime)) {
+-						dprintf(LOG_ERR, FNAME, "%s:%d ",
++						debug_printf(LOG_ERR, FNAME, "%s:%d ",
+ 							configfilename, cfl->line,
+ 							"specified a larger preferred lifetime "
+ 							"than valid lifetime");
+@@ -289,17 +289,17 @@ configure_interface(iflist)
+ 					}
+ 					ifc->pool = *spec;
+ 					if ((ifc->pool.name = strdup(spec->name)) == NULL) {
+-						dprintf(LOG_ERR, FNAME,
++						debug_printf(LOG_ERR, FNAME,
+ 							"memory allocation failed");
+ 						goto bad;
+ 					}
+-					dprintf(LOG_DEBUG, FNAME,
++					debug_printf(LOG_DEBUG, FNAME,
+ 						"pool '%s' is specified to the interface '%s'",
+ 						ifc->pool.name, ifc->ifname);
+ 				}
+ 				break;
+ 			default:
+-				dprintf(LOG_ERR, FNAME, "%s:%d "
++				debug_printf(LOG_ERR, FNAME, "%s:%d "
+ 					"invalid interface configuration",
+ 					configfilename, cfl->line);
+ 				goto bad;
+@@ -338,7 +338,7 @@ configure_ia(ialist, iatype)
+ 		confsize = sizeof(struct iana_conf);
+ 		break;
+ 	default:
+-		dprintf(LOG_ERR, FNAME, "internal error");
++		debug_printf(LOG_ERR, FNAME, "internal error");
+ 		goto bad;
+ 	}
+ 
+@@ -346,7 +346,7 @@ configure_ia(ialist, iatype)
+ 		struct cf_list *cfl;
+ 
+ 		if ((iac = malloc(confsize)) == NULL) {
+-			dprintf(LOG_ERR, FNAME,
++			debug_printf(LOG_ERR, FNAME,
+ 			    "memory allocation for IA %s failed",
+ 			    iap->name);
+ 			goto bad;
+@@ -386,13 +386,13 @@ configure_ia(ialist, iatype)
+ 					if (add_prefix(&pdp->iapd_prefix_list,
+ 					    "IAPD", DHCP6_LISTVAL_PREFIX6,
+ 					    cfl->ptr)) {
+-						dprintf(LOG_NOTICE, FNAME, "failed "
++						debug_printf(LOG_NOTICE, FNAME, "failed "
+ 							"to configure prefix");
+ 						goto bad;
+ 					}
+ 					break;
+ 				default:
+-					dprintf(LOG_ERR, FNAME, "%s:%d "
++					debug_printf(LOG_ERR, FNAME, "%s:%d "
+ 					    "invalid configuration",
+ 					    configfilename, cfl->line);
+ 					goto bad;
+@@ -404,20 +404,20 @@ configure_ia(ialist, iatype)
+ 					if (add_prefix(&nap->iana_address_list,
+ 					    "IANA", DHCP6_LISTVAL_STATEFULADDR6,
+ 					    cfl->ptr)) {
+-		...
 
[truncated message content]

[Astlinux-commits] SF.net SVN: astlinux:[7287] branches/1.0

[<abe...@us...>]

Revision: 7287
          http://sourceforge.net/p/astlinux/code/7287
Author:   abelbeck
Date:     2015-10-26 21:58:09 +0000 (Mon, 26 Oct 2015)
Log Message:
-----------
iperf3, new package, enabled where iperf is enabled. iperf3 is becomming more common and since it is small (100KB) let it sit along side the old iperf since they are not compatible

Modified Paths:
--------------
    branches/1.0/astlinux-ast11.config
    branches/1.0/astlinux-ast13.config
    branches/1.0/astlinux18.config
    branches/1.0/initrd.config
    branches/1.0/package/Config.in
    branches/1.0/runnix-uclibc.config
    branches/1.0/runnix.config

Added Paths:
-----------
    branches/1.0/package/iperf3/
    branches/1.0/package/iperf3/Config.in
    branches/1.0/package/iperf3/iperf3-0001-disable-profiling.patch
    branches/1.0/package/iperf3/iperf3.mk

Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config	2015-10-26 18:16:25 UTC (rev 7286)
+++ branches/1.0/astlinux-ast11.config	2015-10-26 21:58:09 UTC (rev 7287)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7285-dirty Configuration
-# Mon Oct 26 13:04:22 2015
+# Buildroot 2011.08-svn7286-dirty Configuration
+# Mon Oct 26 16:51:59 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -706,6 +706,7 @@
 BR2_PACKAGE_IFTOP=y
 BR2_PACKAGE_INADYN=y
 BR2_PACKAGE_IPERF=y
+BR2_PACKAGE_IPERF3=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_IPSEC_TOOLS=y
 BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT=y

Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config	2015-10-26 18:16:25 UTC (rev 7286)
+++ branches/1.0/astlinux-ast13.config	2015-10-26 21:58:09 UTC (rev 7287)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7285-dirty Configuration
-# Mon Oct 26 13:04:23 2015
+# Buildroot 2011.08-svn7286-dirty Configuration
+# Mon Oct 26 16:52:01 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -706,6 +706,7 @@
 BR2_PACKAGE_IFTOP=y
 BR2_PACKAGE_INADYN=y
 BR2_PACKAGE_IPERF=y
+BR2_PACKAGE_IPERF3=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_IPSEC_TOOLS=y
 BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT=y

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2015-10-26 18:16:25 UTC (rev 7286)
+++ branches/1.0/astlinux18.config	2015-10-26 21:58:09 UTC (rev 7287)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7285-dirty Configuration
-# Mon Oct 26 13:04:21 2015
+# Buildroot 2011.08-svn7286-dirty Configuration
+# Mon Oct 26 16:51:52 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -706,6 +706,7 @@
 BR2_PACKAGE_IFTOP=y
 BR2_PACKAGE_INADYN=y
 BR2_PACKAGE_IPERF=y
+BR2_PACKAGE_IPERF3=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_IPSEC_TOOLS=y
 BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT=y

Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config	2015-10-26 18:16:25 UTC (rev 7286)
+++ branches/1.0/initrd.config	2015-10-26 21:58:09 UTC (rev 7287)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7285-dirty Configuration
-# Mon Oct 26 13:04:28 2015
+# Buildroot 2011.08-svn7286-dirty Configuration
+# Mon Oct 26 16:52:31 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -583,6 +583,7 @@
 # BR2_PACKAGE_IFTOP is not set
 # BR2_PACKAGE_INADYN is not set
 # BR2_PACKAGE_IPERF is not set
+# BR2_PACKAGE_IPERF3 is not set
 # BR2_PACKAGE_IPROUTE2 is not set
 # BR2_PACKAGE_IPSEC_TOOLS is not set
 # BR2_PACKAGE_IPSET is not set

Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in	2015-10-26 18:16:25 UTC (rev 7286)
+++ branches/1.0/package/Config.in	2015-10-26 21:58:09 UTC (rev 7287)
@@ -473,6 +473,7 @@
 source "package/iftop/Config.in"
 source "package/inadyn/Config.in"
 source "package/iperf/Config.in"
+source "package/iperf3/Config.in"
 source "package/iproute2/Config.in"
 source "package/ipsec-tools/Config.in"
 source "package/ipset/Config.in"

Added: branches/1.0/package/iperf3/Config.in
===================================================================
--- branches/1.0/package/iperf3/Config.in	                        (rev 0)
+++ branches/1.0/package/iperf3/Config.in	2015-10-26 21:58:09 UTC (rev 7287)
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_IPERF3
+	bool "iperf3"
+	help
+	  iperf is a tool for active measurements of the maximum
+	  achievable bandwidth on IP networks.
+	  It supports tuning of various parameters related to timing,
+	  protocols, and buffers. For each test it reports the bandwidth,
+	  loss, and other parameters.
+	  It's a redesign of the NLANR/DAST iperf(2) and is not
+	  backward compatible.
+
+	  https://iperf.fr
+	  https://github.com/esnet/iperf
+

Added: branches/1.0/package/iperf3/iperf3-0001-disable-profiling.patch
===================================================================
--- branches/1.0/package/iperf3/iperf3-0001-disable-profiling.patch	                        (rev 0)
+++ branches/1.0/package/iperf3/iperf3-0001-disable-profiling.patch	2015-10-26 21:58:09 UTC (rev 7287)
@@ -0,0 +1,20 @@
+This should be an option, but it's not.
+Don't force profiled builds, it breaks on many toolchains.
+Patch Makefile.in to avoid AUTORECONFing since it needs dummy files
+that are missing to succeed (ChangeLog, COPYING, NEWS, README) and it's
+simple enough so avoid pulling in dependencies and delays.
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+
+diff -Nura iperf-3.0.10.orig/src/Makefile.in iperf-3.0.10/src/Makefile.in
+--- iperf-3.0.10.orig/src/Makefile.in	2014-12-17 07:30:46.878310789 -0300
++++ iperf-3.0.10/src/Makefile.in	2014-12-17 07:33:41.879356643 -0300
+@@ -82,7 +82,7 @@
+ host_triplet = @host@
+ bin_PROGRAMS = iperf3$(EXEEXT)
+ noinst_PROGRAMS = t_timer$(EXEEXT) t_units$(EXEEXT) t_uuid$(EXEEXT) \
+-	iperf3_profile$(EXEEXT)
++	iperf3$(EXEEXT)
+ TESTS = t_timer$(EXEEXT) t_units$(EXEEXT) t_uuid$(EXEEXT)
+ subdir = src
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \

Added: branches/1.0/package/iperf3/iperf3.mk
===================================================================
--- branches/1.0/package/iperf3/iperf3.mk	                        (rev 0)
+++ branches/1.0/package/iperf3/iperf3.mk	2015-10-26 21:58:09 UTC (rev 7287)
@@ -0,0 +1,11 @@
+################################################################################
+#
+# iperf3
+#
+################################################################################
+
+IPERF3_VERSION = 3.0.11
+IPERF3_SOURCE = iperf-$(IPERF3_VERSION)-source.tar.gz
+IPERF3_SITE = --no-check-certificate https://iperf.fr/download/iperf_3.0
+
+$(eval $(call AUTOTARGETS,package,iperf3))

Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config	2015-10-26 18:16:25 UTC (rev 7286)
+++ branches/1.0/runnix-uclibc.config	2015-10-26 21:58:09 UTC (rev 7287)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7285-dirty Configuration
-# Mon Oct 26 13:04:26 2015
+# Buildroot 2011.08-svn7286-dirty Configuration
+# Mon Oct 26 16:52:27 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -874,6 +874,7 @@
 #
 # iperf requires a toolchain with C++ support enabled
 #
+# BR2_PACKAGE_IPERF3 is not set
 # BR2_PACKAGE_IPROUTE2 is not set
 # BR2_PACKAGE_IPSEC_TOOLS is not set
 

Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config	2015-10-26 18:16:25 UTC (rev 7286)
+++ branches/1.0/runnix.config	2015-10-26 21:58:09 UTC (rev 7287)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7285-dirty Configuration
-# Mon Oct 26 13:04:24 2015
+# Buildroot 2011.08-svn7286-dirty Configuration
+# Mon Oct 26 16:52:12 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -616,6 +616,7 @@
 # BR2_PACKAGE_IFTOP is not set
 # BR2_PACKAGE_INADYN is not set
 # BR2_PACKAGE_IPERF is not set
+# BR2_PACKAGE_IPERF3 is not set
 # BR2_PACKAGE_IPROUTE2 is not set
 # BR2_PACKAGE_IPSEC_TOOLS is not set
 # BR2_PACKAGE_IPSET is not set

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7286] branches/1.0

[<abe...@us...>]

Revision: 7286
          http://sourceforge.net/p/astlinux/code/7286
Author:   abelbeck
Date:     2015-10-26 18:16:25 +0000 (Mon, 26 Oct 2015)
Log Message:
-----------
dibbler, new package, disabled for now.  Adds DHCPv6 client support but configuration is missing.  Quite large binart at 680kb, but the spawned daemon is much smaller.

Modified Paths:
--------------
    branches/1.0/astlinux-ast11.config
    branches/1.0/astlinux-ast13.config
    branches/1.0/astlinux18.config
    branches/1.0/initrd.config
    branches/1.0/package/Config.in
    branches/1.0/runnix-uclibc.config
    branches/1.0/runnix.config

Added Paths:
-----------
    branches/1.0/package/dibbler/
    branches/1.0/package/dibbler/Config.in
    branches/1.0/package/dibbler/dibbler.mk

Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config	2015-10-25 17:46:52 UTC (rev 7285)
+++ branches/1.0/astlinux-ast11.config	2015-10-26 18:16:25 UTC (rev 7286)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7246-dirty Configuration
-# Wed Sep 16 16:25:07 2015
+# Buildroot 2011.08-svn7285-dirty Configuration
+# Mon Oct 26 13:04:22 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -691,6 +691,7 @@
 # BR2_PACKAGE_CUPS is not set
 BR2_PACKAGE_DARKSTAT=y
 BR2_PACKAGE_DHCPDUMP=y
+# BR2_PACKAGE_DIBBLER is not set
 BR2_PACKAGE_DNSCRYPT_PROXY=y
 BR2_PACKAGE_DNSMASQ=y
 BR2_PACKAGE_DNSMASQ_TFTP=y

Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config	2015-10-25 17:46:52 UTC (rev 7285)
+++ branches/1.0/astlinux-ast13.config	2015-10-26 18:16:25 UTC (rev 7286)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7246-dirty Configuration
-# Wed Sep 16 16:25:12 2015
+# Buildroot 2011.08-svn7285-dirty Configuration
+# Mon Oct 26 13:04:23 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -691,6 +691,7 @@
 # BR2_PACKAGE_CUPS is not set
 BR2_PACKAGE_DARKSTAT=y
 BR2_PACKAGE_DHCPDUMP=y
+# BR2_PACKAGE_DIBBLER is not set
 BR2_PACKAGE_DNSCRYPT_PROXY=y
 BR2_PACKAGE_DNSMASQ=y
 BR2_PACKAGE_DNSMASQ_TFTP=y

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2015-10-25 17:46:52 UTC (rev 7285)
+++ branches/1.0/astlinux18.config	2015-10-26 18:16:25 UTC (rev 7286)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7246-dirty Configuration
-# Wed Sep 16 16:25:04 2015
+# Buildroot 2011.08-svn7285-dirty Configuration
+# Mon Oct 26 13:04:21 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -691,6 +691,7 @@
 # BR2_PACKAGE_CUPS is not set
 BR2_PACKAGE_DARKSTAT=y
 BR2_PACKAGE_DHCPDUMP=y
+# BR2_PACKAGE_DIBBLER is not set
 BR2_PACKAGE_DNSCRYPT_PROXY=y
 BR2_PACKAGE_DNSMASQ=y
 BR2_PACKAGE_DNSMASQ_TFTP=y

Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config	2015-10-25 17:46:52 UTC (rev 7285)
+++ branches/1.0/initrd.config	2015-10-26 18:16:25 UTC (rev 7286)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7246-dirty Configuration
-# Wed Sep 16 16:25:17 2015
+# Buildroot 2011.08-svn7285-dirty Configuration
+# Mon Oct 26 13:04:28 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -571,6 +571,7 @@
 # BR2_PACKAGE_CUPS is not set
 # BR2_PACKAGE_DARKSTAT is not set
 # BR2_PACKAGE_DHCPDUMP is not set
+# BR2_PACKAGE_DIBBLER is not set
 # BR2_PACKAGE_DNSCRYPT_PROXY is not set
 # BR2_PACKAGE_DNSMASQ is not set
 # BR2_PACKAGE_DROPBEAR is not set

Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in	2015-10-25 17:46:52 UTC (rev 7285)
+++ branches/1.0/package/Config.in	2015-10-26 18:16:25 UTC (rev 7286)
@@ -461,6 +461,7 @@
 source "package/dhcp/Config.in"
 endif
 source "package/dhcpdump/Config.in"
+source "package/dibbler/Config.in"
 source "package/dnscrypt-proxy/Config.in"
 source "package/dnsmasq/Config.in"
 source "package/dropbear/Config.in"

Added: branches/1.0/package/dibbler/Config.in
===================================================================
--- branches/1.0/package/dibbler/Config.in	                        (rev 0)
+++ branches/1.0/package/dibbler/Config.in	2015-10-26 18:16:25 UTC (rev 7286)
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_DIBBLER
+	bool "dibbler"
+	help
+	  Dibbler is a portable DHCPv6 implementation.
+
+	  http://klub.com.pl/dhcpv6/
+	  http://sourceforge.net/projects/dibbler/
+

Added: branches/1.0/package/dibbler/dibbler.mk
===================================================================
--- branches/1.0/package/dibbler/dibbler.mk	                        (rev 0)
+++ branches/1.0/package/dibbler/dibbler.mk	2015-10-26 18:16:25 UTC (rev 7286)
@@ -0,0 +1,30 @@
+################################################################################
+#
+# dibbler
+#
+################################################################################
+
+DIBBLER_VERSION = 1.0.1
+DIBBLER_SOURCE = dibbler-$(DIBBLER_VERSION).tar.gz
+DIBBLER_SITE = http://downloads.sourceforge.net/project/dibbler/dibbler/$(DIBBLER_VERSION)
+
+DIBBLER_CONF_OPT = \
+	--enable-dst-addr-check \
+	--disable-dns-update \
+	--disable-auth \
+	--disable-link-state
+
+## Only build dibbler-client
+DIBBLER_MAKE_OPT = client
+
+define DIBBLER_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/dibbler-client $(TARGET_DIR)/usr/sbin/
+	ln -sf /tmp/etc/dibbler $(TARGET_DIR)/etc/dibbler
+endef
+
+define DIBBLER_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/sbin/dibbler-client
+	rm -f $(TARGET_DIR)/etc/dibbler
+endef
+
+$(eval $(call AUTOTARGETS,package,dibbler))

Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config	2015-10-25 17:46:52 UTC (rev 7285)
+++ branches/1.0/runnix-uclibc.config	2015-10-26 18:16:25 UTC (rev 7286)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7246-dirty Configuration
-# Wed Sep 16 16:25:16 2015
+# Buildroot 2011.08-svn7285-dirty Configuration
+# Mon Oct 26 13:04:26 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -854,6 +854,7 @@
 # BR2_PACKAGE_DARKSTAT is not set
 # BR2_PACKAGE_DHCP is not set
 # BR2_PACKAGE_DHCPDUMP is not set
+# BR2_PACKAGE_DIBBLER is not set
 # BR2_PACKAGE_DNSCRYPT_PROXY is not set
 # BR2_PACKAGE_DNSMASQ is not set
 BR2_PACKAGE_DROPBEAR=y

Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config	2015-10-25 17:46:52 UTC (rev 7285)
+++ branches/1.0/runnix.config	2015-10-26 18:16:25 UTC (rev 7286)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7246-dirty Configuration
-# Wed Sep 16 16:25:15 2015
+# Buildroot 2011.08-svn7285-dirty Configuration
+# Mon Oct 26 13:04:24 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -602,6 +602,7 @@
 # BR2_PACKAGE_DARKSTAT is not set
 # BR2_PACKAGE_DHCP is not set
 # BR2_PACKAGE_DHCPDUMP is not set
+# BR2_PACKAGE_DIBBLER is not set
 # BR2_PACKAGE_DNSCRYPT_PROXY is not set
 # BR2_PACKAGE_DNSMASQ is not set
 BR2_PACKAGE_DROPBEAR=y

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7285] branches/1.0/package/smartmontools/ smartmontools-Transcend-610.patch

[<abe...@us...>]

Revision: 7285
          http://sourceforge.net/p/astlinux/code/7285
Author:   abelbeck
Date:     2015-10-25 17:46:52 +0000 (Sun, 25 Oct 2015)
Log Message:
-----------
smartmontools, drivedb.h add support for Transcend mSATA (mini) TS32GMSM610

Added Paths:
-----------
    branches/1.0/package/smartmontools/smartmontools-Transcend-610.patch

Added: branches/1.0/package/smartmontools/smartmontools-Transcend-610.patch
===================================================================
--- branches/1.0/package/smartmontools/smartmontools-Transcend-610.patch	                        (rev 0)
+++ branches/1.0/package/smartmontools/smartmontools-Transcend-610.patch	2015-10-25 17:46:52 UTC (rev 7285)
@@ -0,0 +1,11 @@
+--- smartmontools-6.4/drivedb.h.orig	2015-10-25 12:26:29.000000000 -0500
++++ smartmontools-6.4/drivedb.h	2015-10-25 12:31:41.000000000 -0500
+@@ -1106,7 +1106,7 @@
+     "-v 244,raw48,Thermal_Throttle "
+   },
+   { "SiliconMotion based SSDs", // SM2246EN (Transcend TS6500)
+-    "TS((16|32|64|128|256|512)G|1T)(SSD|MSA)370", // Transcend SSD370 SATA/mSATA, TS6500, tested with
++    "TS((16|32|64|128|256|512)G|1T)(SSD|MSA|MSM)(370S?|420I?|610)", // Transcend SSD370/420/610 SATA/mSATA, TS6500,
+       // TS32GMSA370/20140402, TS16GMSA370/20140516, TS64GSSD370/20140516, TS256GSSD370/N0815B
+     "", "",
+   //"-v 1,raw48,Raw_Read_Error_Rate "

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7284] branches/1.0/package/dnsmasq/dnsmasq.init

[<abe...@us...>]

Revision: 7284
          http://sourceforge.net/p/astlinux/code/7284
Author:   abelbeck
Date:     2015-10-22 18:17:19 +0000 (Thu, 22 Oct 2015)
Log Message:
-----------
dnsmasq, fix special case where an interface is DNS-only but IPv6 autoconfig is enabled.  Thanks to Ian for the pointer.

Modified Paths:
--------------
    branches/1.0/package/dnsmasq/dnsmasq.init

Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init	2015-10-20 18:12:26 UTC (rev 7283)
+++ branches/1.0/package/dnsmasq/dnsmasq.init	2015-10-22 18:17:19 UTC (rev 7284)
@@ -121,6 +121,10 @@
   # args: IF, tag
   local interface="$1" tag="$2" prefix="" iname IFS
 
+  if [ "$IPV6" != "yes" ]; then
+    return 2
+  fi
+
   unset IFS
   for iname in $IPV6_AUTOCONF; do
     case $iname in
@@ -154,7 +158,10 @@
   if [ -n "$prefix" ]; then
     echo "
 dhcp-range=$tag,$prefix,ra-only,64,24h"
+    return 0
   fi
+
+  return 1
 }
 
 addDNSMASQnet()
@@ -178,11 +185,11 @@
       ipend=$(($ipbase + $dend))
       trueDNSMASQnet $4 $2 $(_mkdottedquad $ipstart) $(_mkdottedquad $ipend)
 
-      if [ "$IPV6" = "yes" ]; then
-        addIPV6net $1 $4
+      addIPV6net $1 $4
+    else
+      if ! addIPV6net $1 $4; then
+        falseDNSMASQnet $1
       fi
-    else
-      falseDNSMASQnet $1
     fi
   fi
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7283] branches/1.0/package/asterisk

[<abe...@us...>]

Revision: 7283
          http://sourceforge.net/p/astlinux/code/7283
Author:   abelbeck
Date:     2015-10-20 18:12:26 +0000 (Tue, 20 Oct 2015)
Log Message:
-----------
asterisk, add issue ASTERISK-25476 patches

Added Paths:
-----------
    branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch
    branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch

Added: branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch	2015-10-20 18:12:26 UTC (rev 7283)
@@ -0,0 +1,20 @@
+--- asterisk-11.20.0/res/res_rtp_asterisk.c.orig	2015-10-20 12:52:37.000000000 -0500
++++ asterisk-11.20.0/res/res_rtp_asterisk.c	2015-10-20 12:53:38.000000000 -0500
+@@ -4635,7 +4635,7 @@
+ 			return;
+ 		} else {
+ 			if (rtp->rtcp) {
+-				if (rtp->rtcp->schedid > 0) {
++				if (rtp->rtcp->schedid > -1) {
+ 					if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) {
+ 						/* Successfully cancelled scheduler entry. */
+ 						ao2_ref(instance, -1);
+@@ -4863,7 +4863,7 @@
+ 	}
+ #endif
+ 
+-	if (rtp->rtcp && rtp->rtcp->schedid > 0) {
++	if (rtp->rtcp && rtp->rtcp->schedid > -1) {
+ 		if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) {
+ 			/* successfully cancelled scheduler entry. */
+ 			ao2_ref(instance, -1);

Added: branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch	2015-10-20 18:12:26 UTC (rev 7283)
@@ -0,0 +1,20 @@
+--- asterisk-11.20.0/res/res_rtp_asterisk.c.orig	2015-10-20 12:52:37.000000000 -0500
++++ asterisk-11.20.0/res/res_rtp_asterisk.c	2015-10-20 12:53:38.000000000 -0500
+@@ -4780,7 +4780,7 @@
+ 			return;
+ 		} else {
+ 			if (rtp->rtcp) {
+-				if (rtp->rtcp->schedid > 0) {
++				if (rtp->rtcp->schedid > -1) {
+ 					if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) {
+ 						/* Successfully cancelled scheduler entry. */
+ 						ao2_ref(instance, -1);
+@@ -4997,7 +4997,7 @@
+ 	}
+ #endif
+ 
+-	if (rtp->rtcp && rtp->rtcp->schedid > 0) {
++	if (rtp->rtcp && rtp->rtcp->schedid > -1) {
+ 		if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) {
+ 			/* successfully cancelled scheduler entry. */
+ 			ao2_ref(instance, -1);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7282] branches/1.0/package/asterisk

[<abe...@us...>]

Revision: 7282
          http://sourceforge.net/p/astlinux/code/7282
Author:   abelbeck
Date:     2015-10-20 17:50:23 +0000 (Tue, 20 Oct 2015)
Log Message:
-----------
asterisk, version bump to 11.20.0 and 13.6.0, apply fixes later

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
    branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
    branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
    branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
    branches/1.0/package/asterisk/asterisk.mk

Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch	2015-10-20 17:11:56 UTC (rev 7281)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch	2015-10-20 17:50:23 UTC (rev 7282)
@@ -1,6 +1,6 @@
 --- asterisk-1.8.25.0/configure.ac.orig	2014-01-24 16:52:23.000000000 -0600
 +++ asterisk-1.8.25.0/configure.ac	2014-01-24 16:55:14.000000000 -0600
-@@ -2398,11 +2398,13 @@
+@@ -2404,11 +2404,13 @@
  AC_OUTPUT
  
  ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2

Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch	2015-10-20 17:11:56 UTC (rev 7281)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch	2015-10-20 17:50:23 UTC (rev 7282)
@@ -1,6 +1,6 @@
 --- asterisk-11.17.1/channels/chan_sip.c.orig	2015-04-23 10:22:04.000000000 -0500
 +++ asterisk-11.17.1/channels/chan_sip.c	2015-04-23 10:22:40.000000000 -0500
-@@ -16743,7 +16743,7 @@
+@@ -16767,7 +16767,7 @@
  	}
  
  	if (!force) {

Modified: branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch	2015-10-20 17:11:56 UTC (rev 7281)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch	2015-10-20 17:50:23 UTC (rev 7282)
@@ -1,6 +1,6 @@
 --- asterisk-13.1.0/configure.ac.orig	2014-01-24 16:52:23.000000000 -0600
 +++ asterisk-13.1.0/configure.ac	2014-01-24 16:55:14.000000000 -0600
-@@ -2511,11 +2511,13 @@
+@@ -2517,11 +2517,13 @@
  AC_OUTPUT
  
  ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2

Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch	2015-10-20 17:11:56 UTC (rev 7281)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch	2015-10-20 17:50:23 UTC (rev 7282)
@@ -1,6 +1,6 @@
 --- asterisk-11.17.1/channels/chan_sip.c.orig	2015-04-23 10:22:04.000000000 -0500
 +++ asterisk-11.17.1/channels/chan_sip.c	2015-04-23 10:22:40.000000000 -0500
-@@ -16894,7 +16894,7 @@
+@@ -16911,7 +16911,7 @@
  	}
  
  	if (!force) {

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2015-10-20 17:11:56 UTC (rev 7281)
+++ branches/1.0/package/asterisk/asterisk.mk	2015-10-20 17:50:23 UTC (rev 7282)
@@ -7,9 +7,9 @@
 ASTERISK_VERSION := 1.8.32.3
 else
  ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.19.0
+ASTERISK_VERSION := 11.20.0
  else
-ASTERISK_VERSION := 13.5.0
+ASTERISK_VERSION := 13.6.0
  endif
 endif
 ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7281] branches/1.0/project/astlinux/target_skeleton/ etc/astlinux-release

[<abe...@us...>]

Revision: 7281
          http://sourceforge.net/p/astlinux/code/7281
Author:   abelbeck
Date:     2015-10-20 17:11:56 +0000 (Tue, 20 Oct 2015)
Log Message:
-----------
return to release 'svn'

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release

Modified: branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release	2015-10-20 17:11:51 UTC (rev 7280)
+++ branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release	2015-10-20 17:11:56 UTC (rev 7281)
@@ -1 +1 @@
-astlinux-1.2.4.1
+svn

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7280] tags/1.2.4.1/

[<abe...@us...>]

Revision: 7280
          http://sourceforge.net/p/astlinux/code/7280
Author:   abelbeck
Date:     2015-10-20 17:11:51 +0000 (Tue, 20 Oct 2015)
Log Message:
-----------
create 1.2.4.1 tag

Added Paths:
-----------
    tags/1.2.4.1/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7279] branches/1.0/project/astlinux/target_skeleton/ etc/astlinux-release

[<abe...@us...>]

Revision: 7279
          http://sourceforge.net/p/astlinux/code/7279
Author:   abelbeck
Date:     2015-10-20 17:11:44 +0000 (Tue, 20 Oct 2015)
Log Message:
-----------
mark release 'astlinux-1.2.4.1'

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release

Modified: branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release	2015-10-20 17:08:38 UTC (rev 7278)
+++ branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release	2015-10-20 17:11:44 UTC (rev 7279)
@@ -1 +1 @@
-svn
+astlinux-1.2.4.1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7278] branches/1.0/docs/ChangeLog.txt

[<abe...@us...>]

Revision: 7278
          http://sourceforge.net/p/astlinux/code/7278
Author:   abelbeck
Date:     2015-10-20 17:08:38 +0000 (Tue, 20 Oct 2015)
Log Message:
-----------
update ChangeLog

Modified Paths:
--------------
    branches/1.0/docs/ChangeLog.txt

Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt	2015-10-19 13:56:03 UTC (rev 7277)
+++ branches/1.0/docs/ChangeLog.txt	2015-10-20 17:08:38 UTC (rev 7278)
@@ -124,6 +124,13 @@
 -- SQL-Data tab, version bump to phpLiteAdmin 1.9.6, modified for AstLinux
 
 
+Additions for AstLinux 1.2.4:
+=============================
+
+Not released due to last-second issue discovered with Asterisk 11.20.0 and 13.6.0
+More Info: https://issues.asterisk.org/jira/browse/ASTERISK-25476
+
+
 Additions for AstLinux 1.2.3:
 =============================
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7277] branches/1.0/docs/ChangeLog.txt

[<abe...@us...>]

Revision: 7277
          http://sourceforge.net/p/astlinux/code/7277
Author:   abelbeck
Date:     2015-10-19 13:56:03 +0000 (Mon, 19 Oct 2015)
Log Message:
-----------
update ChangeLog

Modified Paths:
--------------
    branches/1.0/docs/ChangeLog.txt

Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt	2015-10-18 23:12:00 UTC (rev 7276)
+++ branches/1.0/docs/ChangeLog.txt	2015-10-19 13:56:03 UTC (rev 7277)
@@ -5,8 +5,8 @@
 === docs/ChangeLog.txt
 =========================================================
 
-Additions for AstLinux 1.2.4:
-=============================
+Additions for AstLinux 1.2.4.1:
+===============================
 
 Released **TBD**
 
@@ -91,7 +91,7 @@
 
 ** Asterisk
 
--- Asterisk 1.8.32.3 (no change), 11.20.0 (version bump) and 13.6.0 (version bump)
+-- Asterisk 1.8.32.3 (no change), 11.19.0 (version bump) and 13.5.0 (version bump)
 
 -- DAHDI, dahdi-linux 2.8.0.1 (no change) and dahdi-tools 2.8.0 (no change)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7276] branches/1.0/package/fping/fping.mk

[<abe...@us...>]

Revision: 7276
          http://sourceforge.net/p/astlinux/code/7276
Author:   abelbeck
Date:     2015-10-18 23:12:00 +0000 (Sun, 18 Oct 2015)
Log Message:
-----------
fping, revert back to 3.10 since 3.12 can segfault

Modified Paths:
--------------
    branches/1.0/package/fping/fping.mk

Modified: branches/1.0/package/fping/fping.mk
===================================================================
--- branches/1.0/package/fping/fping.mk	2015-10-18 22:56:56 UTC (rev 7275)
+++ branches/1.0/package/fping/fping.mk	2015-10-18 23:12:00 UTC (rev 7276)
@@ -3,7 +3,7 @@
 # fping
 #
 #############################################################
-FPING_VERSION = 3.12
+FPING_VERSION = 3.10
 FPING_SITE = http://fping.org/dist
 FPING_SOURCE = fping-$(FPING_VERSION).tar.gz
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7275] branches/1.0/package/asterisk

[<abe...@us...>]

Revision: 7275
          http://sourceforge.net/p/astlinux/code/7275
Author:   abelbeck
Date:     2015-10-18 22:56:56 +0000 (Sun, 18 Oct 2015)
Log Message:
-----------
asterisk, revert r7267, set versions to 11.19.0 and 13.5.0

Revision Links:
--------------
    http://sourceforge.net/p/astlinux/code/7267

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
    branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
    branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
    branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
    branches/1.0/package/asterisk/asterisk.mk

Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch	2015-10-16 15:38:59 UTC (rev 7274)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch	2015-10-18 22:56:56 UTC (rev 7275)
@@ -1,6 +1,6 @@
 --- asterisk-1.8.25.0/configure.ac.orig	2014-01-24 16:52:23.000000000 -0600
 +++ asterisk-1.8.25.0/configure.ac	2014-01-24 16:55:14.000000000 -0600
-@@ -2404,11 +2404,13 @@
+@@ -2398,11 +2398,13 @@
  AC_OUTPUT
  
  ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2

Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch	2015-10-16 15:38:59 UTC (rev 7274)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch	2015-10-18 22:56:56 UTC (rev 7275)
@@ -1,6 +1,6 @@
 --- asterisk-11.17.1/channels/chan_sip.c.orig	2015-04-23 10:22:04.000000000 -0500
 +++ asterisk-11.17.1/channels/chan_sip.c	2015-04-23 10:22:40.000000000 -0500
-@@ -16767,7 +16767,7 @@
+@@ -16743,7 +16743,7 @@
  	}
  
  	if (!force) {

Modified: branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch	2015-10-16 15:38:59 UTC (rev 7274)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch	2015-10-18 22:56:56 UTC (rev 7275)
@@ -1,6 +1,6 @@
 --- asterisk-13.1.0/configure.ac.orig	2014-01-24 16:52:23.000000000 -0600
 +++ asterisk-13.1.0/configure.ac	2014-01-24 16:55:14.000000000 -0600
-@@ -2517,11 +2517,13 @@
+@@ -2511,11 +2511,13 @@
  AC_OUTPUT
  
  ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2

Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch	2015-10-16 15:38:59 UTC (rev 7274)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch	2015-10-18 22:56:56 UTC (rev 7275)
@@ -1,6 +1,6 @@
 --- asterisk-11.17.1/channels/chan_sip.c.orig	2015-04-23 10:22:04.000000000 -0500
 +++ asterisk-11.17.1/channels/chan_sip.c	2015-04-23 10:22:40.000000000 -0500
-@@ -16911,7 +16911,7 @@
+@@ -16894,7 +16894,7 @@
  	}
  
  	if (!force) {

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2015-10-16 15:38:59 UTC (rev 7274)
+++ branches/1.0/package/asterisk/asterisk.mk	2015-10-18 22:56:56 UTC (rev 7275)
@@ -7,9 +7,9 @@
 ASTERISK_VERSION := 1.8.32.3
 else
  ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.20.0
+ASTERISK_VERSION := 11.19.0
  else
-ASTERISK_VERSION := 13.6.0
+ASTERISK_VERSION := 13.5.0
  endif
 endif
 ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7274] branches/1.0/package/mtr/mtr-use-default-colors .patch

[<abe...@us...>]

Revision: 7274
          http://sourceforge.net/p/astlinux/code/7274
Author:   abelbeck
Date:     2015-10-16 15:38:59 +0000 (Fri, 16 Oct 2015)
Log Message:
-----------
mtr, include upstream patch that adds transparent background support

Modified Paths:
--------------
    branches/1.0/package/mtr/mtr-use-default-colors.patch

Modified: branches/1.0/package/mtr/mtr-use-default-colors.patch
===================================================================
--- branches/1.0/package/mtr/mtr-use-default-colors.patch	2015-10-16 15:06:12 UTC (rev 7273)
+++ branches/1.0/package/mtr/mtr-use-default-colors.patch	2015-10-16 15:38:59 UTC (rev 7274)
@@ -22,3 +22,36 @@
    int i;
    for (i = 0; i < 8; i++)
        init_pair(i+1, i, 0);
+
+From 7571201cf7a3394e0dcd2b037aba1836089cc084 Mon Sep 17 00:00:00 2001
+From: Narthorn <nar...@gm...>
+Date: Mon, 12 Oct 2015 13:24:57 +0200
+Subject: [PATCH] curses: Fix background transparency in terminal
+
+Patch comes from, and closes traviscross/mtr#72.
+---
+ curses.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/curses.c b/curses.c
+index 02b7937..f95f5d1 100644
+--- a/curses.c
++++ b/curses.c
+@@ -700,13 +700,15 @@ void mtr_curses_open(void)
+   initscr();
+   raw();
+   noecho(); 
++  int bg_col = 0;
+   start_color();
+ #ifdef HAVE_USE_DEFAULT_COLORS
+-  use_default_colors();
++  if (use_default_colors() == OK)
++    bg_col = -1;
+ #endif
+   int i;
+   for (i = 0; i < 8; i++)
+-      init_pair(i+1, i, 0);
++      init_pair(i+1, i, bg_col);
+ 
+   mtr_curses_init();
+   mtr_curses_redraw();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7273] branches/1.0/package/fping/fping.mk

[<abe...@us...>]

Revision: 7273
          http://sourceforge.net/p/astlinux/code/7273
Author:   abelbeck
Date:     2015-10-16 15:06:12 +0000 (Fri, 16 Oct 2015)
Log Message:
-----------
fping, version bump to 3.12

Modified Paths:
--------------
    branches/1.0/package/fping/fping.mk

Modified: branches/1.0/package/fping/fping.mk
===================================================================
--- branches/1.0/package/fping/fping.mk	2015-10-15 14:37:05 UTC (rev 7272)
+++ branches/1.0/package/fping/fping.mk	2015-10-16 15:06:12 UTC (rev 7273)
@@ -3,7 +3,7 @@
 # fping
 #
 #############################################################
-FPING_VERSION = 3.10
+FPING_VERSION = 3.12
 FPING_SITE = http://fping.org/dist
 FPING_SOURCE = fping-$(FPING_VERSION).tar.gz
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7272] branches/1.0/project/astlinux/target_skeleton/ etc/astlinux-release

[<abe...@us...>]

Revision: 7272
          http://sourceforge.net/p/astlinux/code/7272
Author:   abelbeck
Date:     2015-10-15 14:37:05 +0000 (Thu, 15 Oct 2015)
Log Message:
-----------
return to release 'svn'

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release

Modified: branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release	2015-10-15 14:37:00 UTC (rev 7271)
+++ branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release	2015-10-15 14:37:05 UTC (rev 7272)
@@ -1 +1 @@
-astlinux-1.2.4
+svn

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Astlinux-commits] SF.net SVN: astlinux:[7271] tags/1.2.4/

[<abe...@us...>]

Revision: 7271
          http://sourceforge.net/p/astlinux/code/7271
Author:   abelbeck
Date:     2015-10-15 14:37:00 +0000 (Thu, 15 Oct 2015)
Log Message:
-----------
create 1.2.4 tag

Added Paths:
-----------
    tags/1.2.4/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.