diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-05 12:54:21 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-05 12:54:21 +0100 |
| commit | 47700fbf1cafdcb6b697ecb02f11363173e6b008 (patch) | |
| tree | 5d4c104d81f7fe43d380c97fec2bdd53f84cc9fa /package/rdate | |
| parent | f48a3ede4e7b99a0a58262a88b632ee01d7d3a0a (diff) | |
| parent | 7e783125e4ba1ad319febf468e2e6e90e4c0ff42 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/rdate')
| -rw-r--r-- | package/rdate/Makefile | 2 | ||||
| -rw-r--r-- | package/rdate/patches/patch-arc4random_c | 41 |
2 files changed, 42 insertions, 1 deletions
diff --git a/package/rdate/Makefile b/package/rdate/Makefile index 1dd8d0222..a37cbdfbc 100644 --- a/package/rdate/Makefile +++ b/package/rdate/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rdate PKG_VERSION:= 20070817 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 9a6489d7de4311678a3fab001bb503df PKG_DESCR:= A small rdate and NTP client PKG_SECTION:= ntp diff --git a/package/rdate/patches/patch-arc4random_c b/package/rdate/patches/patch-arc4random_c new file mode 100644 index 000000000..e84a77832 --- /dev/null +++ b/package/rdate/patches/patch-arc4random_c @@ -0,0 +1,41 @@ +--- rdate.orig/arc4random.c 2007-05-15 00:15:12.000000000 +0200 ++++ rdate/arc4random.c 2014-03-03 07:27:38.000000000 +0100 +@@ -30,7 +30,6 @@ + #include <sys/param.h> + #include <sys/types.h> + #include <sys/time.h> +-#include <sys/sysctl.h> + #include <fcntl.h> + #include <stdio.h> + #include <stdlib.h> +@@ -97,30 +96,6 @@ arc4_stir(struct arc4_stream *as) + if (fd != -1) { + read(fd, rdat.rnd, sizeof(rdat.rnd)); + close(fd); +- } else { +- /* /dev/urandom failed? Maybe we're in a chroot. */ +-//#if defined(CTL_KERN) && defined(KERN_RANDOM) && defined(RANDOM_UUID) +-#ifdef _LINUX_SYSCTL_H +- /* XXX this is for Linux, which uses enums */ +- +- int mib[3]; +- size_t i, len; +- +- mib[0] = CTL_KERN; +- mib[1] = KERN_RANDOM; +- mib[2] = RANDOM_UUID; +- +- for (i = 0; i < sizeof(rdat.rnd) / sizeof(u_int); i ++) { +- len = sizeof(u_int); +- if (sysctl(mib, 3, &rdat.rnd[i], &len, NULL, 0) == -1) { +- fprintf(stderr, "warning: no entropy source\n"); +- break; +- } +- } +-#else +- /* XXX kFreeBSD doesn't seem to have KERN_ARND or so */ +- ; +-#endif + } + + arc4_stir_pid = getpid(); |