Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2011-11-23 19:33:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aaa_base", Maintainer is "ro@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2011-11-14 11:49:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2011-11-23 19:33:55.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 22 11:49:07 UTC 2011 - ro@suse.de + +- random seed start script: use pool_size from kernel, + not the old 512 bytes (bnc#730736) + +------------------------------------------------------------------- Old: ---- systemd_no_wrap_service.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.zaxT0T/_old 2011-11-23 19:34:21.000000000 +0100 +++ /var/tmp/diff_new_pack.zaxT0T/_new 2011-11-23 19:34:21.000000000 +0100 @@ -35,7 +35,6 @@ # run make package in checkout out git repo to recreate Source: aaa_base.tar.bz2 Source99: aaa_base-rpmlintrc -Patch0: systemd_no_wrap_service.patch %description This package installs several important configuration files. Central @@ -55,7 +54,6 @@ %prep %setup -n aaa_base -%patch0 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags} ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/init.d/random new/aaa_base/files/etc/init.d/random --- old/aaa_base/files/etc/init.d/random 2011-11-02 15:39:14.000000000 +0100 +++ new/aaa_base/files/etc/init.d/random 2011-11-22 12:47:20.000000000 +0100 @@ -27,13 +27,21 @@ . /etc/rc.status random_seed=/var/lib/misc/random-seed +read pool_size < /proc/sys/kernel/random/poolsize +# fall back to the old 512 if not found, +# current default should be 4096 +test -n "$pool_size" || pool_size=512 rc_reset case "$1" in start) echo -n "Initializing random number generator" # Carry a random seed from start-up to start-up - # Load and then save 512 bytes, which is the size of the entropy pool + # Load and then save a number bytes, the size of the entropy pool + if test -f $random_seed ; then + RSIZE=`stat -c %s $random_seed` + test "$RSIZE" = "$pool_size" || rm -f $random_seed + fi if test -f $random_seed ; then cat $random_seed > /dev/urandom rc_status @@ -42,7 +50,7 @@ rc_status fi chmod 600 $random_seed - dd if=/dev/urandom of=$random_seed count=1 bs=512 2>/dev/null + dd if=/dev/urandom of=$random_seed count=1 bs=$pool_size 2>/dev/null rc_status -v ;; stop) @@ -54,7 +62,7 @@ rc_status fi chmod 600 $random_seed - dd if=/dev/urandom of=$random_seed count=1 bs=512 2>/dev/null + dd if=/dev/urandom of=$random_seed count=1 bs=$pool_size 2>/dev/null rc_status -v ;; status) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/sbin/service new/aaa_base/files/sbin/service --- old/aaa_base/files/sbin/service 2011-11-02 15:39:14.000000000 +0100 +++ new/aaa_base/files/sbin/service 2011-11-22 12:47:20.000000000 +0100 @@ -21,12 +21,13 @@ # PATH=/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin test -n "$TERM" || TERM=raw +test -n "$SYSTEMD_NO_WRAP" && export SYSTEMD_NO_WRAP LANG=POSIX export PATH TERM LANG exec_rc () { - env -i LANG=$LANG PATH=$PATH TERM=$TERM ${1+"$@"} + env -i LANG=$LANG PATH=$PATH TERM=$TERM SYSTEMD_NO_WRAP=$SYSTEMD_NO_WRAP ${1+"$@"} } usage () -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de