[Pkg-erlang-commits] r1308 - in erlang/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2011-03-31 14:02:14 +0000 (Thu, 31 Mar 2011)
New Revision: 1308

Added:
   erlang/trunk/debian/erlang-snmp.links.in
   erlang/trunk/debian/erlang-snmp.manpages
   erlang/trunk/debian/patches/tcp.patch
Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/control
   erlang/trunk/debian/patches/series
   erlang/trunk/debian/rules
Log:
  * Created symlink to snmpc escript from /usr/bin directory. Added erlang-dev
    to the snmps recommended dependencies because snmpc uses some include
    files.
  * Added patch by upstream which fixes send_timeout option for TCP sockets.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2011-03-29 17:08:26 UTC (rev 1307)
+++ erlang/trunk/debian/changelog	2011-03-31 14:02:14 UTC (rev 1308)
@@ -2,8 +2,12 @@
 
   * New upstream release (closes: #607233, #619857).
   * Removed patches which are no longer needed.
+  * Created symlink to snmpc escript from /usr/bin directory. Added erlang-dev
+    to the snmps recommended dependencies because snmpc uses some include
+    files.
+  * Added patch by upstream which fixes send_timeout option for TCP sockets.
 
- -- Sergei Golovan <sgolovan at debian.org>  Tue, 29 Mar 2011 21:07:33 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 31 Mar 2011 18:01:42 +0400
 
 erlang (1:14.b.1-dfsg-1) experimental; urgency=low
 

Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control	2011-03-29 17:08:26 UTC (rev 1307)
+++ erlang/trunk/debian/control	2011-03-31 14:02:14 UTC (rev 1308)
@@ -419,6 +419,7 @@
 Package: erlang-snmp
 Architecture: any
 Depends: ${erlang-base}, erlang-crypto (= ${binary:Version}), erlang-mnesia (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), ${misc:Depends}
+Recommends: erlang-dev (= ${binary:Version})
 Suggests: erlang, erlang-manpages, erlang-doc
 Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
 Description: Erlang/OTP SNMP applications

Added: erlang/trunk/debian/erlang-snmp.links.in
===================================================================
--- erlang/trunk/debian/erlang-snmp.links.in	                        (rev 0)
+++ erlang/trunk/debian/erlang-snmp.links.in	2011-03-31 14:02:14 UTC (rev 1308)
@@ -0,0 +1 @@
+usr/lib/erlang/lib/snmp- at SNMP_VSN@/bin/snmpc	usr/bin/snmpc

Added: erlang/trunk/debian/erlang-snmp.manpages
===================================================================
--- erlang/trunk/debian/erlang-snmp.manpages	                        (rev 0)
+++ erlang/trunk/debian/erlang-snmp.manpages	2011-03-31 14:02:14 UTC (rev 1308)
@@ -0,0 +1 @@
+debian/erlang-docs/usr/lib/erlang/man/man1/snmpc.1

Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series	2011-03-29 17:08:26 UTC (rev 1307)
+++ erlang/trunk/debian/patches/series	2011-03-31 14:02:14 UTC (rev 1308)
@@ -10,4 +10,5 @@
 java.patch
 hppa.patch
 powerpc.patch
+tcp.patch
 #native.patch

Added: erlang/trunk/debian/patches/tcp.patch
===================================================================
--- erlang/trunk/debian/patches/tcp.patch	                        (rev 0)
+++ erlang/trunk/debian/patches/tcp.patch	2011-03-31 14:02:14 UTC (rev 1308)
@@ -0,0 +1,20 @@
+Author: Upstream
+Description: Fixes bug in send_timeout handling for sockets in
+ active-once mode.
+Last-Updated: Thu, 31 Mar 2011 17:55:22 +0400
+
+diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
+index b491242..59f4cfb 100644
+--- a/erts/emulator/drivers/common/inet_drv.c
++++ b/erts/emulator/drivers/common/inet_drv.c
+@@ -8550,7 +8550,9 @@ static int tcp_deliver(tcp_descriptor* desc, int len)
+ 	len = 0;
+ 
+ 	if (!desc->inet.active) {
+-	    driver_cancel_timer(desc->inet.port);
++	    if (!desc->busy_on_send) {
++		driver_cancel_timer(desc->inet.port);
++	    }
+ 	    sock_select(INETP(desc),(FD_READ|FD_CLOSE),0);
+ 	    if (desc->i_buf != NULL)
+ 		tcp_restart_input(desc);

Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules	2011-03-29 17:08:26 UTC (rev 1307)
+++ erlang/trunk/debian/rules	2011-03-31 14:02:14 UTC (rev 1308)
@@ -18,6 +18,7 @@
 -include ${ROOT_DIR}/lib/tools/vsn.mk
 -include ${ROOT_DIR}/lib/webtool/vsn.mk
 -include ${ROOT_DIR}/lib/common_test/vsn.mk
+-include ${ROOT_DIR}/lib/snmp/vsn.mk
 SOURCE_VERSION=$(shell dpkg-parsechangelog | sed -ne's!^Version: \(.*\)-.*!\1!p')
 ABI_VERSION=$(shell cat debian/control | sed -ne's!^Provides: erlang-abi-\(.*\)!\1!p' | head -1)
 HIPE_ARCHES=$(shell cat debian/control | grep '^Architecture:' | egrep -v '(all|any)' | sed -e 's/^Architecture: *//')
@@ -371,6 +372,7 @@
 	     	-e's/@IC_VSN@/$(IC_VSN)/g' \
 		-e's/@WEBTOOL_VSN@/$(WEBTOOL_VSN)/g' \
 		-e's/@COMMON_TEST_VSN@/$(COMMON_TEST_VSN)/g' \
+		-e's/@SNMP_VSN@/$(SNMP_VSN)/g' \
 		-e's/@TOOLS_VSN@/$(TOOLS_VSN)/g' <$$i >$${i%%.in} ; \
 	done
 	sed -e's/@VERSION@/$(VSN)/g' <debian/in.erlang-doc.doc-base.erlang-erts \