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

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2011-12-15 17:49:48 +0000 (Thu, 15 Dec 2011)
New Revision: 1364

Added:
   yaws/trunk/debian/patches/driver.diff
Modified:
   yaws/trunk/debian/changelog
   yaws/trunk/debian/patches/series
Log:
[yaws]
  * Added patch which fixes loading external drivers in Erlang R15B.


Modified: yaws/trunk/debian/changelog
===================================================================
--- yaws/trunk/debian/changelog	2011-12-15 16:39:12 UTC (rev 1363)
+++ yaws/trunk/debian/changelog	2011-12-15 17:49:48 UTC (rev 1364)
@@ -1,8 +1,8 @@
-yaws (1.91-3) UNRELEASED; urgency=low
+yaws (1.91-2~squeeze2) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * Added patch which fixes loading external drivers in Erlang R15B.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 26 Nov 2011 19:55:07 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 15 Dec 2011 21:49:18 +0400
 
 yaws (1.91-2) unstable; urgency=high
 

Added: yaws/trunk/debian/patches/driver.diff
===================================================================
--- yaws/trunk/debian/patches/driver.diff	                        (rev 0)
+++ yaws/trunk/debian/patches/driver.diff	2011-12-15 17:49:48 UTC (rev 1364)
@@ -0,0 +1,33 @@
+Patch fixes compatibility with Erlang R15B.
+
+--- yaws-1.91.orig/c_src/setuid_drv.c
++++ yaws-1.91/c_src/setuid_drv.c
+@@ -131,6 +131,9 @@
+     setuid_driver_entry.finish       = NULL;
+     setuid_driver_entry.control      = NULL;
+     setuid_driver_entry.outputv      = NULL;
++    setuid_driver_entry.extended_marker = ERL_DRV_EXTENDED_MARKER;
++    setuid_driver_entry.major_version = ERL_DRV_EXTENDED_MAJOR_VERSION;
++    setuid_driver_entry.minor_version = ERL_DRV_EXTENDED_MINOR_VERSION;
+     return (ErlDrvEntry*) &setuid_driver_entry;
+ }
+ 
+--- yaws-1.91.orig/c_src/yaws_sendfile_drv.c
++++ yaws-1.91/c_src/yaws_sendfile_drv.c
+@@ -292,7 +292,15 @@
+     NULL,
+     NULL,
+     NULL,
+-    NULL
++    NULL,
++    NULL,
++    NULL,
++    NULL,
++    NULL,
++    NULL,
++    ERL_DRV_EXTENDED_MARKER,
++    ERL_DRV_EXTENDED_MAJOR_VERSION,
++    ERL_DRV_EXTENDED_MINOR_VERSION
+ };
+ 
+ DRIVER_INIT(yaws_sendfile_drv)

Modified: yaws/trunk/debian/patches/series
===================================================================
--- yaws/trunk/debian/patches/series	2011-12-15 16:39:12 UTC (rev 1363)
+++ yaws/trunk/debian/patches/series	2011-12-15 17:49:48 UTC (rev 1364)
@@ -8,3 +8,4 @@
 docs.diff
 m32m64.diff
 dirtraversal.diff
+driver.diff