[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 91812c575fd2f534a38ff67300d77a94782afd74 - IPFire-SCM

29 Apr 2014

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
       via  91812c575fd2f534a38ff67300d77a94782afd74 (commit)
       via  f9538c35622400be91e31f9e245cac2cc994287f (commit)
       via  841663e7651745f5d968e278508c91391b26c91f (commit)
       via  742c334a5bcc235becbc132cb2273baa33abfe9f (commit)
      from  872d5a1e33e9fb6761c06cf5e251f39470a0edd9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 91812c575fd2f534a38ff67300d77a94782afd74
Merge: f9538c3 872d5a1
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Apr 29 14:37:58 2014 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
commit f9538c35622400be91e31f9e245cac2cc994287f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Apr 29 14:37:34 2014 +0200
pound: Update to 2.7c.
Also fix multiple initscript symlinks.
commit 841663e7651745f5d968e278508c91391b26c91f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Apr 29 13:09:56 2014 +0200
make.sh: Load loop module (if not loaded, yet).
commit 742c334a5bcc235becbc132cb2273baa33abfe9f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Apr 29 13:09:42 2014 +0200
entropy.cgi: Show status of rngd.
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/packages/pound |  3 ---
 doc/language_issues.es          |  1 +
 doc/language_issues.fr          |  1 +
 doc/language_issues.nl          |  1 +
 doc/language_issues.pl          |  1 +
 doc/language_issues.ru          |  1 +
 doc/language_issues.tr          |  1 +
 doc/language_missings           |  4 ++++
 html/cgi-bin/entropy.cgi        | 22 ++++++++++++++++++++++
 langs/de/cgi-bin/de.pl          |  1 +
 langs/en/cgi-bin/en.pl          |  1 +
 lfs/pound                       | 13 ++++---------
 make.sh                         |  3 ++-
 13 files changed, 40 insertions(+), 13 deletions(-)
Difference in files:

diff --git a/config/rootfiles/packages/pound b/config/rootfiles/packages/pound
index a935172..02f3d41 100644
--- a/config/rootfiles/packages/pound
+++ b/config/rootfiles/packages/pound
@@ -1,7 +1,4 @@
 etc/rc.d/init.d/pound
-etc/rc.d/rc0.d/K40pound
-etc/rc.d/rc3.d/S60pound
-etc/rc.d/rc6.d/K40pound
 #etc/pound.cfg
 usr/sbin/pound
 usr/sbin/poundctl
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 32e688c..b854a2b 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -874,6 +874,7 @@ WARNING: untranslated string: proxy reports monthly
 WARNING: untranslated string: proxy reports today
 WARNING: untranslated string: proxy reports weekly
 WARNING: untranslated string: qos enter bandwidths
+WARNING: untranslated string: random number generator daemon
 WARNING: untranslated string: red1
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index a5a15c9..6ab29e8 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -881,6 +881,7 @@ WARNING: untranslated string: proxy reports monthly
 WARNING: untranslated string: proxy reports today
 WARNING: untranslated string: proxy reports weekly
 WARNING: untranslated string: qos enter bandwidths
+WARNING: untranslated string: random number generator daemon
 WARNING: untranslated string: red1
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index b649200..1fa7b18 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -803,6 +803,7 @@ WARNING: untranslated string: ovpn port in root range
 WARNING: untranslated string: p2p block
 WARNING: untranslated string: p2p block save notice
 WARNING: untranslated string: qos enter bandwidths
+WARNING: untranslated string: random number generator daemon
 WARNING: untranslated string: red1
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 32e688c..b854a2b 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -874,6 +874,7 @@ WARNING: untranslated string: proxy reports monthly
 WARNING: untranslated string: proxy reports today
 WARNING: untranslated string: proxy reports weekly
 WARNING: untranslated string: qos enter bandwidths
+WARNING: untranslated string: random number generator daemon
 WARNING: untranslated string: red1
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 7c1b5f8..4058098 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -864,6 +864,7 @@ WARNING: untranslated string: proxy reports monthly
 WARNING: untranslated string: proxy reports today
 WARNING: untranslated string: proxy reports weekly
 WARNING: untranslated string: qos enter bandwidths
+WARNING: untranslated string: random number generator daemon
 WARNING: untranslated string: red1
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 93166e6..96c3853 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -644,6 +644,7 @@ WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: atm device
 WARNING: untranslated string: bytes
 WARNING: untranslated string: fwhost err hostip
+WARNING: untranslated string: random number generator daemon
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
diff --git a/doc/language_missings b/doc/language_missings
index 601c9c7..1a386c1 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -357,6 +357,7 @@
 < proxy reports today
 < proxy reports weekly
 < qos enter bandwidths
+< random number generator daemon
 < red1
 < server restart
 < snat new source ip address
@@ -850,6 +851,7 @@
 < proxy reports today
 < proxy reports weekly
 < qos enter bandwidths
+< random number generator daemon
 < red1
 < server restart
 < Set time on boot
@@ -1297,6 +1299,7 @@
 < proxy reports today
 < proxy reports weekly
 < qos enter bandwidths
+< random number generator daemon
 < red1
 < server restart
 < snat new source ip address
@@ -1747,6 +1750,7 @@
 < proxy reports today
 < proxy reports weekly
 < qos enter bandwidths
+< random number generator daemon
 < red1
 < server restart
 < snat new source ip address
diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
index bd3de82..8e016b6 100644
--- a/html/cgi-bin/entropy.cgi
+++ b/html/cgi-bin/entropy.cgi
@@ -61,9 +61,27 @@ if ( $querry[0] ne~ "") {
    	$message = $Lang::tr{'no hardware random number generator'};
    }
+	my $rngd_status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td>";
+	if (&rngd_is_running()) {
+		$rngd_status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
+	}
+
    &Header::openbox('100%', 'center', $Lang::tr{'hardware support'});
    print <<EOF;
    	<p style="color: $message_colour; text-align: center;">$message</p>
+
+		<table width='80%' cellspacing='1' class='tbl'>
+			<tr>
+				<th align='center'><b>$Lang::tr{'service'}</b></th>
+				<th align='center'><b>$Lang::tr{'status'}</b></th>
+			</tr>
+			<tr>
+				<td align='center'>
+					$Lang::tr{'random number generator daemon'}
+				</td>
+				$rngd_status
+			</tr>
+		</table>
 EOF
    &Header::closebox();
@@ -87,3 +105,7 @@ sub has_rdrand() {
return 0;
 }
+
+sub rngd_is_running() {
+	return (-e "/var/run/rngd.pid");
+}
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 2dd87d2..090510f 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1783,6 +1783,7 @@
 'qos warning' => 'Die Regel <strong>muss</strong> wieder gespeichert werden, ansonsten wird sie verworfen!',
 'quick playlist' => 'Quick Playlist',
 'ram' => 'RAM-Speicher',
+'random number generator daemon' => 'Random Number Generator Daemon',
 'read bytes' => 'Gelesene Bytes',
 'read list' => 'Liste der Leseberechtigten',
 'real address' => 'Reale Addresse',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 67f4269..de29f34 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1815,6 +1815,7 @@
 'quick control' => 'Quick Control',
 'quick playlist' => 'Quick Playlist',
 'ram' => 'RAM',
+'random number generator daemon' => 'Random Number Generator Daemon',
 'read bytes' => 'Read Bytes',
 'read list' => 'list with readonly hosts',
 'real address' => 'Real Address',
diff --git a/lfs/pound b/lfs/pound
index 9305f45..20e807d 100644
--- a/lfs/pound
+++ b/lfs/pound
@@ -24,7 +24,7 @@
include Config
-VER        = 2.6
+VER        = 2.7c
THISAPP    = Pound-$(VER)
 DL_FILE    = $(THISAPP).tgz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = pound
-PAK_VER    = 5
+PAK_VER    = 6
DEPS       = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8c913b527332694943c4c67c8f152071
+$(DL_FILE)_MD5 = 56dace6b79c6be1d25b31355269c380a
install : $(TARGET)
@@ -77,16 +77,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -p4 < $(DIR_SRC)/src/patches/pound-2.6.patch
-	cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/Pound-2.6-reneg-ciphers-altnames-nosslv2.patch
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --enable-cert1l
+	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
    install -v -m 644 $(DIR_SRC)/config/backup/includes/pound \
    		 /var/ipfire/backup/addons/includes/pound
-	ln -sf ../init.d/pound /etc/rc.d/rc3.d/S60pound
-	ln -sf ../init.d/pound /etc/rc.d/rc0.d/K40pound
-	ln -sf ../init.d/pound /etc/rc.d/rc6.d/K40pound
# Remove temporary file.
    rm -vf /root/.rnd
diff --git a/make.sh b/make.sh
index 23b63ae..c702a7f 100755
--- a/make.sh
+++ b/make.sh
@@ -841,7 +841,8 @@ buildpackages() {
   ipfiremake cdrom
# Check if there is a loop device for building in virtual environments
-  if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
+  modprobe loop 2>/dev/null
+  if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then
    ipfiremake flash-images
   fi
hooks/post-receive
--
IPFire 2.x development tree

    