IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7849 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 889a288b3639ec726f28b39022a42d38532e18e7
by git＠ipfire.org 23 Oct '10

23 Oct '10

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, master has been updated via 889a288b3639ec726f28b39022a42d38532e18e7 (commit) from 24d109d134465bffb72306e63e97a33d465b0b3c (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 889a288b3639ec726f28b39022a42d38532e18e7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Oct 23 13:30:24 2010 +0200 Squidguard: disabled parallel build. ----------------------------------------------------------------------- Summary of changes: lfs/squidguard | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/lfs/squidguard b/lfs/squidguard index a5dd7b9..c70a0d8 100644 --- a/lfs/squidguard +++ b/lfs/squidguard @@ -75,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \ --with-sg-logdir=/var/log/squidGuard --with-sg-dbhome=/var/lib/squidguard \ --with-db=/usr --with-db-inc=/usr/include --with-db-lib=/usr/lib - cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make cd $(DIR_APP) && make install # URL-Filter hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a398cc21e909a60e582ee65887e17f66e22d3d29
by git＠ipfire.org 23 Oct '10

23 Oct '10

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 a398cc21e909a60e582ee65887e17f66e22d3d29 (commit) from 38c982bb77390f53744815eedb877ebeab05ba4b (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 a398cc21e909a60e582ee65887e17f66e22d3d29 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Oct 23 09:42:57 2010 +0200 Fix toolchain tcl build. ----------------------------------------------------------------------- Summary of changes: lfs/tcl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/tcl b/lfs/tcl index a62b4e6..e863729 100644 --- a/lfs/tcl +++ b/lfs/tcl @@ -31,7 +31,7 @@ DL_FILE = $(THISAPP)-src.tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -ifeq "$(LFS_PASS)" "toolchain" +ifneq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP)-tools else TARGET = $(DIR_INFO)/$(THISAPP) @@ -75,14 +75,14 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -ifeq "$(LFS_PASS)" "toolchain" +ifneq "$(ROOT)" "" cd $(DIR_APP)/unix && ./configure --prefix=/tools --disable-nls else cd $(DIR_APP)/unix && ./configure --prefix=/usr --disable-nls endif cd $(DIR_APP)/unix && make $(MAKETUNING) cd $(DIR_APP)/unix && make install -ifeq "$(LFS_PASS)" "toolchain" +ifneq "$(ROOT)" "" cd $(DIR_APP)/unix && make install-private-headers ln -sf tclsh8.4 /tools/bin/tclsh else hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 24d109d134465bffb72306e63e97a33d465b0b3c
by git＠ipfire.org 23 Oct '10

23 Oct '10

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, master has been updated via 24d109d134465bffb72306e63e97a33d465b0b3c (commit) from c0a0f74012af54902797b07897642d4799d99c25 (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 24d109d134465bffb72306e63e97a33d465b0b3c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Oct 23 09:44:03 2010 +0200 rootfile update: cmake. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/cmake | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/common/cmake b/config/rootfiles/common/cmake index a9a5865..8cefc88 100644 --- a/config/rootfiles/common/cmake +++ b/config/rootfiles/common/cmake @@ -11,6 +11,8 @@ #usr/local/doc/cmake-2.4/cmake.txt #usr/local/doc/cmake-2.4/ctest.html #usr/local/doc/cmake-2.4/ctest.txt +#usr/local/man +#usr/local/man/man1 #usr/local/man/man1/ccmake.1 #usr/local/man/man1/cmake.1 #usr/local/man/man1/ctest.1 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c0a0f74012af54902797b07897642d4799d99c25
by git＠ipfire.org 23 Oct '10

23 Oct '10

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, master has been updated via c0a0f74012af54902797b07897642d4799d99c25 (commit) via 6fb0e3776fde47f22c3fe35b63777d3be75c189f (commit) via b0fdaa6f34b1529951f7aeb5c13d26c10fbd750d (commit) via 9963abf5d4b639c75b626a1122d8fa1b91fc3a28 (commit) from cfac7c232c136363dad5b451549394d996cef1b2 (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 c0a0f74012af54902797b07897642d4799d99c25 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Oct 23 09:40:50 2010 +0200 Add updated Realtek modules to core41. commit 6fb0e3776fde47f22c3fe35b63777d3be75c189f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 20 20:03:02 2010 +0200 Updated Realter 8169 driver. commit b0fdaa6f34b1529951f7aeb5c13d26c10fbd750d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 20 20:02:43 2010 +0200 Updated Realtek 8168 driver. commit 9963abf5d4b639c75b626a1122d8fa1b91fc3a28 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Oct 20 20:02:15 2010 +0200 Updated Realtek r8101 driver. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/41/filelists/realtek | 6 ++++++ config/rootfiles/core/41/update.sh | 4 ++-- lfs/r8101 | 4 ++-- lfs/r8168 | 4 ++-- lfs/r8169 | 4 ++-- 5 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 config/rootfiles/core/41/filelists/realtek Difference in files: diff --git a/config/rootfiles/core/41/filelists/realtek b/config/rootfiles/core/41/filelists/realtek new file mode 100644 index 0000000..1296944 --- /dev/null +++ b/config/rootfiles/core/41/filelists/realtek @@ -0,0 +1,6 @@ +lib/modules/2.6.32.15-ipfire/kernel/drivers/net/r8101.ko +lib/modules/2.6.32.15-ipfire/kernel/drivers/net/r8168.ko +lib/modules/2.6.32.15-ipfire/kernel/drivers/net/r8169.ko +lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/r8101.ko +lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/r8168.ko +lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/r8169.ko diff --git a/config/rootfiles/core/41/update.sh b/config/rootfiles/core/41/update.sh index 72b334b..387dfc3 100644 --- a/config/rootfiles/core/41/update.sh +++ b/config/rootfiles/core/41/update.sh @@ -48,8 +48,8 @@ extract_files perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" #Rebuild module dep's -#depmod 2.6.32.15-ipfire -#depmod 2.6.32.15-ipfire-xen +depmod 2.6.32.15-ipfire +depmod 2.6.32.15-ipfire-xen # #Finish diff --git a/lfs/r8101 b/lfs/r8101 index 252b18f..723c14c 100644 --- a/lfs/r8101 +++ b/lfs/r8101 @@ -30,7 +30,7 @@ else VERSUFIX = ipfire endif -VER = 1.016.00 +VER = 1.019.00 THISAPP = r8101-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -46,7 +46,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 c9792c8..bbe1606 100644 --- a/lfs/r8168 +++ b/lfs/r8168 @@ -30,7 +30,7 @@ else VERSUFIX = ipfire endif -VER = 8.018.00 +VER = 8.019.00 THISAPP = r8168-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -46,7 +46,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 d9cc008..e90bccd 100644 --- a/lfs/r8169 +++ b/lfs/r8169 @@ -30,7 +30,7 @@ else VERSUFIX = ipfire endif -VER = 6.013.00 +VER = 6.014.00 THISAPP = r8169-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5cbf92304fe64345b1838b7664701afa +$(DL_FILE)_MD5 = 0f1a8dffb4774e8f9ac29ae29a0696e3 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 38c982bb77390f53744815eedb877ebeab05ba4b
by git＠ipfire.org 22 Oct '10

22 Oct '10

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 38c982bb77390f53744815eedb877ebeab05ba4b (commit) via cfac7c232c136363dad5b451549394d996cef1b2 (commit) via cfeeb42f7a794d00599929d6bb0e7f46e27b3036 (commit) via bc7fffe693f9c4b8aa26121fa7ff6d7e1e662c0f (commit) via b8efe40c89cb7fc95941b3054e1e6d56437185ad (commit) from c1cd3a8bf8b5e2df4faaaba39b32f7c40bffa638 (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 38c982bb77390f53744815eedb877ebeab05ba4b Merge: c1cd3a8 cfac7c2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 22 20:17:15 2010 +0200 Merge commit 'origin/master' into next Conflicts: src/paks/linux-pae/uninstall.sh ----------------------------------------------------------------------- Summary of changes: lfs/ccache | 8 +++--- make.sh | 5 ++- src/patches/ccache-3.0pre0-no_compiler_mtime.patch | 19 ------------------ src/patches/ccache-3.1-no_compiler_mtime.patch | 21 ++++++++++++++++++++ 4 files changed, 28 insertions(+), 25 deletions(-) delete mode 100644 src/patches/ccache-3.0pre0-no_compiler_mtime.patch create mode 100644 src/patches/ccache-3.1-no_compiler_mtime.patch Difference in files: diff --git a/lfs/ccache b/lfs/ccache index 2fc0c3d..2407320 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -24,13 +24,13 @@ include Config -VER = 3.0pre0 +VER = 3.1 THISAPP = ccache-$(VER) DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP)-pass$(PASS) ############################################################################### # Top-level Rules @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3704f1cd486b1e63638fd17910c42e9f +$(DL_FILE)_MD5 = 7961852e1e36f11559039c32142f58df install : $(TARGET) diff --git a/make.sh b/make.sh index cc2d3c5..a02dadb 100755 --- a/make.sh +++ b/make.sh @@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` GIT_TAG=$(git tag | tail -1) # Git Tag GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit -TOOLCHAINVER=2 +TOOLCHAINVER=1 IPFVER="full" # Which versions should be compiled? (full|devel) # Debian specific settings @@ -231,7 +231,7 @@ buildtoolchain() { ORG_PATH=$PATH NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}` export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1} - lfsmake1 ccache + lfsmake1 ccache PASS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH @@ -243,6 +243,7 @@ buildtoolchain() { lfsmake1 dejagnu lfsmake1 gcc PASS=2 lfsmake1 binutils PASS=2 + lfsmake1 ccache PASS=2 lfsmake1 ncurses lfsmake1 bash lfsmake1 bzip2 diff --git a/src/patches/ccache-3.0pre0-no_compiler_mtime.patch b/src/patches/ccache-3.0pre0-no_compiler_mtime.patch deleted file mode 100644 index 4bdc8d4..0000000 --- a/src/patches/ccache-3.0pre0-no_compiler_mtime.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur ccache-3.0pre0.org/ccache.c ccache-3.0pre0/ccache.c ---- ccache-3.0pre0.org/ccache.c 2010-02-28 21:14:39.000000000 +0100 -+++ ccache-3.0pre0/ccache.c 2010-03-22 08:08:43.000000000 +0100 -@@ -849,12 +849,14 @@ - - compilercheck = getenv("CCACHE_COMPILERCHECK"); - if (!compilercheck) { -- compilercheck = "mtime"; -+ compilercheck = "size"; - } - if (strcmp(compilercheck, "none") == 0) { - /* Do nothing. */ - } else if (strcmp(compilercheck, "content") == 0) { - hash_file(&hash, args->argv[0]); -+ } else if (strcmp(compilercheck, "size") == 0){ -+ hash_int(&hash, st.st_size); - } else { /* mtime */ - hash_int(&hash, st.st_size); - hash_int(&hash, st.st_mtime); diff --git a/src/patches/ccache-3.1-no_compiler_mtime.patch b/src/patches/ccache-3.1-no_compiler_mtime.patch new file mode 100644 index 0000000..fd921cd --- /dev/null +++ b/src/patches/ccache-3.1-no_compiler_mtime.patch @@ -0,0 +1,21 @@ +diff -Naur ccache-3.1.org/ccache.c ccache-3.1/ccache.c +--- ccache-3.1.org/ccache.c 2010-09-16 19:01:09.000000000 +0200 ++++ ccache-3.1/ccache.c 2010-10-21 21:41:08.000000000 +0200 +@@ -805,13 +805,16 @@ + */ + compilercheck = getenv("CCACHE_COMPILERCHECK"); + if (!compilercheck) { +- compilercheck = "mtime"; ++ compilercheck = "size"; + } + if (str_eq(compilercheck, "none")) { + /* Do nothing. */ + } else if (str_eq(compilercheck, "content")) { + hash_delimiter(hash, "cc_content"); + hash_file(hash, args->argv[0]); ++ } else if (str_eq(compilercheck, "size")) { ++ hash_delimiter(hash, "cc_size"); ++ hash_int(hash, st.st_size); + } else if (str_eq(compilercheck, "mtime")) { + hash_delimiter(hash, "cc_mtime"); + hash_int(hash, st.st_size); hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c1cd3a8bf8b5e2df4faaaba39b32f7c40bffa638
by git＠ipfire.org 22 Oct '10

22 Oct '10

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 c1cd3a8bf8b5e2df4faaaba39b32f7c40bffa638 (commit) via 38a76ff405f8b1358181c7dfa2e4b23aca1d9985 (commit) via 077de40a4cefb4cc38c4a9a0b2a477e1102ead93 (commit) via ad306a7a299badacdd8c31bab3511ab9804af8df (commit) via cacb0b4eb94c5c21ab067f4e21f6758d564f8d9a (commit) via 81e02ac0b284171e3388eac8eb420a725f2baab1 (commit) via 3c6ab3d121387d53e3cb02273c38968922d4a272 (commit) from 2165fbb2de31272c652055adff8a0665957f58e9 (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 c1cd3a8bf8b5e2df4faaaba39b32f7c40bffa638 Merge: 2165fbb 38a76ff Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Oct 21 20:43:45 2010 +0200 Merge commit 'origin/master' into next Conflicts: config/rootfiles/core/41/filelists/files src/paks/linux-pae/uninstall.sh ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/bzip2 | 48 +++++++++++++++++++-------------------- lfs/bzip2 | 6 ++-- src/install+setup/setup/main.c | 6 ++-- 3 files changed, 29 insertions(+), 31 deletions(-) Difference in files: diff --git a/config/rootfiles/common/bzip2 b/config/rootfiles/common/bzip2 index 550b9f1..b91b89d 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 4712f31..44fa757 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 diff --git a/src/install+setup/setup/main.c b/src/install+setup/setup/main.c index f0d3604..33cae34 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 */ hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. cfac7c232c136363dad5b451549394d996cef1b2
by git＠ipfire.org 22 Oct '10

22 Oct '10

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, master has been updated via cfac7c232c136363dad5b451549394d996cef1b2 (commit) via cfeeb42f7a794d00599929d6bb0e7f46e27b3036 (commit) from bc7fffe693f9c4b8aa26121fa7ff6d7e1e662c0f (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 cfac7c232c136363dad5b451549394d996cef1b2 Merge: cfeeb42 bc7fffe Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 22 18:15:27 2010 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x commit cfeeb42f7a794d00599929d6bb0e7f46e27b3036 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 22 18:13:46 2010 +0200 Toolchain update. Updated ccache (3.1) and fix ccache bootstrap build. ----------------------------------------------------------------------- Summary of changes: lfs/ccache | 8 +++--- make.sh | 5 ++- src/patches/ccache-3.0pre0-no_compiler_mtime.patch | 19 ------------------ src/patches/ccache-3.1-no_compiler_mtime.patch | 21 ++++++++++++++++++++ 4 files changed, 28 insertions(+), 25 deletions(-) delete mode 100644 src/patches/ccache-3.0pre0-no_compiler_mtime.patch create mode 100644 src/patches/ccache-3.1-no_compiler_mtime.patch Difference in files: diff --git a/lfs/ccache b/lfs/ccache index 2fc0c3d..2407320 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -24,13 +24,13 @@ include Config -VER = 3.0pre0 +VER = 3.1 THISAPP = ccache-$(VER) DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP)-pass$(PASS) ############################################################################### # Top-level Rules @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3704f1cd486b1e63638fd17910c42e9f +$(DL_FILE)_MD5 = 7961852e1e36f11559039c32142f58df install : $(TARGET) diff --git a/make.sh b/make.sh index 166f9ec..d5ec02c 100755 --- a/make.sh +++ b/make.sh @@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` GIT_TAG=$(git tag | tail -1) # Git Tag GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit -TOOLCHAINVER=2 +TOOLCHAINVER=3 IPFVER="full" # Which versions should be compiled? (full|devel) # Debian specific settings @@ -231,7 +231,7 @@ buildtoolchain() { ORG_PATH=$PATH NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}` export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1} - lfsmake1 ccache + lfsmake1 ccache PASS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH @@ -243,6 +243,7 @@ buildtoolchain() { lfsmake1 dejagnu lfsmake1 gcc PASS=2 lfsmake1 binutils PASS=2 + lfsmake1 ccache PASS=2 lfsmake1 ncurses lfsmake1 bash lfsmake1 bzip2 diff --git a/src/patches/ccache-3.0pre0-no_compiler_mtime.patch b/src/patches/ccache-3.0pre0-no_compiler_mtime.patch deleted file mode 100644 index 4bdc8d4..0000000 --- a/src/patches/ccache-3.0pre0-no_compiler_mtime.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur ccache-3.0pre0.org/ccache.c ccache-3.0pre0/ccache.c ---- ccache-3.0pre0.org/ccache.c 2010-02-28 21:14:39.000000000 +0100 -+++ ccache-3.0pre0/ccache.c 2010-03-22 08:08:43.000000000 +0100 -@@ -849,12 +849,14 @@ - - compilercheck = getenv("CCACHE_COMPILERCHECK"); - if (!compilercheck) { -- compilercheck = "mtime"; -+ compilercheck = "size"; - } - if (strcmp(compilercheck, "none") == 0) { - /* Do nothing. */ - } else if (strcmp(compilercheck, "content") == 0) { - hash_file(&hash, args->argv[0]); -+ } else if (strcmp(compilercheck, "size") == 0){ -+ hash_int(&hash, st.st_size); - } else { /* mtime */ - hash_int(&hash, st.st_size); - hash_int(&hash, st.st_mtime); diff --git a/src/patches/ccache-3.1-no_compiler_mtime.patch b/src/patches/ccache-3.1-no_compiler_mtime.patch new file mode 100644 index 0000000..fd921cd --- /dev/null +++ b/src/patches/ccache-3.1-no_compiler_mtime.patch @@ -0,0 +1,21 @@ +diff -Naur ccache-3.1.org/ccache.c ccache-3.1/ccache.c +--- ccache-3.1.org/ccache.c 2010-09-16 19:01:09.000000000 +0200 ++++ ccache-3.1/ccache.c 2010-10-21 21:41:08.000000000 +0200 +@@ -805,13 +805,16 @@ + */ + compilercheck = getenv("CCACHE_COMPILERCHECK"); + if (!compilercheck) { +- compilercheck = "mtime"; ++ compilercheck = "size"; + } + if (str_eq(compilercheck, "none")) { + /* Do nothing. */ + } else if (str_eq(compilercheck, "content")) { + hash_delimiter(hash, "cc_content"); + hash_file(hash, args->argv[0]); ++ } else if (str_eq(compilercheck, "size")) { ++ hash_delimiter(hash, "cc_size"); ++ hash_int(hash, st.st_size); + } else if (str_eq(compilercheck, "mtime")) { + hash_delimiter(hash, "cc_mtime"); + hash_int(hash, st.st_size); hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. fa527c3a549acaf820a534bbb234a570c4891673
by git＠ipfire.org 21 Oct '10

21 Oct '10

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 3.x development tree". The branch, master has been updated via fa527c3a549acaf820a534bbb234a570c4891673 (commit) via aa3b09af5738c5922034febe89cb0004ad3841ec (commit) via 6b829aab9873eeac57f0ddd00859a9fbb0cc247b (commit) via 216ce26296ca9c32df2e1313b843589b1fb81180 (commit) via 3f7d42d5b4ff72866eccd6ce4a4c8d351e2657ce (commit) via b549ea2adcd994a723144443d3d1d29fe10eba0b (commit) via fd44e3b213c97ec93a0c6e1df2b96c7fd5727f3f (commit) via 5c0aa76e18ad4ee26279ba7b643dd8b02f926aa2 (commit) via c6dfe5f3ac8152e14c372cadbfe4521c188de4c0 (commit) via 19390374d3ca2699933119a6c0d9249f59385a66 (commit) via 0f0a1c89a05738cdab11c04cf29b958bf27ecd93 (commit) via 83a1c641c253c11fac63299d134198a9b21b4ec5 (commit) via 75e3819571e794966250fe11c42680f5158ba577 (commit) via 21ad1a3a4d9326bf8c7f43f0e7750c9d21e0bc63 (commit) via b0a5e021e558d62c21376bdba7083682a037a71d (commit) via b50180cc6932c562a5da46d9a202c6ccce63efc1 (commit) via 1cf40216e9451859f0a66faf9a4753c462500622 (commit) via ed269f50648132f414d7ef2d01bb3252130692d7 (commit) from cdd964e9f8907999c9a54b4d15271902d0666064 (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 fa527c3a549acaf820a534bbb234a570c4891673 Merge: b0a5e02 aa3b09a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 22 01:14:14 2010 +0200 Merge branch 'next' commit aa3b09af5738c5922034febe89cb0004ad3841ec Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Oct 20 23:29:22 2010 +0200 pyQt: Update to 4.8-snapshot. commit 6b829aab9873eeac57f0ddd00859a9fbb0cc247b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Oct 20 23:28:33 2010 +0200 sip: Update to 4.11.2-snapshot. commit 216ce26296ca9c32df2e1313b843589b1fb81180 Merge: 75e3819 3f7d42d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 17 22:01:21 2010 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next commit 3f7d42d5b4ff72866eccd6ce4a4c8d351e2657ce Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 17 21:59:24 2010 +0200 pyQt: Forgot to add patch. commit b549ea2adcd994a723144443d3d1d29fe10eba0b Merge: fd44e3b 1939037 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 17 21:12:28 2010 +0200 Merge remote branch 'stevee/qtermwidget' into installer commit fd44e3b213c97ec93a0c6e1df2b96c7fd5727f3f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 17 21:11:52 2010 +0200 pyQt: Update to 4.7.7. commit 5c0aa76e18ad4ee26279ba7b643dd8b02f926aa2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 17 21:11:21 2010 +0200 sip: Update to 4.11.1. commit c6dfe5f3ac8152e14c372cadbfe4521c188de4c0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 17 21:09:58 2010 +0200 qt: Update to 4.7.0. commit 19390374d3ca2699933119a6c0d9249f59385a66 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Oct 17 20:59:46 2010 +0200 python-qtermwidget: New package. commit 0f0a1c89a05738cdab11c04cf29b958bf27ecd93 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Oct 17 20:59:20 2010 +0200 qtermwidget: New package. commit 83a1c641c253c11fac63299d134198a9b21b4ec5 Merge: b50180c 21ad1a3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 17 15:17:32 2010 +0200 Merge remote branch 'stevee/piksemel' into installer commit 75e3819571e794966250fe11c42680f5158ba577 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 17 13:59:10 2010 +0200 wpa_supplicant: New package. Squashed commit of the following: commit e47e489cd63f5e39cc73fc5e62caf22430fa50f6 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sat Oct 16 21:54:38 2010 +0200 wpa_supplicant: Add logrotate file. commit ea3450d635a0437cf2f37c8b19727374df7ce6dc Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sat Oct 16 21:50:26 2010 +0200 wpa_supplicant: Improve build, add system config file. commit 30ce34bdc0cabf1231e482fc30f149b41e60b9d0 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sat Oct 16 21:36:36 2010 +0200 wpa_supplicant: New package. commit 21ad1a3a4d9326bf8c7f43f0e7750c9d21e0bc63 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Oct 17 12:05:10 2010 +0200 python-piksemel: New package. commit b0a5e021e558d62c21376bdba7083682a037a71d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 17 00:47:43 2010 +0200 network: Depends on rstp on runtime. commit b50180cc6932c562a5da46d9a202c6ccce63efc1 Merge: 1cf4021 cdd964e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 16 23:19:39 2010 +0200 Merge branch 'next' into installer commit 1cf40216e9451859f0a66faf9a4753c462500622 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 2 20:26:39 2010 +0200 naoki: Add installer to ISO image. commit ed269f50648132f414d7ef2d01bb3252130692d7 Merge: 3b381d1 9ad440f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 2 14:17:43 2010 +0200 Merge remote branch 'stevee/x-fixes' into installer ----------------------------------------------------------------------- Summary of changes: naoki/generators.py | 12 ++++- pkgs/core/network/network.nm | 6 +- .../patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch | 9 ---- pkgs/core/pyQt/pyQt.nm | 7 ++- .../python-piksemel.nm} | 18 +++++-- .../python-qtermwidget.nm} | 24 ++++----- pkgs/core/qt/qt.nm | 2 +- pkgs/core/qtermwidget/patches/shared.patch | 46 ++++++++++++++++++ .../libcap.nm => qtermwidget/qtermwidget.nm} | 42 ++++++++++------ pkgs/core/sip/patches/disable-rpaths.patch | 10 ++++ pkgs/core/sip/sip.nm | 4 +- pkgs/core/wpa_supplicant/wpa_supplicant.conf | 3 + pkgs/core/wpa_supplicant/wpa_supplicant.config | 33 +++++++++++++ pkgs/core/wpa_supplicant/wpa_supplicant.logrotate | 6 ++ .../wpa_supplicant.nm} | 50 ++++++++++++------- 15 files changed, 201 insertions(+), 71 deletions(-) delete mode 100644 pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch copy pkgs/core/{python-pyaspects/python-pyaspects.nm => python-piksemel/python-piksemel.nm} (83%) copy pkgs/core/{python-pyaspects/python-pyaspects.nm => python-qtermwidget/python-qtermwidget.nm} (80%) create mode 100644 pkgs/core/qtermwidget/patches/shared.patch copy pkgs/core/{libcap/libcap.nm => qtermwidget/qtermwidget.nm} (68%) create mode 100644 pkgs/core/sip/patches/disable-rpaths.patch create mode 100644 pkgs/core/wpa_supplicant/wpa_supplicant.conf create mode 100644 pkgs/core/wpa_supplicant/wpa_supplicant.config create mode 100644 pkgs/core/wpa_supplicant/wpa_supplicant.logrotate copy pkgs/core/{iproute2/iproute2.nm => wpa_supplicant/wpa_supplicant.nm} (58%) Difference in files: diff --git a/naoki/generators.py b/naoki/generators.py index b3f2f01..99b385d 100644 --- a/naoki/generators.py +++ b/naoki/generators.py @@ -42,7 +42,17 @@ class Generator(_Environment): self.installer_deps = dependencies.DependencySet(arch=self.arch) deps = [ "basesystem", - #"installer", + "installer", + # TODO needs to be replaced + "xorg-x11-drv-ati", + "xorg-x11-drv-evdev", + "xorg-x11-drv-intel", + "xorg-x11-drv-keyboard", + "xorg-x11-drv-mouse", + "xorg-x11-drv-nv", + "xorg-x11-drv-synaptics", + "xorg-x11-drv-vesa", + "xorg-x11-drv-vmware", ] for dep in deps: dep = dependencies.Dependency(dep) diff --git a/pkgs/core/network/network.nm b/pkgs/core/network/network.nm index 30cf750..f4c6be5 100644 --- a/pkgs/core/network/network.nm +++ b/pkgs/core/network/network.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = network PKG_VER = 0.99.0 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUP = Networking/Tools @@ -35,8 +35,8 @@ PKG_LICENSE = GPLv3+ PKG_SUMMARY = The IPFire Networking Scripts. PKG_BUILD_DEPS = # Need no gcc -PKG_DEPS += bash bridge-utils coreutils dhcp grep iproute2 ppp sqlite \ - upstart vlan +PKG_DEPS += bash bridge-utils coreutils dhcp grep iproute2 ppp rstp \ + sqlite upstart vlan define PKG_DESCRIPTION This script installs the IPFire Networking Scripts. diff --git a/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch b/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch deleted file mode 100644 index bafa4ec..0000000 --- a/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py.shbang PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py ---- PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py.shbang 2009-06-16 03:37:46.000000000 -0500 -+++ PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py 2009-07-02 14:01:44.218147410 -0500 -@@ -1,3 +1,5 @@ -+#!/usr/bin/python -tt -+ - import sys - import optparse - diff --git a/pkgs/core/pyQt/pyQt.nm b/pkgs/core/pyQt/pyQt.nm index 6a85c02..7e85ead 100644 --- a/pkgs/core/pyQt/pyQt.nm +++ b/pkgs/core/pyQt/pyQt.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = pyQt -PKG_VER = 4.7.4 +PKG_VER = snapshot-4.8-3011e73e866d PKG_REL = 0 PKG_MAINTAINER = @@ -63,3 +63,8 @@ define STAGE_BUILD endef STAGE_INSTALLTARGET += INSTALL_ROOT=$(BUILDROOT) + +define STAGE_INSTALL_CMDS + # Remove python3 port + rm -rfv $(BUILDROOT)/usr/lib/python*/site-packages/PyQt4/uic/port_v3 +endef diff --git a/pkgs/core/python-piksemel/python-piksemel.nm b/pkgs/core/python-piksemel/python-piksemel.nm new file mode 100644 index 0000000..9353af2 --- /dev/null +++ b/pkgs/core/python-piksemel/python-piksemel.nm @@ -0,0 +1,58 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 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 $(PKGROOT)/Include + +PKG_NAME = piksemel +PKG_VER = 1.3.1 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Development/Languages +PKG_URL = http://cekirdek.pardus.org.tr/~bahadir/piksemel/ +PKG_LICENSE = GPLv2+ +PKG_SUMMARY = A python XML parser. + +PKG_BUILD_DEPS+= python-devel + +define PKG_DESCRIPTION + Piksemel is a easy to use python XML parser, based on iksemel. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +define STAGE_BUILD + cd $(DIR_APP) && python setup.py build +endef + +define STAGE_TEST + # Create symlink for testsuite to find the compiled module. + cd $(DIR_APP)/tests && ln -s ../build/lib.*/piksemel.so piksemel.so + cd $(DIR_APP) && python setup.py test +endef + +define STAGE_INSTALL + cd $(DIR_APP) && python setup.py install --root=$(BUILDROOT) +endef + diff --git a/pkgs/core/python-qtermwidget/python-qtermwidget.nm b/pkgs/core/python-qtermwidget/python-qtermwidget.nm new file mode 100644 index 0000000..2e80268 --- /dev/null +++ b/pkgs/core/python-qtermwidget/python-qtermwidget.nm @@ -0,0 +1,50 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 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 $(PKGROOT)/Include + +PKG_NAME = python-qtermwidget +PKG_VER = 0.1.2 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Development/Languages +PKG_URL = http://code.google.com/p/pyqt4-extrawidgets/downloads/list +PKG_LICENSE = GPLv2+ +PKG_SUMMARY = PyQt4 Bindings for QTermWidget. + +PKG_BUILD_DEPS+= gcc-c++ pyQt pyQt-devel python-devel qt qtermwidget-devel sip-devel + +define PKG_DESCRIPTION + PyQt4 Bindings for QTermWidget. +endef + +PKG_TARBALL = qtermwidget-$(PKG_VER).tar.gz + +DIR_APP = $(DIR_SRC)/qtermwidget + +define STAGE_BUILD + cd $(DIR_APP) && python config.py + cd $(DIR_APP) && make +endef diff --git a/pkgs/core/qt/qt.nm b/pkgs/core/qt/qt.nm index d65ea4c..22ad408 100644 --- a/pkgs/core/qt/qt.nm +++ b/pkgs/core/qt/qt.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = qt -PKG_VER = 4.7.0-beta2 +PKG_VER = 4.7.0 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/qtermwidget/patches/shared.patch b/pkgs/core/qtermwidget/patches/shared.patch new file mode 100644 index 0000000..cdef77d --- /dev/null +++ b/pkgs/core/qtermwidget/patches/shared.patch @@ -0,0 +1,46 @@ +Index: qtermwidget/lib/lib.pro +=================================================================== +--- qtermwidget.orig/lib/lib.pro ++++ qtermwidget/lib/lib.pro +@@ -4,7 +4,7 @@ DESTDIR = .. + + TARGET = qtermwidget + +-CONFIG += qt debug_and_release warn_on build_all staticlib #dll ++CONFIG += qt debug_and_release warn_on build_all #dll + + QT += core gui + +@@ -42,7 +42,3 @@ SOURCES = TerminalCharacterDecoder.cpp + Session.cpp ShellCommand.cpp \ + qtermwidget.cpp + +- +- +- +- +\ Dosya sonunda yenisatır yok. +Index: qtermwidget/src/src.pro +=================================================================== +--- qtermwidget.orig/src/src.pro ++++ qtermwidget/src/src.pro +@@ -10,11 +10,11 @@ MOC_DIR = ../.moc + CONFIG(debug, debug|release) { + OBJECTS_DIR = ../.objs_d + TARGET = consoleq_d +- LIBS += -L.. ../libqtermwidget_d.a ++ LIBS += -L.. ../libqtermwidget_d.so + } else { + OBJECTS_DIR = ../.objs + TARGET = consoleq +- LIBS += -L.. ../libqtermwidget.a ++ LIBS += -L.. ../libqtermwidget.so + } + + SOURCES = main.cpp +@@ -24,4 +24,3 @@ INCLUDEPATH = ../lib + #LIBS += -L.. -lqtermwidget + + +- +\ Dosya sonunda yenisatır yok. diff --git a/pkgs/core/qtermwidget/qtermwidget.nm b/pkgs/core/qtermwidget/qtermwidget.nm new file mode 100644 index 0000000..b60718b --- /dev/null +++ b/pkgs/core/qtermwidget/qtermwidget.nm @@ -0,0 +1,70 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 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 $(PKGROOT)/Include + +PKG_NAME = qtermwidget +PKG_VER = 0.1 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = /Tools +PKG_URL = http://qtermwidget.sourceforge.net/ +PKG_LICENSE = GPLv2 +PKG_SUMMARY = A QT4 terminal emulation widget. + +PKG_BUILD_DEPS+= gcc-c++ python-devel qt +PKG_DEPS += + +define PKG_DESCRIPTION + QTermWidget is an opensource project based on KDE4 Konsole \ + application. The main goal of this project is to provide \ + unicode-enabled, embeddable QT4 widget for using as a built-in \ + console (or terminal emulation widget). +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + +DIR_APP = $(DIR_SRC)/$(PKG_NAME) + +define STAGE_BUILD + cd $(DIR_APP) && qmake + + cd $(DIR_APP) && make #$(PARALLELISMFLAGS) +endef + +define STAGE_INSTALL + # Install headers + -mkdir -pv $(BUILDROOT)/usr/include/$(PKG_NAME) + cd $(DIR_APP) && cp -vf lib/*.h $(BUILDROOT)/usr/include/$(PKG_NAME) + + # Install lib + -mkdir -pv $(BUILDROOT)/usr/lib + cd $(DIR_APP) && cp -vf libqtermwidget.so.0 $(BUILDROOT)/usr/lib + ln -svf libqtermwidget.so.0 $(BUILDROOT)/usr/lib/libqtermwidget.so + + # Do not install binaries +endef diff --git a/pkgs/core/sip/patches/disable-rpaths.patch b/pkgs/core/sip/patches/disable-rpaths.patch new file mode 100644 index 0000000..6f15c54 --- /dev/null +++ b/pkgs/core/sip/patches/disable-rpaths.patch @@ -0,0 +1,10 @@ +--- a/siputils.py ++++ b/siputils.py +@@ -737,6 +737,7 @@ class Makefile: + rpaths is the cannonical list of rpaths. + """ + flags = [] ++ return flags + prefix = self.optional_string("RPATH") + + if prefix: diff --git a/pkgs/core/sip/sip.nm b/pkgs/core/sip/sip.nm index ca3ad4e..96a70fb 100644 --- a/pkgs/core/sip/sip.nm +++ b/pkgs/core/sip/sip.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = sip -PKG_VER = 4.10.5 -PKG_REL = 1 +PKG_VER = 4.11.2-snapshot-5167b98767e2 +PKG_REL = 0 PKG_MAINTAINER = PKG_GROUP = Development/Tools diff --git a/pkgs/core/wpa_supplicant/wpa_supplicant.conf b/pkgs/core/wpa_supplicant/wpa_supplicant.conf new file mode 100644 index 0000000..65ad645 --- /dev/null +++ b/pkgs/core/wpa_supplicant/wpa_supplicant.conf @@ -0,0 +1,3 @@ +ctrl_interface=/var/run/wpa_supplicant +ctrl_interface_group=wheel + diff --git a/pkgs/core/wpa_supplicant/wpa_supplicant.config b/pkgs/core/wpa_supplicant/wpa_supplicant.config new file mode 100644 index 0000000..7b83012 --- /dev/null +++ b/pkgs/core/wpa_supplicant/wpa_supplicant.config @@ -0,0 +1,33 @@ +CONFIG_CTRL_IFACE=y +CONFIG_CTRL_IFACE_DBUS=y +//CONFIG_DRIVER_HOSTAP=y +//CONFIG_DRIVER_HERMES=y +//CONFIG_DRIVER_MADWIFI=y +CONFIG_DRIVER_ATMEL=y +CONFIG_DRIVER_WEXT=y +CONFIG_DRIVER_NDISWRAPPER=y +//CONFIG_DRIVER_PRISM54=y +CONFIG_DRIVER_WIRED=y +//CONFIG_DRIVER_BROADCOM=y +//CONFIG_DRIVER_IPW=y +//CONFIG_DRIVER_BSD=y +//CONFIG_DRIVER_NDIS=y +CONFIG_WIRELESS_EXTENSION=y +CONFIG_IEEE8021X_EAPOL=y +CONFIG_EAP_MD5=y +CONFIG_EAP_MSCHAPV2=y +CONFIG_EAP_TLS=y +CONFIG_EAP_PEAP=y +CONFIG_EAP_TTLS=y +CONFIG_EAP_GTC=y +CONFIG_EAP_OTP=y +CONFIG_EAP_SIM=y +CONFIG_EAP_AKA=y +CONFIG_EAP_PSK=y +CONFIG_EAP_PAX=y +CONFIG_EAP_LEAP=y +//CONFIG_PCSC=y +CONFIG_PKCS12=y +CONFIG_SMARTCARD=y +CONFIG_DEBUG_FILE=y + diff --git a/pkgs/core/wpa_supplicant/wpa_supplicant.logrotate b/pkgs/core/wpa_supplicant/wpa_supplicant.logrotate new file mode 100644 index 0000000..bd7ef91 --- /dev/null +++ b/pkgs/core/wpa_supplicant/wpa_supplicant.logrotate @@ -0,0 +1,6 @@ +/var/log/wpa_supplicant.log { + missingok + notifempty + size 30k + create 0600 root root +} diff --git a/pkgs/core/wpa_supplicant/wpa_supplicant.nm b/pkgs/core/wpa_supplicant/wpa_supplicant.nm new file mode 100644 index 0000000..28dcac6 --- /dev/null +++ b/pkgs/core/wpa_supplicant/wpa_supplicant.nm @@ -0,0 +1,72 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 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 $(PKGROOT)/Include + +PKG_NAME = wpa_supplicant +PKG_VER = 0.7.3 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Sytem/Base +PKG_URL = http://hostap.epitest.fi/releases/ +PKG_LICENSE = BSD +PKG_SUMMARY = WPA/WPA2/IEEE 802.1X Supplicant. + +PKG_BUILD_DEPS+= dbus-devel openssl-devel pkg-config + +define PKG_DESCRIPTION + wpa_supplicant is a WPA Supplicant for Linux, BSD and Windows with support \ + for WPA and WPA2 (IEEE 802.11i / RSN). Supplicant is the IEEE 802.1X/WPA \ + component that is used in the client stations. It implements key negotiation \ + with a WPA Authenticator and it controls the roaming and IEEE 802.11 \ + authentication/association of the wlan driver. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +define STAGE_BUILD + # Copy our config file for build + cp $(DIR_SOURCE)/wpa_supplicant.config $(DIR_APP)/wpa_supplicant/.config + + # Build wpa_supplicant + cd $(DIR_APP)/wpa_supplicant && make $(PARALLELISMFLAGS) +endef + +define STAGE_INSTALL + -mkdir -pv $(BUILDROOT)/etc/logrotate.d + -mkdir -pv $(BUILDROOT)/etc/wpa_supplicant + -mkdir -pv $(BUILDROOT)/usr/sbin + + # Install config file + install -D -m 0600 $(DIR_SOURCE)/wpa_supplicant.conf $(BUILDROOT)/etc/wpa_supplicant + + # Install binaries + install -m 0755 $(DIR_APP)/wpa_supplicant/wpa_passphrase $(BUILDROOT)/usr/sbin + install -m 0755 $(DIR_APP)/wpa_supplicant/wpa_cli $(BUILDROOT)/usr/sbin + install -m 0755 $(DIR_APP)/wpa_supplicant/wpa_supplicant $(BUILDROOT)/usr/sbin + + # Install logrotate file + install -D -m 0644 $(DIR_SOURCE)/wpa_supplicant.logrotate $(BUILDROOT)/etc/logrotate.d/wpa_supplicant +endef hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. bc7fffe693f9c4b8aa26121fa7ff6d7e1e662c0f
by git＠ipfire.org 21 Oct '10

21 Oct '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 38a76ff405f8b1358181c7dfa2e4b23aca1d9985
by git＠ipfire.org 21 Oct '10

21 Oct '10

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, master has been updated via 38a76ff405f8b1358181c7dfa2e4b23aca1d9985 (commit) via 077de40a4cefb4cc38c4a9a0b2a477e1102ead93 (commit) from ad306a7a299badacdd8c31bab3511ab9804af8df (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 38a76ff405f8b1358181c7dfa2e4b23aca1d9985 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Oct 21 17:52:25 2010 +0200 Setup: add spanish language file. commit 077de40a4cefb4cc38c4a9a0b2a477e1102ead93 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Oct 21 17:45:31 2010 +0200 Add bzip2 update to core41. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/41/filelists/bzip2 | 1 + config/rootfiles/core/41/filelists/files | 1 + src/install+setup/setup/main.c | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 120000 config/rootfiles/core/41/filelists/bzip2 Difference in files: diff --git a/config/rootfiles/core/41/filelists/bzip2 b/config/rootfiles/core/41/filelists/bzip2 new file mode 120000 index 0000000..03f4ee5 --- /dev/null +++ b/config/rootfiles/core/41/filelists/bzip2 @@ -0,0 +1 @@ +../../../common/bzip2 \ No newline at end of file diff --git a/config/rootfiles/core/41/filelists/files b/config/rootfiles/core/41/filelists/files index c42902f..21a915b 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 f0d3604..33cae34 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 */ hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM