Hello community,
here is the log from the commit of package trinity for openSUSE:Factory checked
in at 2016-06-21 11:30:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/trinity (Old)
and /work/SRC/openSUSE:Factory/.trinity.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trinity"
Changes:
--------
--- /work/SRC/openSUSE:Factory/trinity/trinity.changes 2016-06-07
23:47:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.trinity.new/trinity.changes 2016-06-21
12:29:20.000000000 +0200
@@ -2 +2,9 @@
-Fri May 27 20:28:47 UTC 2016 - opensuse-packag...@opensuse.org
+Sun Jun 12 16:30:20 UTC 2016 - mplus...@suse.com
+
+- Update to version 1.6+git.20160603:
+ * if we use the fallback seed, don't use rand() yet.
+ * Before falling back to gtod, try getrandom() if available.
+- Change _service to disabled
+
+-------------------------------------------------------------------
+Fri May 27 20:28:47 UTC 2016 - mplus...@suse.com
Old:
----
trinity-1.6+git.20160526.tar.xz
New:
----
trinity-1.6+git.20160603.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ trinity.spec ++++++
--- /var/tmp/diff_new_pack.2Pl0oR/_old 2016-06-21 12:29:21.000000000 +0200
+++ /var/tmp/diff_new_pack.2Pl0oR/_new 2016-06-21 12:29:21.000000000 +0200
@@ -16,10 +16,10 @@
#
-%define version_unconverted 1.6+git.20160526
+%define version_unconverted 1.6+git.20160603
Name: trinity
-Version: 1.6+git.20160526
+Version: 1.6+git.20160603
Release: 0
Summary: A Linux System call fuzz tester
License: GPL-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.2Pl0oR/_old 2016-06-21 12:29:21.000000000 +0200
+++ /var/tmp/diff_new_pack.2Pl0oR/_new 2016-06-21 12:29:21.000000000 +0200
@@ -1,14 +1,14 @@
<services>
- <service mode="localonly" name="tar_scm">
+ <service mode="disabled" name="tar_scm">
<param name="url">git://github.com/kernelslacker/trinity</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
<param name="filename">trinity</param>
<param name="versionformat">1.6+git.%cd</param>
</service>
- <service mode="localonly" name="recompress">
+ <service mode="disabled" name="recompress">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
- <service mode="localonly" name="set_version"/>
+ <service mode="disabled" name="set_version"/>
</services>
++++++ trinity-1.6+git.20160526.tar.xz -> trinity-1.6+git.20160603.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/trinity-1.6+git.20160526/include/random.h
new/trinity-1.6+git.20160603/include/random.h
--- old/trinity-1.6+git.20160526/include/random.h 2016-05-27
22:28:47.000000000 +0200
+++ new/trinity-1.6+git.20160603/include/random.h 2016-06-12
18:30:20.000000000 +0200
@@ -26,3 +26,12 @@
u64 rand64(void);
unsigned long rand_single_bit(unsigned char size);
unsigned long set_rand_bitmask(unsigned int num, const unsigned long *values);
+
+#ifndef SYS_getrandom
+#ifdef __x86_64__
+#define SYS_getrandom 318
+#endif
+#ifdef __i386__
+#define SYS_getrandom 355
+#endif
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/trinity-1.6+git.20160526/rand/seed.c
new/trinity-1.6+git.20160603/rand/seed.c
--- old/trinity-1.6+git.20160526/rand/seed.c 2016-05-27 22:28:47.000000000
+0200
+++ new/trinity-1.6+git.20160603/rand/seed.c 2016-06-12 18:30:20.000000000
+0200
@@ -45,12 +45,16 @@
struct timeval t;
unsigned int r;
- //printf("Fell back to gtod seed! errno:%s\n", strerror(errno));
- r = rnd();
- if (!(RAND_BOOL())) {
- gettimeofday(&t, NULL);
- r |= t.tv_usec;
- }
+#ifdef SYS_getrandom
+ int buf, ret;
+
+ ret = syscall(SYS_getrandom, &buf, 4, 0);
+ if (ret > 0)
+ return buf;
+#endif
+
+ gettimeofday(&t, NULL);
+ r = t.tv_sec * t.tv_usec;
return r;
}
