Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

diff --git a/config/rootfiles/packages/pound b/config/rootfiles/packages/pound
index a935172a73d93effb7646cc3473d5e25b4fa89c7..02f3d41b9c40d8609eac8504c2b1baca911ba4c2 100644 (file)
--- 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 32e688c77900edb974cf986c5fa8c14a89f8a3b3..b854a2b7a661cd648cc7d7e9ca4df61b2ea563c9 100644 (file)
--- 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 a5a15c9162433ee6dc67fa8bb50a1b3b4b8bf4ae..6ab29e8bb64b4f8e67d1eb0895f72668dd7244f2 100644 (file)
--- 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 b64920020c86ffe86201be4b9d64769545801b35..1fa7b18739d5b4a7ba77c31dc4337dc1ba498b7a 100644 (file)
--- 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 32e688c77900edb974cf986c5fa8c14a89f8a3b3..b854a2b7a661cd648cc7d7e9ca4df61b2ea563c9 100644 (file)
--- 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 7c1b5f87da517ff76da506d175a1afe3e770c707..4058098609168fbc2f48ed489da08ac8929b9e24 100644 (file)
--- 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 93166e621f91e74fe8cf0a832529d64b35d85367..96c38538add04d228e995225c787d01efb3c3e4f 100644 (file)
--- 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 601c9c799026327c7a9de13c259a0b5b7acc6547..1a386c19c23e1affcf211fec821fc91c669d8013 100644 (file)
--- 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 bd3de82f8ceae283cff7a8b9129c52e8cd1ab5de..8e016b6cf6a8d93958f6e0c2902fba2d3f7514ce 100644 (file)
--- 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 2dd87d224cb7362060a4cd910da0c2b20cac536c..090510fe398552a1c6721b742ae676785e12b723 100644 (file)
--- 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 67f4269963b2e143d7009cfaa01f47345953c67e..de29f34ec48c4a6c6ce1f5c2a303f97ddb291827 100644 (file)
--- 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 9305f4595239d7c4fc5ea8121f38d3535517e7c9..20e807d18707c2d472574046b55d74fb99b4123e 100644 (file)
--- 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 23b63ae859013d3490878a033ce678d6a480ad33..c702a7ff1f4aa2366e4f4845f08dc2ac35160b31 100755 (executable)
--- 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