[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. f83650a1368d55c72869fa94c903e78c097cf598
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, thirteen has been updated via f83650a1368d55c72869fa94c903e78c097cf598 (commit) via 1d12008db5c86f06c70600ea2ac9cc0721af6d9b (commit) via fe3a05da3a794e3025fde4b39775876835ad735a (commit) via ecd0ac08a56363fd779bcd08d70a4720f99a33db (commit) via 03207e65b1244bb4a82a55bc1e1f893e05695aa0 (commit) via d6b4566d9cf63ab0848b508382b6daa836b5cc7d (commit) via d9efec0d7bc7bd6c0588ba978f6331a3449ddc8d (commit) from d8ce16fa6619b9090919ffa334aebdc67418f75c (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 f83650a1368d55c72869fa94c903e78c097cf598 Author: Arne Fitzenreiter Arne_F@ipfire.org Date: Fri Oct 26 17:43:29 2012 +0200
paks: compress internal tar with xz.
commit 1d12008db5c86f06c70600ea2ac9cc0721af6d9b Merge: ecd0ac0 fe3a05d Author: Arne Fitzenreiter Arne_F@ipfire.org Date: Fri Oct 26 15:40:45 2012 +0200
Merge remote-tracking branch 'origin/next' into thirteen
commit ecd0ac08a56363fd779bcd08d70a4720f99a33db Merge: d8ce16f 03207e6 Author: Arne Fitzenreiter Arne_F@ipfire.org Date: Fri Oct 26 09:58:49 2012 +0200
Merge remote-tracking branch 'origin/next' into thirteen
-----------------------------------------------------------------------
Summary of changes: html/cgi-bin/credits.cgi | 21 ++++++--------------- html/cgi-bin/updatexlrator.cgi | 2 +- lfs/Config | 2 +- lfs/core-updates | 4 ++-- src/pakfire/lib/functions.sh | 4 ++-- src/paks/files | 2 +- 6 files changed, 13 insertions(+), 22 deletions(-)
Difference in files: diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 3ae2f71..0d091a2 100644 --- 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ü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älchli (<a href='mailto:peter.schaelchli\@ipfire.org'>peter.schaelchli@ipfire.org</a>)<br /> +Jan Paul Tü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 04b7b8e..e3e633c 100644 --- 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'> </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'> </td> <td class='base'> </td> diff --git a/lfs/Config b/lfs/Config index 7360ac6..b9c0fb6 100644 --- a/lfs/Config +++ b/lfs/Config @@ -191,7 +191,7 @@ define PAK tar xf /install/packages/package/files.tmp -C /install/packages/package/tmp/ \ -p --numeric-owner rm -f /install/packages/package/files.tmp - cd /install/packages/package/tmp/ && tar -c -p --numeric-owner -f /install/packages/package/files * + cd /install/packages/package/tmp/ && tar -c -p --numeric-owner -J -f /install/packages/package/files.tar.xz * rm -r /install/packages/package/tmp -cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES diff --git a/lfs/core-updates b/lfs/core-updates index c4cedcd..b40de13 100644 --- a/lfs/core-updates +++ b/lfs/core-updates @@ -77,7 +77,7 @@ core/%: mv -f /tmp/ROOTFILES /install/packages/package/ROOTFILES tar -p --numeric-owner -x -C /tmp -f /$(SNAME).tar rm -f /$(SNAME).tar - cd /tmp && tar cf /install/packages/package/files * && rm -rf * + cd /tmp && tar cJf /install/packages/package/files.tar.xz * && rm -rf * cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp rm /install/packages/package/ROOTFILES mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES @@ -89,7 +89,7 @@ core/%: sed -e "s/xxxKVERxxx/$(KVER)/g" -i /install/packages/package/update.sh
cd /install/packages/package && tar cf ../core-upgrade-$(VERSION)-$$(basename $@).ipfire \ - update.sh files ROOTFILES + update.sh files.tar.xz ROOTFILES rm -rf /install/packages/package sed -e "s/NAME/core-upgrade/g" \ -e "s/VER/$(VERSION)/g" \ diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh index bc05bd0..3f7dbff 100644 --- 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." } diff --git a/src/paks/files b/src/paks/files index ce88096..673a17d 100644 --- a/src/paks/files +++ b/src/paks/files @@ -1,4 +1,4 @@ -files +files.tar.xz install.sh uninstall.sh update.sh
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org