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, next has been updated via df746da1c8017f6f3d8a3afb824baf4f6b8f9b5d (commit) via 19d31f52368a052d328214eda0f6f92b60021eb2 (commit) via 578297dbe5ac5b0d60429fdc2b6df36ad71a6afb (commit) via e0bbaf87779eaf0d53d96bf4bc2efd91a9fde28b (commit) from 59093c5ec474be7eb22c17a8f1cb0c1922f1f93a (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 df746da1c8017f6f3d8a3afb824baf4f6b8f9b5d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 20 20:03:02 2010 +0200
Updated Realter 8169 driver.
commit 19d31f52368a052d328214eda0f6f92b60021eb2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 20 20:02:43 2010 +0200
Updated Realtek 8168 driver.
commit 578297dbe5ac5b0d60429fdc2b6df36ad71a6afb Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 20 20:02:15 2010 +0200
Updated Realtek r8101 driver.
commit e0bbaf87779eaf0d53d96bf4bc2efd91a9fde28b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 20 20:01:24 2010 +0200
Add license dialog to the installer.
-----------------------------------------------------------------------
Summary of changes: langs/de/install/lang_de.c | 11 ++++++- langs/en/install/lang_en.c | 10 +++++- langs/es/install/lang_es.c | 8 ++++- langs/fr/install/lang_fr.c | 10 ++++-- lfs/r8101 | 4 +- lfs/r8168 | 4 +- lfs/r8169 | 4 +- make.sh | 1 + src/install+setup/install/main.c | 22 ++++++++++++- src/install+setup/libsmooth/libsmooth.h | 2 + src/install+setup/libsmooth/main.c | 55 +++++++++++++++++++++++++++++++ 11 files changed, 118 insertions(+), 13 deletions(-)
Difference in files: diff --git a/langs/de/install/lang_de.c b/langs/de/install/lang_de.c index b59b5d0..0a1d275 100644 --- a/langs/de/install/lang_de.c +++ b/langs/de/install/lang_de.c @@ -1,7 +1,7 @@ /* * German (de) Data File * - * This file is part of the IPCop Firewall. + * This file is part of the IPFire. * * IPCop is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,10 @@ * along with IPCop; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * (c) IPFire Team info@ipfire.org + * + * based on work of SmoothWall and IPCop + * * (c) The SmoothWall Team * * IPCop translation @@ -567,5 +571,10 @@ char *de_tr[] = { "Starte den DHCP-Server ...", /* TR_DHCP_STOPSERVER */ "Stoppe den DHCP-Server ...", +/* TR_LICENSE_ACCEPT */ +"Ich akzeptiere diese Lizens.", +/* TR_LICENSE_NOT_ACCEPTED */ +"Die Lizens wurde nicht akzeptiert. Abbruch!", + };
diff --git a/langs/en/install/lang_en.c b/langs/en/install/lang_en.c index 939d627..690a586 100644 --- a/langs/en/install/lang_en.c +++ b/langs/en/install/lang_en.c @@ -1,7 +1,7 @@ /* * English (en) Data File * - * This file is part of the IPCop Firewall. + * This file is part of the IPFire. * * IPCop is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,10 @@ * along with IPCop; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * (c) IPFire Team info@ipfire.org + * + * based on work of SmoothWall and IPCop + * * (c) The SmoothWall Team * */ @@ -563,6 +567,10 @@ char *en_tr[] = { "Starting DHCP-Server ...", /* TR_DHCP_STOPSERVER */ "Stopping DHCP-Server ...", +/* TR_LICENSE_ACCEPT */ +"I accept this license.", +/* TR_LICENSE_NOT_ACCEPTED */ +"License not accepted. Exit!",
};
diff --git a/langs/es/install/lang_es.c b/langs/es/install/lang_es.c index 2e32de2..b960137 100644 --- a/langs/es/install/lang_es.c +++ b/langs/es/install/lang_es.c @@ -1,7 +1,7 @@ /* * Spanish (es) Data File * - * This file is part of the IPFire Firewall. + * This file is part of the IPFire. * * IPFire is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,8 @@ * along with IPFire; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * (c) IPFire Team info@ipfire.org + * */
#include "libsmooth.h" @@ -561,6 +563,10 @@ char *es_tr[] = { "Iniciando Servidor DHCP ...", /* TR_DHCP_STOPSERVER */ "Deteniendo Servidor DHCP ...", +/* TR_LICENSE_ACCEPT */ +"I accept this license.", +/* TR_LICENSE_NOT_ACCEPTED */ +"License not accepted. Exit!",
};
diff --git a/langs/fr/install/lang_fr.c b/langs/fr/install/lang_fr.c index 2147284..25c313c 100644 --- a/langs/fr/install/lang_fr.c +++ b/langs/fr/install/lang_fr.c @@ -1,7 +1,7 @@ /* * French (fr) Data File * - * This file is part of the IPCop Firewall. + * This file is part of the IPFire. * * IPCop is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ * along with IPCop; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * (c) The SmoothWall Team - * + * (c) IPFire Team info@ipfire.org + * */
#include "libsmooth.h" @@ -563,6 +563,10 @@ char *fr_tr[] = { "Démarrage du serveur DHCP ...", /* TR_DHCP_STOPSERVER */ "Arrêt du serveur DHCP ...", +/* TR_LICENSE_ACCEPT */ +"I accept this license.", +/* TR_LICENSE_NOT_ACCEPTED */ +"License not accepted. Exit!",
};
diff --git a/lfs/r8101 b/lfs/r8101 index d085324..a523c68 100644 --- a/lfs/r8101 +++ b/lfs/r8101 @@ -34,7 +34,7 @@ else endif endif
-VER = 1.016.00 +VER = 1.019.00
THISAPP = r8101-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5885e0f20cf8a87566f1fb99b5113b72 +$(DL_FILE)_MD5 = 2804355badc4cb14f091dd8b32d270c3
install : $(TARGET)
diff --git a/lfs/r8168 b/lfs/r8168 index fce2d30..a80d156 100644 --- a/lfs/r8168 +++ b/lfs/r8168 @@ -34,7 +34,7 @@ else endif endif
-VER = 8.018.00 +VER = 8.019.00
THISAPP = r8168-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f73f91690ef18e76434cb083b10f3b44 +$(DL_FILE)_MD5 = f6934fc5df1dfb5fea82e4a310568890
install : $(TARGET)
diff --git a/lfs/r8169 b/lfs/r8169 index 745fd29..b738385 100644 --- a/lfs/r8169 +++ b/lfs/r8169 @@ -34,7 +34,7 @@ else endif endif
-VER = 6.013.00 +VER = 6.014.00
THISAPP = r8169-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5cbf92304fe64345b1838b7664701afa +$(DL_FILE)_MD5 = 0f1a8dffb4774e8f9ac29ae29a0696e3
install : $(TARGET)
diff --git a/make.sh b/make.sh index 1f986bc..cc2d3c5 100755 --- a/make.sh +++ b/make.sh @@ -689,6 +689,7 @@ buildinstaller() { ipfiremake mbr ipfiremake memtest ipfiremake installer + cp -f $BASEDIR/doc/COPYING $BASEDIR/build/install/initrd/ installmake strip ipfiremake initrd } diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index a46de92..dc3ac19 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -35,6 +35,9 @@ extern char *fr_tr[];
int main(int argc, char *argv[]) { + + char discl_msg[40000] = "Disclaimer\n"; + char *langnames[] = { "Deutsch", "English", "Français", "Español", NULL }; char *shortlangnames[] = { "de", "en", "fr", "es", NULL }; char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, NULL }; @@ -57,7 +60,7 @@ int main(int argc, char *argv[]) int allok_fastexit=0; int raid_disk = 0; struct keyvalue *ethernetkv = initkeyvalues(); - FILE *handle, *cmdfile; + FILE *handle, *cmdfile, *copying; char line[STRING_SIZE]; char string[STRING_SIZE]; long memory = 0, disk = 0, free; @@ -108,6 +111,16 @@ int main(int argc, char *argv[]) } }
+ // Read gpl ... + if (! (copying = fopen("/COPYING", "r"))) + { + fprintf(flog, "Couldn't open gpl (/COPYING)\n"); + sprintf(discl_msg, "Couldn't open gpl (/COPYING)\n"); + } else { + fread(discl_msg, 1, 40000, copying); + fclose(copying); + } + // Load common modules mysystem("/sbin/modprobe iso9660"); // CDROM mysystem("/sbin/modprobe ext2"); // Boot patition @@ -135,6 +148,13 @@ int main(int argc, char *argv[]) sprintf(message, ctr[TR_WELCOME], NAME); newtWinMessage(title, ctr[TR_OK], message);
+ if (!unattended) { + if (disclaimerbox(discl_msg)==0) { + errorbox(ctr[TR_LICENSE_NOT_ACCEPTED]); + goto EXIT; + } + } + switch (mysystem("/bin/mountsource.sh")) { case 0: break; diff --git a/src/install+setup/libsmooth/libsmooth.h b/src/install+setup/libsmooth/libsmooth.h index 54d7029..fb38193 100644 --- a/src/install+setup/libsmooth/libsmooth.h +++ b/src/install+setup/libsmooth/libsmooth.h @@ -79,6 +79,8 @@ void reboot(void); void stripnl(char *s); int mysystem(char *command); void errorbox(char *message); +int statuswindowscroll(int width, int height, char *title, char *text, ...); +int disclaimerbox(char *message); void statuswindow(int width, int height, char *title, char *text, ...); int runcommandwithprogress(int width, int height, char *title, char *command, int lines, char *text, ...); diff --git a/src/install+setup/libsmooth/main.c b/src/install+setup/libsmooth/main.c index 710183a..8de8c23 100644 --- a/src/install+setup/libsmooth/main.c +++ b/src/install+setup/libsmooth/main.c @@ -45,6 +45,61 @@ void errorbox(char *message) newtWinMessage(ctr[TR_ERROR], ctr[TR_OK], message); }
+int scrollmsgbox(int width, int height, char *title, char *text, ...) +{ + int rc = 0; + newtComponent t, f, b, c; + char *buf = NULL; + char checkbox; + int size = 0; + int i = 0; + va_list args; + + va_start(args, text); + + do { + size += 40000; + if (buf) free(buf); + buf = malloc(size); + i = vsnprintf(buf, size, text, args); + } while (i == size); + + va_end(args); + + newtCenteredWindow(width, height, title); + + b = newtCompactButton(width - 15 ,height - 2, ctr[TR_OK]); + c = newtCheckbox(3, height - 2, ctr[TR_LICENSE_ACCEPT], ' ', " *", &checkbox); + + t = newtTextbox(1, 1, width - 2, height - 4, NEWT_TEXTBOX_WRAP+NEWT_TEXTBOX_SCROLL); + newtTextboxSetText(t, buf); + + f = newtForm(NULL, NULL, 0); + free(buf); + + newtFormAddComponent(f, c); + newtFormAddComponent(f, b); + newtFormAddComponent(f, t); + + newtRunForm(f); + if (checkbox=='*') rc=1; + newtFormDestroy(f); + return rc; +} + +int disclaimerbox(char *message) +{ + int rc; + char title[STRING_SIZE]; + + sprintf (title, "%s v%s - %s", NAME, VERSION, SLOGAN); + rc = scrollmsgbox(75, 20, title, message); + newtPopWindow(); + + return rc; +} + + void statuswindow(int width, int height, char *title, char *text, ...) { newtComponent t, f;
hooks/post-receive -- IPFire 2.x development tree