From 3c6ab3d121387d53e3cb02273c38968922d4a272 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 19 Oct 2010 22:54:05 +0200 Subject: [PATCH 1/6] Add glibc to core41 updater. --- config/rootfiles/core/41/filelists/glibc | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/41/filelists/glibc diff --git a/config/rootfiles/core/41/filelists/glibc b/config/rootfiles/core/41/filelists/glibc new file mode 120000 index 000000000..fbb4a52be --- /dev/null +++ b/config/rootfiles/core/41/filelists/glibc @@ -0,0 +1 @@ +../../../common/glibc \ No newline at end of file From 81e02ac0b284171e3388eac8eb420a725f2baab1 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 19 Oct 2010 22:55:49 +0200 Subject: [PATCH 2/6] Rebuild language cache at core41 update. --- config/rootfiles/core/41/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/core/41/update.sh b/config/rootfiles/core/41/update.sh index 6b54995df..f053ca95a 100644 --- a/config/rootfiles/core/41/update.sh +++ b/config/rootfiles/core/41/update.sh @@ -36,7 +36,7 @@ extract_files # #Update Language cache -#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" #Rebuild module dep's #depmod 2.6.32.15-ipfire From cacb0b4eb94c5c21ab067f4e21f6758d564f8d9a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 19 Oct 2010 22:57:12 +0200 Subject: [PATCH 3/6] Stop/start strongswan at core41 update. --- config/rootfiles/core/41/update.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/rootfiles/core/41/update.sh b/config/rootfiles/core/41/update.sh index f053ca95a..84bd43246 100644 --- a/config/rootfiles/core/41/update.sh +++ b/config/rootfiles/core/41/update.sh @@ -26,6 +26,7 @@ # #Stop services +/etc/init.d/ipsec stop # #Extract files @@ -33,6 +34,7 @@ extract_files # #Start services +/etc/init.d/ipsec start # #Update Language cache From ad306a7a299badacdd8c31bab3511ab9804af8df Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 21 Oct 2010 00:24:24 +0200 Subject: [PATCH 4/6] bzip2: Update 1.0.6. Closes latest security vulnerability. Might require to rebuild toolchain. --- config/rootfiles/common/bzip2 | 48 +++++++++++++++++------------------ lfs/bzip2 | 6 ++--- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/config/rootfiles/common/bzip2 b/config/rootfiles/common/bzip2 index 550b9f1a9..b91b89d79 100644 --- a/config/rootfiles/common/bzip2 +++ b/config/rootfiles/common/bzip2 @@ -2,28 +2,26 @@ bin/bunzip2 bin/bzcat bin/bzip2 lib/libbz2.so.1.0 -lib/libbz2.so.1.0.4 -usr/lib/libbz2.so -usr/local/bin/bunzip2 -usr/local/bin/bzcat -#usr/local/bin/bzcmp -#usr/local/bin/bzdiff -#usr/local/bin/bzegrep -#usr/local/bin/bzfgrep -#usr/local/bin/bzgrep -usr/local/bin/bzip2 -#usr/local/bin/bzip2recover -#usr/local/bin/bzless -#usr/local/bin/bzmore -usr/local/include/bzlib.h -usr/local/lib/libbz2.a -#usr/local/man -#usr/local/man/man1 -#usr/local/man/man1/bzcmp.1 -#usr/local/man/man1/bzdiff.1 -#usr/local/man/man1/bzegrep.1 -#usr/local/man/man1/bzfgrep.1 -#usr/local/man/man1/bzgrep.1 -#usr/local/man/man1/bzip2.1 -#usr/local/man/man1/bzless.1 -#usr/local/man/man1/bzmore.1 +lib/libbz2.so.1.0.6 +usr/bin/bunzip2 +usr/bin/bzcat +usr/bin/bzcmp +usr/bin/bzdiff +usr/bin/bzegrep +usr/bin/bzfgrep +usr/bin/bzgrep +usr/bin/bzip2 +usr/bin/bzip2recover +usr/bin/bzless +usr/bin/bzmore +usr/include/bzlib.h +#usr/lib/libbz2.a +#usr/lib/libbz2.so +#usr/man/man1/bzcmp.1 +#usr/man/man1/bzdiff.1 +#usr/man/man1/bzegrep.1 +#usr/man/man1/bzfgrep.1 +#usr/man/man1/bzgrep.1 +#usr/man/man1/bzip2.1 +#usr/man/man1/bzless.1 +#usr/man/man1/bzmore.1 diff --git a/lfs/bzip2 b/lfs/bzip2 index 4712f31d5..44fa7575e 100644 --- a/lfs/bzip2 +++ b/lfs/bzip2 @@ -24,7 +24,7 @@ include Config -VER = 1.0.5 +VER = 1.0.6 THISAPP = bzip2-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3c15a0c8d1d3ee1c46a1634d00617b1a +$(DL_FILE)_MD5 = 00b516f4704d4a7cb50a1d97e6e8e15b install : $(TARGET) @@ -82,7 +82,7 @@ ifeq "$(ROOT)" "" cd $(DIR_APP) && make -f Makefile-libbz2_so cd $(DIR_APP) && make clean cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && make install PREFIX=/usr cd $(DIR_APP) && cp -v bzip2-shared /bin/bzip2 cd $(DIR_APP) && cp -av libbz2.so* /lib ln -sfv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so From 077de40a4cefb4cc38c4a9a0b2a477e1102ead93 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 21 Oct 2010 17:45:31 +0200 Subject: [PATCH 5/6] Add bzip2 update to core41. --- config/rootfiles/core/41/filelists/bzip2 | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/41/filelists/bzip2 diff --git a/config/rootfiles/core/41/filelists/bzip2 b/config/rootfiles/core/41/filelists/bzip2 new file mode 120000 index 000000000..03f4ee55e --- /dev/null +++ b/config/rootfiles/core/41/filelists/bzip2 @@ -0,0 +1 @@ +../../../common/bzip2 \ No newline at end of file From 38a76ff405f8b1358181c7dfa2e4b23aca1d9985 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 21 Oct 2010 17:52:25 +0200 Subject: [PATCH 6/6] Setup: add spanish language file. --- config/rootfiles/core/41/filelists/files | 1 + src/install+setup/setup/main.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/core/41/filelists/files b/config/rootfiles/core/41/filelists/files index c42902fdd..21a915b53 100644 --- a/config/rootfiles/core/41/filelists/files +++ b/config/rootfiles/core/41/filelists/files @@ -9,3 +9,4 @@ var/ipfire/langs/de.pl var/ipfire/langs/es.pl var/ipfire/langs/fr.pl var/ipfire/outgoing/bin/outgoingfw.pl +usr/local/sbin/setup diff --git a/src/install+setup/setup/main.c b/src/install+setup/setup/main.c index f0d36045d..33cae349e 100644 --- a/src/install+setup/setup/main.c +++ b/src/install+setup/setup/main.c @@ -23,7 +23,7 @@ struct knic knics[20] = { { "" , "" , "" , "" } }; extern char *en_tr[]; extern char *de_tr[]; extern char *fr_tr[]; - +extern char *es_tr[]; int main(int argc, char *argv[]) { @@ -31,8 +31,8 @@ int main(int argc, char *argv[]) char *shortlangnames[] = { "en", NULL }; char **langtrs[] = { en_tr, NULL }; #else - char *shortlangnames[] = { "de", "en", "fr", NULL }; - char **langtrs[] = { de_tr, en_tr, fr_tr, NULL }; + char *shortlangnames[] = { "de", "en", "fr", "es", NULL }; + char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, NULL }; #endif int choice; char *sections[11]; /* need to fill this out AFTER knowning lang */