[E] New upstream release.

Jerry James jjames at fedoraproject.org
Mon May 7 16:22:42 UTC 2012


commit d2d02381f1201d6da14ae2b4ad8d71f1ffd26f10
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon May 7 10:22:33 2012 -0600

    New upstream release.

 .gitignore    |    2 +-
 E-alias.patch |   25 +++++++++++++++++++++++++
 E.spec        |   13 ++++++++++---
 sources       |    2 +-
 4 files changed, 37 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a4ae0f7..138462a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-E.tgz
+/E.tgz
diff --git a/E-alias.patch b/E-alias.patch
new file mode 100644
index 0000000..1ba300c
--- /dev/null
+++ b/E-alias.patch
@@ -0,0 +1,25 @@
+--- ./INOUT/cio_network.c.orig	2011-06-16 12:46:44.000000000 -0600
++++ ./INOUT/cio_network.c	2012-05-07 10:15:43.595550455 -0600
+@@ -315,7 +315,7 @@ MsgStatus TCPMsgRead(int sock, TCPMsg_p
+       {
+          return 0;
+       }
+-      len = ntohl(*(int*)msg->len_buf);
++      len = ntohl(msg->len_val);
+       printf("Message expected with %d bytes\n", len);
+       msg->len = len;
+       DStrAppendBuffer(msg->content, msg->len_buf, sizeof(uint32_t));
+--- ./INOUT/cio_network.h.orig	2011-06-16 12:46:45.000000000 -0600
++++ ./INOUT/cio_network.h	2012-05-07 10:15:22.627571698 -0600
+@@ -54,7 +54,10 @@ typedef struct tcp_msg_cell
+                       lengths in network byte order, and the payload. */
+    int len;     /* Including length field. */
+    int transmission_count; /* How many bytes have been sent/received? */
+-   char len_buf[sizeof(uint32_t)];
++   union {
++     char len_buf[sizeof(uint32_t)];
++     uint32_t len_val;
++   };
+ }TCPMsgCell, *TCPMsg_p;
+ 
+ 
diff --git a/E.spec b/E.spec
index 016b97d..0dbbba8 100644
--- a/E.spec
+++ b/E.spec
@@ -1,11 +1,14 @@
 Name:		E
-Version:	1.4
-Release:	3%{?dist}
+Version:	1.5
+Release:	1%{?dist}
 Summary:	Equational Theorem Prover
 Group:		Applications/Engineering
 License:	GPLv2+ or LGPLv2+
 URL:		http://www.eprover.org/
-Source0:	http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_%{version}/E.tgz
+Source0:	http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_%{version}/%{name}.tgz
+# Sent upstream 7 May 2012.  Use a union to avoid a violation of ANSI C
+# aliasing rules.
+Patch0:         %{name}-alias.patch
 
 # Building actually checks for specific versions of python; building may
 # need to be updated for new versions of python 2:
@@ -33,6 +36,7 @@ placed highly in CNF and UEQ.
 
 %prep
 %setup -q -n E
+%patch0
 
 # Set up Fedora CFLAGS and paths
 sed -e "s|^EXECPATH = .*|EXECPATH = $RPM_BUILD_ROOT%{_bindir}|" \
@@ -85,6 +89,9 @@ diff test-results test-expected-results
 %{_mandir}/man1/*
 
 %changelog
+* Mon May  7 2012 Jerry James <loganjerry at gmail.com> - 1.5-1
+- New upstream release
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 7a4faf7..3b69be6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4da7b0c06dddd96ce8ffeb77462d7f77  E.tgz
+1fd5050c8c7a27c43d3f2dc138722a30  E.tgz


More information about the scm-commits mailing list