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 211947fa963ccbbc05acde31acf2489b96d44f99 (commit) via 918546e24fe1e0f9114fa7948c31398d9bf30b6f (commit) via daa1e380d5c3cb3e44dfec2e63476ad6427fe4a7 (commit) via 5c08baabb3fbebffa25b00d40325d450a9e47a88 (commit) from 18245dc27978e321b26aa71af7d7238a309e3f44 (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 211947fa963ccbbc05acde31acf2489b96d44f99 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Aug 29 21:37:46 2012 +0200
readhash: Fix syntax error in regular expression.
commit 918546e24fe1e0f9114fa7948c31398d9bf30b6f Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Aug 29 21:29:29 2012 +0200
installer: Fix showing COPYING.
commit daa1e380d5c3cb3e44dfec2e63476ad6427fe4a7 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Aug 29 20:33:26 2012 +0200
dejavu-fonts: Only ship fonts we need.
commit 5c08baabb3fbebffa25b00d40325d450a9e47a88 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Aug 29 20:32:25 2012 +0200
Add dejavu font package.
For rrdtool graphs.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/dejavu-fonts-ttf | 21 ++++++++++++++++++ lfs/{man-pages => dejavu-fonts-ttf} | 11 +++++---- make.sh | 1 + src/install+setup/install/main.c | 34 +++++++++++++++-------------- src/scripts/readhash | 2 +- 5 files changed, 47 insertions(+), 22 deletions(-) create mode 100644 config/rootfiles/common/dejavu-fonts-ttf copy lfs/{man-pages => dejavu-fonts-ttf} (94%)
Difference in files: diff --git a/config/rootfiles/common/dejavu-fonts-ttf b/config/rootfiles/common/dejavu-fonts-ttf new file mode 100644 index 0000000..a130284 --- /dev/null +++ b/config/rootfiles/common/dejavu-fonts-ttf @@ -0,0 +1,21 @@ +usr/share/fonts/DejaVuSans-Bold.ttf +usr/share/fonts/DejaVuSans-BoldOblique.ttf +usr/share/fonts/DejaVuSans-ExtraLight.ttf +usr/share/fonts/DejaVuSans-Oblique.ttf +usr/share/fonts/DejaVuSans.ttf +#usr/share/fonts/DejaVuSansCondensed-Bold.ttf +#usr/share/fonts/DejaVuSansCondensed-BoldOblique.ttf +#usr/share/fonts/DejaVuSansCondensed-Oblique.ttf +#usr/share/fonts/DejaVuSansCondensed.ttf +#usr/share/fonts/DejaVuSansMono-Bold.ttf +#usr/share/fonts/DejaVuSansMono-BoldOblique.ttf +#usr/share/fonts/DejaVuSansMono-Oblique.ttf +#usr/share/fonts/DejaVuSansMono.ttf +#usr/share/fonts/DejaVuSerif-Bold.ttf +#usr/share/fonts/DejaVuSerif-BoldItalic.ttf +#usr/share/fonts/DejaVuSerif-Italic.ttf +#usr/share/fonts/DejaVuSerif.ttf +#usr/share/fonts/DejaVuSerifCondensed-Bold.ttf +#usr/share/fonts/DejaVuSerifCondensed-BoldItalic.ttf +#usr/share/fonts/DejaVuSerifCondensed-Italic.ttf +#usr/share/fonts/DejaVuSerifCondensed.ttf diff --git a/lfs/dejavu-fonts-ttf b/lfs/dejavu-fonts-ttf new file mode 100644 index 0000000..cd31a2d --- /dev/null +++ b/lfs/dejavu-fonts-ttf @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + + +VER = 2.33 + +THISAPP = dejavu-fonts-ttf-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 8b601e91725b6d69141b0fcf527948c0 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + mkdir -pv /usr/share/fonts + install -m 644 $(DIR_APP)/ttf/* /usr/share/fonts + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 07e93de..eb847e4 100755 --- a/make.sh +++ b/make.sh @@ -582,6 +582,7 @@ buildipfire() { ipfiremake ntp ipfiremake openssh ipfiremake fontconfig + ipfiremake dejavu-fonts-ttf ipfiremake freefont ipfiremake pixman ipfiremake cairo diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index e1b9161..ea47593 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -14,6 +14,7 @@
#define INST_FILECOUNT 10700 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf" +#define LICENSE_FILE "/cdrom/COPYING"
#define EXT2 0 #define EXT3 1 @@ -120,16 +121,6 @@ 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 @@ -157,11 +148,6 @@ int main(int argc, char *argv[]) if (!unattended) { sprintf(message, ctr[TR_WELCOME], NAME); newtWinMessage(title, ctr[TR_OK], message); - - if (disclaimerbox(discl_msg)==0) { - errorbox(ctr[TR_LICENSE_NOT_ACCEPTED]); - goto EXIT; - } }
mysystem("/bin/mountsource.sh"); @@ -178,7 +164,23 @@ int main(int argc, char *argv[]) fgets(sourcedrive, 5, handle); fprintf(flog, "Source drive: %s\n", sourcedrive); fclose(handle); - + + if (!unattended) { + // Read the license file. + if (!(copying = fopen(LICENSE_FILE, "r"))) { + sprintf(discl_msg, "Could not open license file: %s\n", LICENSE_FILE); + fprintf(flog, discl_msg); + } else { + fread(discl_msg, 1, 40000, copying); + fclose(copying); + + if (disclaimerbox(discl_msg)==0) { + errorbox(ctr[TR_LICENSE_NOT_ACCEPTED]); + goto EXIT; + } + } + } + i = 0; while (found == 0) { i++; diff --git a/src/scripts/readhash b/src/scripts/readhash index 8c187d5..cc063a7 100644 --- a/src/scripts/readhash +++ b/src/scripts/readhash @@ -9,7 +9,7 @@
# shell variables must consist of alphanumeric characters and underscores, # and begin with an alphabetic character or underscore. -VARNAME='[A-Za-z_][A-zA-z0-9_]*' +VARNAME='[A-Za-z_][A-Za-z0-9_]*'
# For the assigned value we only accept a limited number of characters - none # of which are shell metachars
hooks/post-receive -- IPFire 2.x development tree