From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Tue, 19 Jul 2011 06:17:11 +0000 (+0000)
Subject: - up to R14B03
X-Git-Tag: auto/th/erlang-R14B03-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ferlang.git;a=commitdiff_plain;h=065a01671f4d5a4a1363234dd568d1386de3e3fc

- up to R14B03

Changed files:
    erlang-fortify.patch -> 1.3
    erlang.spec -> 1.63
---

diff --git a/erlang-fortify.patch b/erlang-fortify.patch
deleted file mode 100644
index cf80b1f..0000000
--- a/erlang-fortify.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit a1a83039a77d39f7691969503d190cb6dfcd49c9
-Author: Patrik Nyblom <pan@erlang.org>
-Date:   Wed Jan 12 15:41:46 2011 +0100
-
-    Remove strange name field in efile_drv.c as it upsets -D_FORTIFY_SOURCE
-
-diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c
-index 786fa7d..6449c6f 100644
---- a/erts/emulator/drivers/common/efile_drv.c
-+++ b/erts/emulator/drivers/common/efile_drv.c
-@@ -385,7 +385,6 @@ struct t_data
- 	    ErlDrvBinary *binp;
- 	    int           size;
- 	    int           offset;
--	    char          name[1];
- 	} read_file;
- 	struct {
- 	    struct t_readdir_buf *first_buf;
-@@ -1117,7 +1116,7 @@ static void invoke_read_file(void *data)
- 	Sint64 size;
- 	
- 	if (! (d->result_ok = 
--	       efile_openfile(&d->errInfo, d->c.read_file.name, 
-+	       efile_openfile(&d->errInfo, d->b, 
- 			      EFILE_MODE_READ, &fd, &size))) {
- 	    goto done;
- 	}
-@@ -3071,7 +3070,7 @@ file_outputv(ErlDrvData e, ErlIOVec *ev) {
- 	d->command = command;
- 	d->reply = !0;
- 	/* Copy name */
--	FILENAME_COPY(d->c.read_file.name, filename);
-+	FILENAME_COPY(d->b, filename);
- 	d->c.read_file.binp = NULL;
- 	d->invoke = invoke_read_file;
- 	d->free = free_read_file;
diff --git a/erlang.spec b/erlang.spec
index 371b7e0..d657daa 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -15,20 +15,19 @@ Summary:	OpenSource Erlang/OTP
 Summary(pl.UTF-8):	Erlang/OTP z otwartymi źródłami
 Name:		erlang
 # A - unstable, B - stable line, keep stable
-Version:	R14B01
+Version:	R14B03
 Release:	1
 Epoch:		1
 %define		_version	%(echo %{version} | tr _ -)
 License:	distributable
 Group:		Development/Languages
 Source0:	http://www.erlang.org/download/otp_src_%{_version}.tar.gz
-# Source0-md5:	ce595447571128bc66f630a8fa13339a
+# Source0-md5:	7979e662d11476b97c462feb7c132fb7
 Source1:	http://www.erlang.org/download/otp_doc_man_%{_version}.tar.gz
-# Source1-md5:	55376d3b1994d083cd21c9d849517c6c
+# Source1-md5:	357f54b174bb29d41fee97c063a47e8f
 Patch0:		%{name}-fPIC.patch
 Patch1:		%{name}-tinfo.patch
 Patch2:		%{name}-link.patch
-Patch3:		%{name}-fortify.patch
 URL:		http://www.erlang.org/
 %{?with_java:BuildRequires:	/usr/bin/jar}
 BuildRequires:	xorg-lib-libX11-devel
@@ -65,7 +64,6 @@ rozpowszechnianiu Erlanga poza Ericssonem.
 #%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 find . -name config.sub | xargs -n 1 cp -f /usr/share/automake/config.sub
@@ -131,12 +129,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/erlang
 %dir %{_libdir}/%{name}/bin
+%attr(755,root,root) %{_libdir}/%{name}/bin/ct_run
 %attr(755,root,root) %{_libdir}/%{name}/bin/dialyzer
 %attr(755,root,root) %{_libdir}/%{name}/bin/epmd
 %attr(755,root,root) %{_libdir}/%{name}/bin/erl
 %attr(755,root,root) %{_libdir}/%{name}/bin/erlc
 %attr(755,root,root) %{_libdir}/%{name}/bin/escript
 %attr(755,root,root) %{_libdir}/%{name}/bin/run_erl
+%attr(755,root,root) %{_libdir}/%{name}/bin/run_test
 %attr(755,root,root) %{_libdir}/%{name}/bin/start
 %attr(755,root,root) %{_libdir}/%{name}/bin/start_erl
 %attr(755,root,root) %{_libdir}/%{name}/bin/to_erl
@@ -151,6 +151,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}/erts-*/bin
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/beam*
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/child*
+%attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/ct_run
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/dialyzer
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/dyn_erl
 %attr(755,root,root) %{_libdir}/%{name}/erts-*/bin/e*