karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
Browse Source

rng-tools: Updated (2 -> 3) (see note!) 

Note:

This update also removes obsolete patches and the "bundling" of arg-standalone!
user/karasz/next/updates
Christian Wiese 15 years ago
parent
f60671b485
commit
630fb9e8ee
6 changed files with 3 additions and 192 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      base/rng-tools/hw_random.patch.rng-tools
  2. 28
      base/rng-tools/no-install.patch.argp-standalone
  3. 18
      base/rng-tools/rng-tools.conf
  4. 7
      base/rng-tools/rng-tools.desc
  5. 27
      base/rng-tools/standalone.patch.rng-tools
  6. 79
      base/rng-tools/throw-in-funcdef.patch.argp-standalone

36
base/rng-tools/hw_random.patch.rng-tools
Unescape View File

@ -1,36 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rng-tools/hw_random.patch.rng-tools
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- rng-tools-2/rngd.c.orig 2006-01-01 18:05:05.000000000 +0000
+++ rng-tools-2/rngd.c 2006-01-01 18:05:49.000000000 +0000
@@ -81,7 +81,7 @@
"Kernel device used for random number output (default: /dev/random)" },
{ "rng-device", 'r', "file", 0,
- "Kernel device used for random number input (default: /dev/hwrandom)" },
+ "Kernel device used for random number input (default: /dev/hw_random)" },
{ "random-step", 's', "nnn", 0,
"Number of bytes written to random-device at a time (default: 64)" },
@@ -96,7 +96,7 @@
};
static struct arguments default_arguments = {
- .rng_name = "/dev/hwrandom",
+ .rng_name = "/dev/hw_random",
.random_name = "/dev/random",
.poll_timeout = 60,
.random_step = 64,

28
base/rng-tools/no-install.patch.argp-standalone
Unescape View File

@ -1,28 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rng-tools/no-install.patch.argp-standalone
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- argp-standalone-1.4-test2/Makefile.in.orig 2006-01-01 17:57:35.000000000 +0000
+++ argp-standalone-1.4-test2/Makefile.in 2006-01-01 17:57:56.000000000 +0000
@@ -575,7 +575,8 @@
all-am: Makefile $(LIBRARIES) $(HEADERS) config.h
installdirs: installdirs-recursive
installdirs-am:
-install: install-recursive
+install:
+ echo skipped ...
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive

18
base/rng-tools/rng-tools.conf
Unescape View File

@ -1,18 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rng-tools/rng-tools.conf
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
argp=`match_source_file standalone`
argp=${argp%.tar.*}
var_append GCC_WRAPPER_APPEND " " "-I../$argp -L../$argp"

7
base/rng-tools/rng-tools.desc
Unescape View File

@ -3,6 +3,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../rng-tools/rng-tools.desc
[COPY] Copyright (C) 2010 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2004 Clifford Wolf
[COPY]
@ -29,10 +30,8 @@
[L] GPL
[S] Stable
[V] 2
[V] 3
[P] X -----5---9 102.900
[SRC] .
[D] 2365189691 argp-standalone-1.4-test2.tar.gz http://www.lysator.liu.se/~nisse/misc/
[D] 133627579 rng-tools-2.tar.gz http://dl.sourceforge.net/sourceforge/gkernel/
[D] 3558803025 rng-tools-3.tar.gz http://dl.sourceforge.net/sourceforge/gkernel/

27
base/rng-tools/standalone.patch.rng-tools
Unescape View File

@ -1,27 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rng-tools/standalone.patch.rng-tools
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- rng-tools-2/Makefile.in.orig 2006-01-01 18:04:58.000000000 +0000
+++ rng-tools-2/Makefile.in 2006-01-01 18:06:02.000000000 +0000
@@ -136,7 +136,7 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -largp
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@

79
base/rng-tools/throw-in-funcdef.patch.argp-standalone
Unescape View File

@ -1,79 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
No __THROW in function implementation.
--jsaw
--- argp-standalone-1.4-test2/argp.h.orig 2006-01-06 02:29:59.000000000 +0100
+++ argp-standalone-1.4-test2/argp.h 2006-01-06 02:41:10.000000000 +0100
@@ -560,17 +560,17 @@
# endif
# ifndef ARGP_EI
-# define ARGP_EI extern __inline__
+# define ARGP_EI extern inline
# endif
ARGP_EI void
-__argp_usage (__const struct argp_state *__state) __THROW
+__argp_usage (__const struct argp_state *__state)
{
__argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
}
ARGP_EI int
-__option_is_short (__const struct argp_option *__opt) __THROW
+__option_is_short (__const struct argp_option *__opt)
{
if (__opt->flags & OPTION_DOC)
return 0;
@@ -582,7 +582,7 @@
}
ARGP_EI int
-__option_is_end (__const struct argp_option *__opt) __THROW
+__option_is_end (__const struct argp_option *__opt)
{
return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
}
--- argp-standalone-1.4-test2/argp-parse.c.orig 2006-01-06 02:47:48.000000000 +0100
+++ argp-standalone-1.4-test2/argp-parse.c 2006-01-06 02:48:16.000000000 +0100
@@ -1290,13 +1290,13 @@
/* Defined here, in case a user is not inlining the definitions in
* argp.h */
void
-__argp_usage (__const struct argp_state *__state) __THROW
+__argp_usage (__const struct argp_state *__state)
{
__argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
}
int
-__option_is_short (__const struct argp_option *__opt) __THROW
+__option_is_short (__const struct argp_option *__opt)
{
if (__opt->flags & OPTION_DOC)
return 0;
@@ -1310,7 +1310,7 @@
}
int
-__option_is_end (__const struct argp_option *__opt) __THROW
+__option_is_end (__const struct argp_option *__opt)
{
return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
}
Write Preview
Loading…
Cancel
Save