Hi,
new and easy update to 2.1.3:
Fixed Bugs
o Fix GA unlock.
o Fix incomplete handshake.
o Fix syslog message buffer overflow.
o Fix missing 102 INFO message for TERM GL.
o Fix needless INFO LOCK message on TERM GL.
o Fix serial line read on unusable Lenz module.
o Fix missing 102 INFO message for TERM GA.
o Fix needless INFO LOCK message on TERM GA.
o Fix potential buffer overflow.
New Features
o Add support for dc-car sender (serial pc-device).
o Add POM read for locomotives.
o Add experimental BiDi GL address message for IB (opendcc) module
o Writing CV#1 in operations mode programming in ddl mode now
enabled
o configure does not check for i2c header files if i2c module
is not used.
OK?
cheers,
Sebastian
Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/srcpd/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 16 Nov 2014 11:39:44 -0000 1.9
+++ Makefile 3 May 2015 11:06:37 -0000
@@ -2,7 +2,7 @@
COMMENT = daemon to control digital model railroad systems
-DISTNAME = srcpd-2.1.2
+DISTNAME = srcpd-2.1.3
CATEGORIES = misc net
HOMEPAGE = http://srcpd.sourceforge.net/
@@ -17,7 +17,7 @@
WANTLIB += c m pthread z xml2
LIB_DEPENDS += textproc/libxml
-AUTOCONF_VERSION = 2.64
+AUTOCONF_VERSION = 2.69
CONFIGURE_STYLE = autoconf
FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples/srcpd
Index: distinfo
===================================================================
RCS file: /cvs/ports/misc/srcpd/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 16 Nov 2014 11:39:44 -0000 1.2
+++ distinfo 3 May 2015 11:06:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (srcpd-2.1.2.tar.gz) = /CdwCDu3ZBK6B0bCW0PiXbzIwv0Y1jJwdT8v3hPXVd0=
-SIZE (srcpd-2.1.2.tar.gz) = 351114
+SHA256 (srcpd-2.1.3.tar.gz) = WUR4CiOKrtvTJBgu4w1wiRqc0l+Q7EcIh5QPiYP44A8=
+SIZE (srcpd-2.1.3.tar.gz) = 366396
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/misc/srcpd/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 16 Nov 2014 11:39:44 -0000 1.2
+++ patches/patch-Makefile_in 3 May 2015 11:06:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.2 2014/11/16 11:39:44 sebastia Exp $
---- Makefile.in.orig Sat Jan 26 18:11:52 2013
-+++ Makefile.in Sat Oct 25 12:53:50 2014
-@@ -734,7 +734,7 @@ info: info-recursive
+--- Makefile.in.orig Thu Apr 23 22:46:25 2015
++++ Makefile.in Sat May 2 18:23:39 2015
+@@ -768,7 +768,7 @@ info: info-recursive
info-am:
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_ac 3 May 2015 11:06:37 -0000
@@ -0,0 +1,124 @@
+$OpenBSD$
+
+postincrement doesn't work with ksh, sent upstream:
+https://sourceforge.net/p/srcpd/bugs/18/
+
+--- configure.ac.orig Thu Apr 23 22:44:54 2015
++++ configure.ac Sun May 3 12:52:01 2015
+@@ -38,7 +38,7 @@ AC_ARG_ENABLE(ddl,
+ [with_DLL="$enableval"], [with_DDL=yes])
+ if test "$with_DDL" = "yes"; then
+ AC_DEFINE(USE_DDL,1, [define to 1 if you want ddl support])
+- ((NUM_MODULES++))
++ NUM_MODULES=`expr $NUM_MODULES + 1`
+ fi
+ AM_CONDITIONAL(USE_DDL, test "$with_DDL" = yes)
+
+@@ -48,7 +48,7 @@ AC_ARG_ENABLE(ddls88,
+ [with_DLL88="$enableval"], [with_DDLS88=yes])
+ if test "$with_DDLS88" = "yes"; then
+ AC_DEFINE(USE_DDLS88,1, [define to 1 if you want ddl-s88 support])
+- ((NUM_MODULES++))
++ NUM_MODULES=`expr $NUM_MODULES + 1`
+ fi
+ AM_CONDITIONAL(USE_DDLS88, test "$with_DDLS88" = yes)
+
+@@ -58,7 +58,7 @@ AC_ARG_ENABLE(hsi88,
+ [with_HSI88="$leval"], [with_HSI88=yes])
+ if test "$with_HSI88" = "yes"; then
+ AC_DEFINE(USE_HSI88,1,[define to 1 if you want hsi-88 support])
+- ((NUM_MODULES++))
++ NUM_MODULES=`expr $NUM_MODULES + 1`
+ fi
+ AM_CONDITIONAL(USE_HSI88, test "$with_HSI88" = yes)
+
+@@ -68,7 +68,7 @@ AC_ARG_ENABLE(i2cdev,
+ [with_I2C="$enableval"], [with_I2C=yes])
+ if test "$with_I2C" = "yes"; then
+ AC_DEFINE(USE_I2C,1, [define to 1 if you want i2c-dev support])
+- ((NUM_MODULES++))
++ NUM_MODULES=`expr $NUM_MODULES + 1`
+ fi
+ AM_CONDITIONAL(USE_I2C, test "$with_I2C" = yes)
+
+@@ -78,7 +78,7 @@ AC_ARG_ENABLE(intellibox,
+ [with_IB="$enableval"], [with_IB=yes])
+ if test "$with_IB" = "yes"; then
+ AC_DEFINE(USE_IB,1,[define to 1 if you want intellibox support])
+- ((NUM_MODULES++))
++ NUM_MODULES=`expr $NUM_MODULES + 1`
+ fi
+ AM_CONDITIONAL(USE_IB, test "$with_IB" = yes)
+
+@@ -88,7 +88,7 @@ AC_ARG_ENABLE(li100,
+ [with_LI100="$enableval"], [with_LI100=yes])
+ if test "$with_LI100" = "yes"; then
+ AC_DEFINE(USE_LI100,1,[define to 1 if you want li100 (RS232 + USB)
support])
+- ((NUM_MODULES++))
++ NUM_MODULES=`expr $NUM_MODULES + 1`
+ fi
+ AM_CONDITIONAL(USE_LI100, test "$with_LI100" = yes)
+
+@@ -98,7 +98,7 @@ AC_ARG_ENABLE(loconet,
+ [with_LOCONET="$enableval"], [with_LOCONET=yes])
+ if test "$with_LOCONET" = "yes"; then
+ AC_DEFINE(USE_LOCONET,1, [define to 1 if you want loconet support])
+- ((NUM_MODULES++))
++ NUM_MODULES=`expr $NUM_MODULES + 1`
+ fi
+ AM_CONDITIONAL(USE_LOCONET, test "$with_LOCONET" = yes)
+
+@@ -108,7 +108,7 @@ AC_ARG_ENABLE(loopback,
+ [with_LOOPBACK="$enableval"], [with_LOOPBACK=yes])
+ if test "$with_LOOPBACK" = "yes"; then
+ AC_DEFINE(USE_LOOPBACK,1, [define to 1 if you want loopback support])
+- ((NUM_MODULES++))
++ NUM_MODULES=`expr $NUM_MODULES + 1`
+ fi
+ AM_CONDITIONAL(USE_LOOPBACK, test "$with_LOOPBACK" = yes)
+
+@@ -118,7 +118,7 @@ AC_ARG_ENABLE(m605x,
+ [with_M605X="$enableval"], [with_M605X=yes])
+ if test "$with_M605X" = "yes"; then
+ AC_DEFINE(USE_M605X,1, [define to 1 if you want m605x support])
+- ((NUM_MODULES++))
++ NUM_MODULES=`expr $NUM_MODULES + 1`
+ fi
+ AM_CONDITIONAL(USE_M605X, test "$with_M605X" = yes)
+
+@@ -128,7 +128,7 @@ AC_ARG_ENABLE(selectrix,
+ [with_SELECTRIX="$enableval"], [with_SELECTRIX=yes])
+ if test "$with_SELECTRIX" = "yes"; then
+ AC_DEFINE(USE_SELECTRIX,1,[define to 1 if you want selectrix support])
+- ((NUM_MODULES++))
++ NUM_MODULES=`expr $NUM_MODULES + 1`
+ fi
+ AM_CONDITIONAL(USE_SELECTRIX, test "$with_SELECTRIX" = yes)
+
+@@ -138,7 +138,7 @@ AC_ARG_ENABLE(zimo,
+ [with_ZIMO="$enableval"], [with_ZIMO=yes])
+ if test "$with_ZIMO" = "yes"; then
+ AC_DEFINE(USE_ZIMO,1, [define to 1 if you want zimo support])
+- ((NUM_MODULES++))
++ NUM_MODULES=`expr $NUM_MODULES + 1`
+ fi
+ AM_CONDITIONAL(USE_ZIMO, test "$with_ZIMO" = yes)
+
+@@ -148,7 +148,7 @@ AC_ARG_ENABLE(dccar,
+ [with_DCCAR="$enableval"], [with_DCCAR=yes])
+ if test "$with_DCCAR" = "yes"; then
+ AC_DEFINE(USE_DCCAR,1, [define to 1 if you want dccar support])
+- ((NUM_MODULES++))
++ NUM_MODULES=`expr $NUM_MODULES + 1`
+ fi
+ AM_CONDITIONAL(USE_DCCAR, test "$with_DCCAR" = yes)
+
+@@ -338,7 +338,7 @@ if test "$with_ZIMO" != "yes"; then echo " zim
+ if test "$with_DCCAR" != "yes"; then echo " dccar"; fi
+
+ echo
+-if ((NUM_MODULES == 0)); then
++if test $NUM_MODULES == 0; then
+ echo 'Warning: No device module configured; srcpd will not run
propperly!'
+ else
+ echo "Run 'make' to continue."
Index: patches/patch-configure_in
===================================================================
RCS file: patches/patch-configure_in
diff -N patches/patch-configure_in
--- patches/patch-configure_in 16 Nov 2014 11:39:44 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,111 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.2 2014/11/16 11:39:44 sebastia Exp $
---- configure.in.orig Sat Jan 26 18:11:01 2013
-+++ configure.in Sat Oct 25 12:53:50 2014
-@@ -38,7 +38,7 @@ AC_ARG_ENABLE(ddl,
- [with_DLL="$enableval"], [with_DDL=yes])
- if test "$with_DDL" = "yes"; then
- AC_DEFINE(USE_DDL,1, [define to 1 if you want ddl support])
-- ((NUM_MODULES++))
-+ NUM_MODDULES=`expr $NUM_MODULES + 1`
- fi
- AM_CONDITIONAL(USE_DDL, test "$with_DDL" = yes)
-
-@@ -48,7 +48,7 @@ AC_ARG_ENABLE(ddls88,
- [with_DLL88="$enableval"], [with_DDLS88=yes])
- if test "$with_DDLS88" = "yes"; then
- AC_DEFINE(USE_DDLS88,1, [define to 1 if you want ddl-s88 support])
-- ((NUM_MODULES++))
-+ NUM_MODDULES=`expr $NUM_MODULES + 1`
- fi
- AM_CONDITIONAL(USE_DDLS88, test "$with_DDLS88" = yes)
-
-@@ -58,7 +58,7 @@ AC_ARG_ENABLE(hsi88,
- [with_HSI88="$leval"], [with_HSI88=yes])
- if test "$with_HSI88" = "yes"; then
- AC_DEFINE(USE_HSI88,1,[define to 1 if you want hsi-88 support])
-- ((NUM_MODULES++))
-+ NUM_MODDULES=`expr $NUM_MODULES + 1`
- fi
- AM_CONDITIONAL(USE_HSI88, test "$with_HSI88" = yes)
-
-@@ -68,7 +68,7 @@ AC_ARG_ENABLE(i2cdev,
- [with_I2C="$enableval"], [with_I2C=yes])
- if test "$with_I2C" = "yes"; then
- AC_DEFINE(USE_I2C,1, [define to 1 if you want i2c-dev support])
-- ((NUM_MODULES++))
-+ NUM_MODDULES=`expr $NUM_MODULES + 1`
- fi
- AM_CONDITIONAL(USE_I2C, test "$with_I2C" = yes)
-
-@@ -78,7 +78,7 @@ AC_ARG_ENABLE(intellibox,
- [with_IB="$enableval"], [with_IB=yes])
- if test "$with_IB" = "yes"; then
- AC_DEFINE(USE_IB,1,[define to 1 if you want intellibox support])
-- ((NUM_MODULES++))
-+ NUM_MODDULES=`expr $NUM_MODULES + 1`
- fi
- AM_CONDITIONAL(USE_IB, test "$with_IB" = yes)
-
-@@ -88,7 +88,7 @@ AC_ARG_ENABLE(li100,
- [with_LI100="$enableval"], [with_LI100=yes])
- if test "$with_LI100" = "yes"; then
- AC_DEFINE(USE_LI100,1,[define to 1 if you want li100 (RS232 + USB)
support])
-- ((NUM_MODULES++))
-+ NUM_MODDULES=`expr $NUM_MODULES + 1`
- fi
- AM_CONDITIONAL(USE_LI100, test "$with_LI100" = yes)
-
-@@ -98,7 +98,7 @@ AC_ARG_ENABLE(loconet,
- [with_LOCONET="$enableval"], [with_LOCONET=yes])
- if test "$with_LOCONET" = "yes"; then
- AC_DEFINE(USE_LOCONET,1, [define to 1 if you want loconet support])
-- ((NUM_MODULES++))
-+ NUM_MODDULES=`expr $NUM_MODULES + 1`
- fi
- AM_CONDITIONAL(USE_LOCONET, test "$with_LOCONET" = yes)
-
-@@ -108,7 +108,7 @@ AC_ARG_ENABLE(loopback,
- [with_LOOPBACK="$enableval"], [with_LOOPBACK=yes])
- if test "$with_LOOPBACK" = "yes"; then
- AC_DEFINE(USE_LOOPBACK,1, [define to 1 if you want loopback support])
-- ((NUM_MODULES++))
-+ NUM_MODDULES=`expr $NUM_MODULES + 1`
- fi
- AM_CONDITIONAL(USE_LOOPBACK, test "$with_LOOPBACK" = yes)
-
-@@ -118,7 +118,7 @@ AC_ARG_ENABLE(m605x,
- [with_M605X="$enableval"], [with_M605X=yes])
- if test "$with_M605X" = "yes"; then
- AC_DEFINE(USE_M605X,1, [define to 1 if you want m605x support])
-- ((NUM_MODULES++))
-+ NUM_MODDULES=`expr $NUM_MODULES + 1`
- fi
- AM_CONDITIONAL(USE_M605X, test "$with_M605X" = yes)
-
-@@ -128,7 +128,7 @@ AC_ARG_ENABLE(selectrix,
- [with_SELECTRIX="$enableval"], [with_SELECTRIX=yes])
- if test "$with_SELECTRIX" = "yes"; then
- AC_DEFINE(USE_SELECTRIX,1,[define to 1 if you want selectrix support])
-- ((NUM_MODULES++))
-+ NUM_MODDULES=`expr $NUM_MODULES + 1`
- fi
- AM_CONDITIONAL(USE_SELECTRIX, test "$with_SELECTRIX" = yes)
-
-@@ -138,7 +138,7 @@ AC_ARG_ENABLE(zimo,
- [with_ZIMO="$enableval"], [with_ZIMO=yes])
- if test "$with_ZIMO" = "yes"; then
- AC_DEFINE(USE_ZIMO,1, [define to 1 if you want zimo support])
-- ((NUM_MODULES++))
-+ NUM_MODDULES=`expr $NUM_MODULES + 1`
- fi
- AM_CONDITIONAL(USE_ZIMO, test "$with_ZIMO" = yes)
-
-@@ -323,7 +323,7 @@ if test "$with_SELECTRIX" != "yes"; then echo " sel
- if test "$with_ZIMO" != "yes"; then echo " zimo"; fi
-
- echo
--if ((NUM_MODULES == 0)); then
-+if test $NUM_MODULES -eq 0; then
- echo 'Warning: No device module configured; srcpd will not run
propperly!'
- else
- echo "Run 'make' to continue."
Index: patches/patch-man_de_srcpd_conf_5
===================================================================
RCS file: /cvs/ports/misc/srcpd/patches/patch-man_de_srcpd_conf_5,v
retrieving revision 1.2
diff -u -r1.2 patch-man_de_srcpd_conf_5
--- patches/patch-man_de_srcpd_conf_5 16 Nov 2014 11:39:44 -0000 1.2
+++ patches/patch-man_de_srcpd_conf_5 3 May 2015 11:06:37 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-man_de_srcpd_conf_5,v 1.2 2014/11/16 11:39:44 sebastia
Exp $
---- man/de/srcpd.conf.5.orig Sun Oct 28 18:45:11 2012
-+++ man/de/srcpd.conf.5 Sat Oct 25 12:53:48 2014
+--- man/de/srcpd.conf.5.orig Sat Jan 18 12:35:06 2014
++++ man/de/srcpd.conf.5 Sat May 2 18:23:36 2015
@@ -52,8 +52,8 @@ vorkonfigurierten Bus. Sie hat den folgenden Aufbau:
<server>
<tcp-port>4303</tcp-port>
@@ -28,4 +28,4 @@
+.IR _srcpd .
.\"
.\"
- .SS ddl
+ .SS dccar
Index: patches/patch-man_srcpd_conf_5
===================================================================
RCS file: /cvs/ports/misc/srcpd/patches/patch-man_srcpd_conf_5,v
retrieving revision 1.2
diff -u -r1.2 patch-man_srcpd_conf_5
--- patches/patch-man_srcpd_conf_5 16 Nov 2014 11:39:44 -0000 1.2
+++ patches/patch-man_srcpd_conf_5 3 May 2015 11:06:37 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-man_srcpd_conf_5,v 1.2 2014/11/16 11:39:44 sebastia Exp $
---- man/srcpd.conf.5.orig Sun Oct 28 18:46:50 2012
-+++ man/srcpd.conf.5 Sat Oct 25 12:53:48 2014
+--- man/srcpd.conf.5.orig Sat Jan 18 12:35:06 2014
++++ man/srcpd.conf.5 Sat May 2 18:23:36 2015
@@ -39,8 +39,8 @@ default settings and an example bus configuration.
<server>
<tcp-port>4303</tcp-port>
@@ -26,4 +26,4 @@
+.IR _srcpd .
.\"
.\"
- .SS ddl
+ .SS dccar
