Merge remote-tracking branch 'origin/next' into thirteen

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 3ae2f71884ba00dbac18400c4691cfa67c0f5479..0d091a2d8ece5ee25af5a274bad6d8349fba9081 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -39,16 +39,11 @@ require "${General::swroot}/header.pl";
 
 print <<END
 <p>$Lang::tr{'donation-text'}</p>
-       <div align="center">
-               <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-                       <input type="hidden" name="cmd" value="_s-xclick">
-                       <input type="hidden" name="hosted_button_id" value="HHBTSN9QRWPAY">
-                       <input type="image" src="$Lang::tr{'donation-link'}" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
-                       <img alt="" border="0" src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif" width="1" height="1">
-               </form>
-       </div>
-<br />
 
+<div align="center">
+       <a href="http://www.ipfire.org/donate">$Lang::tr{'donation'}</a>
+</div>
+<br>
 END
 ;
 &Header::closebox();
@@ -73,8 +68,6 @@ Christian Schmidt
 (<a href='mailto:christian.schmidt\@ipfire.org'>christian.schmidt\@ipfire.org</a>) - Vice Project Leader <br />
 Stefan Schantl
 (<a href='mailto:stefan.schantl\@ipfire.org'>stefan.schantl\@ipfire.org</a>)<br />
-Jan Paul T&uuml;cking
-(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)<br />
 Heiner Schmeling
 (<a href='mailto:heiner.schmeling\@ipfire.org'>heiner.schmeling\@ipfire.org</a>)<br />
 Ronald Wiesinger
@@ -94,12 +87,10 @@ Peter Pfeiffer
 (<a href='mailto:peter.pfeifer\@ipfire.org'>peter.pfeifer\@ipfire.org</a>)<br />
 Peter Sch&auml;lchli
 (<a href='mailto:peter.schaelchli\@ipfire.org'>peter.schaelchli\@ipfire.org</a>)<br />
+Jan Paul T&uuml;cking
+(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)<br />
 </p>
-<p>Some parts of the distribution are left ajar on third-party software, that is licensed under the GPL, too.<br />
-There are: Advanced Proxy with URL-Filter and Update-Accelerator, ZERINA, Connection Scheduler, Hddtemp and Wake-on-LAN.<br />
-Distributed by Marco Sondermann, Ufuk Altinkaynak, Thomas Eichstaedt and Olaf Westrik.</p>
 <p>
-
 This product includes GeoLite data created by MaxMind, available from <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>.
 </p>
 END

diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi
index 04b7b8ee68b7020286b11e346b0bcdab5ee47e32..e3e633cc4fdf81ff21d35f04875c3894b2cb975e 100644 (file)
--- a/html/cgi-bin/updatexlrator.cgi
+++ b/html/cgi-bin/updatexlrator.cgi
@@ -1362,7 +1362,7 @@ sub printlegendicons
                <td><img src='/images/updbooster/updxl-globe.gif' alt='$Lang::tr{'updxlrtr last checkup'}' /></td>
                <td class='base'>$Lang::tr{'updxlrtr last checkup'}</td>
                <td class='base'>&nbsp;</td>
-               <td><img src='/images/updbooster/delete.gif' alt='$Lang::tr{'updxlrtr remove file'}' /></td>
+               <td><img src='/images/delete.gif' alt='$Lang::tr{'updxlrtr remove file'}' /></td>
                <td class='base'>$Lang::tr{'updxlrtr remove file'}</td>
                <td class='base'>&nbsp;</td>
                <td class='base'>&nbsp;</td>

diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh
index bc05bd01e0112d137715241c36e5cfc8faed9a69..9c8bf53e851509c3de6c81e9718ae6ab9aeeb325 100644 (file)
--- a/src/pakfire/lib/functions.sh
+++ b/src/pakfire/lib/functions.sh
@@ -24,13 +24,13 @@
 
 extract_files() {
        echo "Extracting files..."
-       tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C /
+       tar xavf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C /
        echo "...Finished."
 }
 
 extract_backup_includes() {
        echo "Extracting backup includes..."
-       tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \
+       tar xavf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \
                var/ipfire/backup/addons/includes
        echo "...Finished."
 }