[Pkg-erlang-commits] r1694 - in erlang/branches/experimental/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Sun Dec 14 06:08:30 UTC 2014 

Author: sgolovan
Date: 2014-12-14 06:08:29 +0000 (Sun, 14 Dec 2014)
New Revision: 1694

Removed:
   erlang/branches/experimental/debian/patches/rpath.patch
   erlang/branches/experimental/debian/patches/ssl.patch
Modified:
   erlang/branches/experimental/debian/changelog
   erlang/branches/experimental/debian/patches/emacs.patch
   erlang/branches/experimental/debian/patches/gnu.patch
   erlang/branches/experimental/debian/patches/hppa.patch
   erlang/branches/experimental/debian/patches/java.patch
   erlang/branches/experimental/debian/patches/man.patch
   erlang/branches/experimental/debian/patches/series
   erlang/branches/experimental/debian/patches/sslv3disable.patch
   erlang/branches/experimental/debian/rules
Log:
[erlang-experimental]
  * New upstream release.
  * Removed a patch which fixed empty SNI extension processing in the
    ssl application because it has been applied upstream.
  * Removed a patch which removes rpath from the crypto application binary
    and use the new --with-ssl-rpath=no configure option instead.
  * Search for an Erlang module manual page in section 3erl only in
    Emacs Erlang mode (closes: #772876).


Modified: erlang/branches/experimental/debian/changelog
===================================================================
--- erlang/branches/experimental/debian/changelog	2014-12-13 14:57:23 UTC (rev 1693)
+++ erlang/branches/experimental/debian/changelog	2014-12-14 06:08:29 UTC (rev 1694)
@@ -1,8 +1,14 @@
-erlang (1:17.3-dfsg-4) UNRELEASED; urgency=medium
+erlang (1:17.4-dfsg-1) experimental; urgency=medium
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Removed a patch which fixed empty SNI extension processing in the
+    ssl application because it has been applied upstream.
+  * Removed a patch which removes rpath from the crypto application binary
+    and use the new --with-ssl-rpath=no configure option instead.
+  * Search for an Erlang module manual page in section 3erl only in
+    Emacs Erlang mode (closes: #772876).
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 30 Nov 2014 23:05:09 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Sun, 14 Dec 2014 09:07:42 +0300
 
 erlang (1:17.3-dfsg-3) unstable; urgency=medium
 

Modified: erlang/branches/experimental/debian/patches/emacs.patch
===================================================================
--- erlang/branches/experimental/debian/patches/emacs.patch	2014-12-13 14:57:23 UTC (rev 1693)
+++ erlang/branches/experimental/debian/patches/emacs.patch	2014-12-14 06:08:29 UTC (rev 1694)
@@ -67,7 +67,7 @@
        (error "No Erlang module name given"))
    (let ((dir-list erlang-man-dirs)
 -	(pat (concat "/" (regexp-quote module) "\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$"))
-+	(pat (concat "/" (regexp-quote module) "\\.\\([124-9]\\|3\\(erl\\)\\)\\(\\.gz\\)?$"))
++	(pat (concat "/" (regexp-quote module) "\\.\\(3\\(erl\\)\\)\\(\\.gz\\)?$"))
  	(file nil)
  	file-list)
      (while (and dir-list (null file))

Modified: erlang/branches/experimental/debian/patches/gnu.patch
===================================================================
--- erlang/branches/experimental/debian/patches/gnu.patch	2014-12-13 14:57:23 UTC (rev 1693)
+++ erlang/branches/experimental/debian/patches/gnu.patch	2014-12-14 06:08:29 UTC (rev 1694)
@@ -61,7 +61,7 @@
  
 --- a/erts/etc/common/erlexec.c
 +++ b/erts/etc/common/erlexec.c
-@@ -1561,7 +1561,7 @@
+@@ -1562,7 +1562,7 @@
      if (!bindir) {
  	/* Determine bindir from absolute path to executable */
  	char *p;
@@ -70,7 +70,7 @@
  	strncpy(buffer, argv[0], sizeof(buffer));
  	buffer[sizeof(buffer)-1] = '\0';
  	
-@@ -1575,7 +1575,7 @@
+@@ -1576,7 +1576,7 @@
      if (!rootdir) {
  	/* Determine rootdir from absolute path to bindir */
  	char *p;

Modified: erlang/branches/experimental/debian/patches/hppa.patch
===================================================================
--- erlang/branches/experimental/debian/patches/hppa.patch	2014-12-13 14:57:23 UTC (rev 1693)
+++ erlang/branches/experimental/debian/patches/hppa.patch	2014-12-14 06:08:29 UTC (rev 1694)
@@ -8,7 +8,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -2160,6 +2160,14 @@
+@@ -2174,6 +2174,14 @@
  AC_CHECK_DECLS([posix2time, time2posix],,,[#include <time.h>])
  
  disable_vfork=false

Modified: erlang/branches/experimental/debian/patches/java.patch
===================================================================
--- erlang/branches/experimental/debian/patches/java.patch	2014-12-13 14:57:23 UTC (rev 1693)
+++ erlang/branches/experimental/debian/patches/java.patch	2014-12-14 06:08:29 UTC (rev 1694)
@@ -8,7 +8,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -4682,7 +4682,8 @@
+@@ -4746,7 +4746,8 @@
    dnl Make sure it's at least JDK 1.5
    AC_CACHE_CHECK(for JDK version 1.5, 
       ac_cv_prog_javac_ver_1_5,
@@ -20,7 +20,7 @@
      unset -v JAVAC
 --- a/lib/test_server/src/configure.in
 +++ b/lib/test_server/src/configure.in
-@@ -468,7 +468,8 @@
+@@ -484,7 +484,8 @@
    dnl Make sure it's at least JDK 1.5
    AC_CACHE_CHECK(for JDK version 1.5, 
       ac_cv_prog_javac_ver_1_5,

Modified: erlang/branches/experimental/debian/patches/man.patch
===================================================================
--- erlang/branches/experimental/debian/patches/man.patch	2014-12-13 14:57:23 UTC (rev 1693)
+++ erlang/branches/experimental/debian/patches/man.patch	2014-12-14 06:08:29 UTC (rev 1694)
@@ -6,7 +6,7 @@
 
 --- a/erts/etc/common/erlexec.c
 +++ b/erts/etc/common/erlexec.c
-@@ -722,8 +722,10 @@
+@@ -723,8 +723,10 @@
  			error("-man not supported on Windows");
  #else
  			argv[i] = "man";

Deleted: erlang/branches/experimental/debian/patches/rpath.patch
===================================================================
--- erlang/branches/experimental/debian/patches/rpath.patch	2014-12-13 14:57:23 UTC (rev 1693)
+++ erlang/branches/experimental/debian/patches/rpath.patch	2014-12-14 06:08:29 UTC (rev 1694)
@@ -1,21 +0,0 @@
-Author: Sergei Golovan <sgolovan at debian.org>
-Description: A quick hack which removes rpath from crypto and ssl applications binaries to
- satisfy Debian policy.
-Forwarded: no
-Last-modified:Sat, 27 Feb 2010 09:34:43 +0300
-
---- a/erts/configure.in
-+++ b/erts/configure.in
-@@ -4540,9 +4540,9 @@
- SSL_CC_RUNTIME_LIBRARY_PATH=
- SSL_LD_RUNTIME_LIBRARY_PATH=
- SSL_DED_LD_RUNTIME_LIBRARY_PATH=
--cc_rflg="$CFLAG_RUNTIME_LIBRARY_PATH"
--ld_rflg="$LDFLAG_RUNTIME_LIBRARY_PATH"
--ded_ld_rflg="$DED_LD_FLAG_RUNTIME_LIBRARY_PATH"
-+cc_rflg=
-+ld_rflg=
-+ded_ld_rflg=
- 
- if test "$SSL_APP" != "" && test "$SSL_DYNAMIC_ONLY" = "yes" && \
-    { test "$cc_rflg" != "" || test "$ld_rflg" != "" || test "$ded_ld_rflg" != ""; } ; then

Modified: erlang/branches/experimental/debian/patches/series
===================================================================
--- erlang/branches/experimental/debian/patches/series	2014-12-13 14:57:23 UTC (rev 1693)
+++ erlang/branches/experimental/debian/patches/series	2014-12-14 06:08:29 UTC (rev 1694)
@@ -1,5 +1,4 @@
 clean.patch
-rpath.patch
 gnu.patch
 sparc.patch
 man.patch
@@ -8,6 +7,5 @@
 java.patch
 hppa.patch
 javascript.patch
-ssl.patch
 wx3.0-constants.patch
 sslv3disable.patch

Deleted: erlang/branches/experimental/debian/patches/ssl.patch
===================================================================
--- erlang/branches/experimental/debian/patches/ssl.patch	2014-12-13 14:57:23 UTC (rev 1693)
+++ erlang/branches/experimental/debian/patches/ssl.patch	2014-12-14 06:08:29 UTC (rev 1694)
@@ -1,13 +0,0 @@
---- a/lib/ssl/src/ssl_handshake.erl
-+++ b/lib/ssl/src/ssl_handshake.erl
-@@ -1732,6 +1732,10 @@
- 							#ec_point_formats{ec_point_format_list =
- 									      ECPointFormats}});
- 
-+dec_hello_extensions(<<?UINT16(?SNI_EXT), ?UINT16(Len), Rest/binary>>, Acc) when Len == 0 ->
-+    dec_hello_extensions(Rest, Acc#hello_extensions{sni = ""}); %% Server may send an empy SNI
-+
-+
- dec_hello_extensions(<<?UINT16(?SNI_EXT), ?UINT16(Len),
-                 ExtData:Len/binary, Rest/binary>>, Acc) ->
-     <<?UINT16(_), NameList/binary>> = ExtData,

Modified: erlang/branches/experimental/debian/patches/sslv3disable.patch
===================================================================
--- erlang/branches/experimental/debian/patches/sslv3disable.patch	2014-12-13 14:57:23 UTC (rev 1693)
+++ erlang/branches/experimental/debian/patches/sslv3disable.patch	2014-12-14 06:08:29 UTC (rev 1694)
@@ -42,7 +42,7 @@
      
 --- a/lib/ssl/src/ssl_internal.hrl
 +++ b/lib/ssl/src/ssl_internal.hrl
-@@ -64,8 +64,8 @@
+@@ -67,8 +67,8 @@
  -define(TRUE, 0).
  -define(FALSE, 1).
  

Modified: erlang/branches/experimental/debian/rules
===================================================================
--- erlang/branches/experimental/debian/rules	2014-12-13 14:57:23 UTC (rev 1693)
+++ erlang/branches/experimental/debian/rules	2014-12-14 06:08:29 UTC (rev 1694)
@@ -194,6 +194,7 @@
 		    --enable-sctp \
 		    $(CLOCK_GETTIME_OPT) \
 		    --enable-dynamic-ssl-lib \
+		    --with-ssl-rpath=no \
 		    --enable-ethread-pre-pentium4-compatibility \
 		    --enable-shared-zlib \
 		    --without-ssl-zlib
@@ -224,6 +225,7 @@
 		    --enable-sctp \
 		    $(CLOCK_GETTIME_OPT) \
 		    --enable-dynamic-ssl-lib \
+		    --with-ssl-rpath=no \
 		    --enable-ethread-pre-pentium4-compatibility \
 		    --enable-shared-zlib \
 		    --without-ssl-zlib
@@ -313,9 +315,6 @@
 	#
 	touch manpages-stamp
 
-# CC_R_FLAG and LD_R_FLAG are empty because Debian doesn't recommend
-# RPATH definition in binaries
-# CC_R_OPT is used in percept
 build-hipe: build-hipe-stamp
 build-hipe-stamp: configure-hipe-stamp
 	dh_testdir
@@ -504,7 +503,7 @@
 
 binary: binary-indep binary-arch
 
-REL=17.3
+REL=17.4
 RELDIR=$(REL)
 DEB_REL=$(REL)-dfsg

More information about the Pkg-erlang-commits mailing list