IPFire-SCM October 2010

ipfire-scm@lists.ipfire.org

1 participants
55 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8caf7b64c83ea3641ee66a1e5b35d965ce78f666
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 8caf7b64c83ea3641ee66a1e5b35d965ce78f666 (commit) via 889a288b3639ec726f28b39022a42d38532e18e7 (commit) via 24d109d134465bffb72306e63e97a33d465b0b3c (commit) via c0a0f74012af54902797b07897642d4799d99c25 (commit) via 6fb0e3776fde47f22c3fe35b63777d3be75c189f (commit) via b0fdaa6f34b1529951f7aeb5c13d26c10fbd750d (commit) via 9963abf5d4b639c75b626a1122d8fa1b91fc3a28 (commit) from a398cc21e909a60e582ee65887e17f66e22d3d29 (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 8caf7b64c83ea3641ee66a1e5b35d965ce78f666 Merge: a398cc2 889a288 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Oct 23 13:34:53 2010 +0200 Merge commit 'origin/master' into next Conflicts: src/paks/linux-pae/uninstall.sh ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/cmake | 2 ++ lfs/squidguard | 2 +- 2 files changed, 3 insertions(+), 1 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 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 3.x development tree branch, master, updated. 7f6de0561242fa1f913257ab13a2a227952881ed
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 3.x development tree". The branch, master has been updated via 7f6de0561242fa1f913257ab13a2a227952881ed (commit) via baa8be1ef74fd1e6273858a729c3a853dd1dc04f (commit) via f4a3c8dceb2c14e5dd55337d612ef3b96d78088a (commit) via cc16266577b86b1a3b6af06fd9abb02983135cc6 (commit) via 29b7c49271108dcf434a3b745463fead71233aa3 (commit) from 1b638aac495b4f256930742d6ccf74d2e4b514f4 (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 7f6de0561242fa1f913257ab13a2a227952881ed Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 23 20:19:25 2010 +0200 sqlite: Forgot to commit patches. commit baa8be1ef74fd1e6273858a729c3a853dd1dc04f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 23 20:17:47 2010 +0200 sip: Update to 4.11.2 (stable release). commit f4a3c8dceb2c14e5dd55337d612ef3b96d78088a Author: Stefan Schantl <Stevee(a)ipfire.org> Date: Sat Oct 9 16:15:36 2010 +0200 hplip: Update to 3.10.9. commit cc16266577b86b1a3b6af06fd9abb02983135cc6 Author: Stefan Schantl <Stevee(a)ipfire.org> Date: Sat Oct 9 16:16:28 2010 +0200 fuse: Update to 2.8.5. commit 29b7c49271108dcf434a3b745463fead71233aa3 Author: Stefan Schantl <Stevee(a)ipfire.org> Date: Fri Oct 8 22:54:42 2010 +0200 glib2: Update to 2.25.17. ----------------------------------------------------------------------- Summary of changes: pkgs/core/fuse/fuse.nm | 2 +- pkgs/core/glib2/glib2.nm | 2 +- pkgs/core/hplip/hplip.nm | 2 +- .../hplip/patches/hplip-3.10.2-udev-rules.patch | 17 ------------- .../hplip/patches/hplip-3.10.5-udev-rules.patch | 21 ++++++++++++++++ pkgs/core/sip/patches/fix-linking.patch | 11 ++++++++ pkgs/core/sip/patches/no-strip.patch | 26 ++++++++++++++++++++ pkgs/core/sip/sip.nm | 9 ++++-- pkgs/core/sqlite/patches/sqlite-3.6.12-libdl.patch | 11 ++++++++ 9 files changed, 78 insertions(+), 23 deletions(-) delete mode 100644 pkgs/core/hplip/patches/hplip-3.10.2-udev-rules.patch create mode 100644 pkgs/core/hplip/patches/hplip-3.10.5-udev-rules.patch create mode 100644 pkgs/core/sip/patches/fix-linking.patch create mode 100644 pkgs/core/sip/patches/no-strip.patch create mode 100644 pkgs/core/sqlite/patches/sqlite-3.6.12-libdl.patch Difference in files: diff --git a/pkgs/core/fuse/fuse.nm b/pkgs/core/fuse/fuse.nm index 03a5c41..2ae82e0 100644 --- a/pkgs/core/fuse/fuse.nm +++ b/pkgs/core/fuse/fuse.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = fuse -PKG_VER = 2.8.4 +PKG_VER = 2.8.5 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/glib2/glib2.nm b/pkgs/core/glib2/glib2.nm index bbee6aa..008365c 100644 --- a/pkgs/core/glib2/glib2.nm +++ b/pkgs/core/glib2/glib2.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = glib -PKG_VER = 2.25.11 +PKG_VER = 2.25.17 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/hplip/hplip.nm b/pkgs/core/hplip/hplip.nm index 396f7dc..6b787d9 100644 --- a/pkgs/core/hplip/hplip.nm +++ b/pkgs/core/hplip/hplip.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = hplip -PKG_VER = 3.10.2 +PKG_VER = 3.10.9 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/hplip/patches/hplip-3.10.2-udev-rules.patch b/pkgs/core/hplip/patches/hplip-3.10.2-udev-rules.patch deleted file mode 100644 index 49cb808..0000000 --- a/pkgs/core/hplip/patches/hplip-3.10.2-udev-rules.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.2/data/rules/56-hpmud_support.rules ---- hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules 2010-03-01 11:21:01.049740484 +0000 -+++ hplip-3.10.2/data/rules/56-hpmud_support.rules 2010-03-01 11:21:07.288609454 +0000 -@@ -7,8 +7,9 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul - LABEL="pid_test" - - # Check for LaserJet products (0x03f0xx17). --SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" -+ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p" -+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" - --ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'" -+ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'" - --LABEL="hpmud_rules_end" -\ No newline at end of file -+LABEL="hpmud_rules_end" diff --git a/pkgs/core/hplip/patches/hplip-3.10.5-udev-rules.patch b/pkgs/core/hplip/patches/hplip-3.10.5-udev-rules.patch new file mode 100644 index 0000000..d56fe6c --- /dev/null +++ b/pkgs/core/hplip/patches/hplip-3.10.5-udev-rules.patch @@ -0,0 +1,21 @@ +diff -up hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.5/data/rules/56-hpmud_support.rules +--- hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules 2010-05-13 01:44:22.000000000 +0200 ++++ hplip-3.10.5/data/rules/56-hpmud_support.rules 2010-05-17 16:12:42.000000000 +0200 +@@ -6,10 +6,11 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul + + LABEL="pid_test" + ++ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p" + # Check for LaserJet products (0x03f0xx17). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" + # Check for LaserJet products (0x03f0xx2a). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" +-ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" ++ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'" + +-LABEL="hpmud_rules_end" +\ No newline at end of file ++LABEL="hpmud_rules_end" + diff --git a/pkgs/core/sip/patches/fix-linking.patch b/pkgs/core/sip/patches/fix-linking.patch new file mode 100644 index 0000000..b4a5fae --- /dev/null +++ b/pkgs/core/sip/patches/fix-linking.patch @@ -0,0 +1,11 @@ +--- a/specs/linux-g++ 2009/08/31 11:59:37 1.1 ++++ b/specs/linux-g++ 2009/08/31 12:00:19 +@@ -53,7 +53,7 @@ + QMAKE_LFLAGS = + QMAKE_LFLAGS_RELEASE = + QMAKE_LFLAGS_DEBUG = +-QMAKE_LFLAGS_SHLIB = -shared ++QMAKE_LFLAGS_SHLIB = -shared -lpython2.7 + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = diff --git a/pkgs/core/sip/patches/no-strip.patch b/pkgs/core/sip/patches/no-strip.patch new file mode 100644 index 0000000..033b54f --- /dev/null +++ b/pkgs/core/sip/patches/no-strip.patch @@ -0,0 +1,26 @@ +Index: sip-4.8.2/specs/linux-g++ +=================================================================== +--- sip-4.8.2.orig/specs/linux-g++ ++++ sip-4.8.2/specs/linux-g++ +@@ -83,7 +83,7 @@ QMAKE_COPY_DIR = $(COPY) -r + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip ++QMAKE_STRIP = + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p +Index: sip-4.8.2/specs/linux-lsb +=================================================================== +--- sip-4.8.2.orig/specs/linux-lsb ++++ sip-4.8.2/specs/linux-lsb +@@ -83,7 +83,7 @@ QMAKE_COPY_DIR = $(COPY) -r + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip ++QMAKE_STRIP = + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p diff --git a/pkgs/core/sip/sip.nm b/pkgs/core/sip/sip.nm index 96a70fb..3b3ac15 100644 --- a/pkgs/core/sip/sip.nm +++ b/pkgs/core/sip/sip.nm @@ -25,8 +25,9 @@ include $(PKGROOT)/Include PKG_NAME = sip -PKG_VER = 4.11.2-snapshot-5167b98767e2 -PKG_REL = 0 +PKG_VER = 4.11.2 +PKG_REL = 1 +PKG_EPOCH = 1 PKG_MAINTAINER = PKG_GROUP = Development/Tools @@ -51,7 +52,9 @@ PKG_DEPS-$(PKG_NAME_REAL)-devel = sip define STAGE_BUILD cd $(DIR_APP) && python configure.py \ - CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" + CFLAGS+="$(CFLAGS)" CXXFLAGS+="$(CXXFLAGS)" cd $(DIR_APP) && make $(PARALLELISMFLAGS) endef + +PKG_FILES-$(PKG_NAME)-devel += /usr/bin/sip diff --git a/pkgs/core/sqlite/patches/sqlite-3.6.12-libdl.patch b/pkgs/core/sqlite/patches/sqlite-3.6.12-libdl.patch new file mode 100644 index 0000000..4d2c272 --- /dev/null +++ b/pkgs/core/sqlite/patches/sqlite-3.6.12-libdl.patch @@ -0,0 +1,11 @@ +diff -up sqlite-3.6.4/configure.ac.orig sqlite-3.6.4/configure.ac +--- sqlite-3.6.4/configure.ac.orig 2008-11-08 11:37:15.000000000 +0200 ++++ sqlite-3.6.4/configure.ac 2008-11-08 11:35:50.000000000 +0200 +@@ -606,6 +606,7 @@ AC_ARG_ENABLE(load-extension, AC_HELP_ST + [use_loadextension=$enableval],[use_loadextension=no]) + if test "${use_loadextension}" = "yes" ; then + OPT_FEATURE_FLAGS="" ++ AC_SEARCH_LIBS(dlopen, [dl]) + else + OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" + fi hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1b638aac495b4f256930742d6ccf74d2e4b514f4
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 3.x development tree". The branch, master has been updated via 1b638aac495b4f256930742d6ccf74d2e4b514f4 (commit) via 8dd3645366cdb4b530c2deecfa01f42373005e8d (commit) via 4e28f667bf9048e209b91b8c61106e0892a47d55 (commit) via 3b9fde50f0231f5d65d0cbb1eda4f96706afe447 (commit) via ff39b55bc1f900385865eb20cbb8005117d32e13 (commit) via 73a7ee3d49fdb9c0ddf13713060886feec668fae (commit) via 4bc1522088ceb29d6b5d28e14fa507baeb4b4234 (commit) via 64ae1f141d067cea8d706a4f3537f4d78032ebb7 (commit) via 7c9a52d59765a30120d26b3e84561f22fc30f7e1 (commit) via 839b4e22a444d73185a6e50a934a66ca5e487533 (commit) via 13da499558349006466dd87121ade6617494ee05 (commit) via f2226b55d0a956932d524593912bbeb580e908bc (commit) via 2cef88078552f91a7cca73f6f049235d8373a39d (commit) via 6ffdb2b8861a3c7fb398d0da9821d2bacfd239ea (commit) via e386259d3faf3b0dbefc90f8d9cd7e31fcda1c18 (commit) via a066b0a36dedc4a34c2e878127647b3b716a9af4 (commit) via e3e891c5d4eda67d7d265a8bd8460842c6088efc (commit) via 62b3c3129f0d7b589a9974fdd19f07340cb3ac10 (commit) via 1641689267cbb51e3e1726387d765529c3ecef14 (commit) from fa527c3a549acaf820a534bbb234a570c4891673 (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 1b638aac495b4f256930742d6ccf74d2e4b514f4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 23 17:13:22 2010 +0200 generator: Copy kernel modules so we can omit the kernel itself and dracut. The LiveOS carries way to much things around nobody needs :D commit 8dd3645366cdb4b530c2deecfa01f42373005e8d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 23 17:06:40 2010 +0200 squashfs-tools: Add dependency to libgcc_s.so.1. Otherwise mksquashfs failed saying: libgcc_s.so.1 must be installed for pthread_cancel to work commit 4e28f667bf9048e209b91b8c61106e0892a47d55 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sat Oct 23 13:35:44 2010 +0200 qt: Move *.pcl files to development package. commit 3b9fde50f0231f5d65d0cbb1eda4f96706afe447 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 23 15:10:52 2010 +0200 xen: Remove ldconfig hack. This is covered by naoki, now. commit ff39b55bc1f900385865eb20cbb8005117d32e13 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 23 15:03:48 2010 +0200 naoki: Run ldconfig before building. commit 73a7ee3d49fdb9c0ddf13713060886feec668fae Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 23 15:03:24 2010 +0200 glibc: Repackage (because auf *_nonshared.a). commit 4bc1522088ceb29d6b5d28e14fa507baeb4b4234 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 23 15:02:51 2010 +0200 naoki: Package all /usr/lib/*.a into devel packages. commit 64ae1f141d067cea8d706a4f3537f4d78032ebb7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 23 14:32:01 2010 +0200 basesystem: Drop dependency to kernel. commit 7c9a52d59765a30120d26b3e84561f22fc30f7e1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 23 14:04:36 2010 +0200 python-dbus: Pack headers into development package. commit 839b4e22a444d73185a6e50a934a66ca5e487533 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Oct 6 14:18:10 2010 +0200 swig: New package. commit 13da499558349006466dd87121ade6617494ee05 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 23 13:37:20 2010 +0200 dhcp: Remove unuseable header files. commit f2226b55d0a956932d524593912bbeb580e908bc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 23 13:21:20 2010 +0200 pyQt: Buildfix since split of qt package. commit 2cef88078552f91a7cca73f6f049235d8373a39d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 23 13:20:57 2010 +0200 glibc: Remove /sbin/sln. Unneeded binary. commit 6ffdb2b8861a3c7fb398d0da9821d2bacfd239ea Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 23 11:17:25 2010 +0200 qt: Split into several packages. Squashed commit of the following: commit 8a0cfa01a56c219cc22e2f83ee5b4d69b7d304c8 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sat Oct 23 00:58:53 2010 +0200 qt: Increase release number. commit d60891bd439690d64cddfb43b4fba32b1bcce169 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sat Oct 23 00:57:38 2010 +0200 qt: Add support for libmng, finish improvement of NM. commit 7f673740d452c528d3d5dd3ad39cb5b9f7abfb33 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sat Oct 23 00:37:33 2010 +0200 qt: Improve NM, also build development package. commit e386259d3faf3b0dbefc90f8d9cd7e31fcda1c18 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sat Oct 23 00:24:30 2010 +0200 libmng: New package. commit a066b0a36dedc4a34c2e878127647b3b716a9af4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 23 00:39:38 2010 +0200 pyQt: Update to 4.8 (stable release). commit e3e891c5d4eda67d7d265a8bd8460842c6088efc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 23 00:01:05 2010 +0200 sqlite: Update to 3.7.3. commit 62b3c3129f0d7b589a9974fdd19f07340cb3ac10 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 22 23:53:19 2010 +0200 elfutils: Re-package libs correctly. commit 1641689267cbb51e3e1726387d765529c3ecef14 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Oct 22 20:00:42 2010 +0200 ccache: Update to 3.1. ----------------------------------------------------------------------- Summary of changes: pkgs/Functions | 8 ++ pkgs/Templates | 1 + pkgs/core/basesystem/basesystem.nm | 4 +- pkgs/core/ccache/ccache.nm | 13 ++- pkgs/core/dhcp/dhcp.nm | 6 +- pkgs/core/elfutils/elfutils.nm | 7 ++- pkgs/core/glibc/glibc.nm | 5 +- pkgs/core/{gnutls/gnutls.nm => libmng/libmng.nm} | 29 ++++--- pkgs/core/pyQt/pyQt.nm | 5 +- pkgs/core/python-dbus/python-dbus.nm | 6 +- pkgs/core/qt/qt.nm | 86 +++++++++++++------- pkgs/core/sqlite/sqlite.nm | 31 ++++---- pkgs/core/squashfs-tools/squashfs-tools.nm | 6 +- pkgs/core/swig/patches/swig-1.3.23-pylib.patch | 29 +++++++ pkgs/core/swig/patches/swig200-rh623854.patch | 92 ++++++++++++++++++++++ pkgs/core/{man-db/man-db.nm => swig/swig.nm} | 38 ++++----- pkgs/core/xen/xen.nm | 4 - tools/generator | 6 +- 18 files changed, 279 insertions(+), 97 deletions(-) copy pkgs/core/{gnutls/gnutls.nm => libmng/libmng.nm} (78%) create mode 100644 pkgs/core/swig/patches/swig-1.3.23-pylib.patch create mode 100644 pkgs/core/swig/patches/swig200-rh623854.patch copy pkgs/core/{man-db/man-db.nm => swig/swig.nm} (70%) Difference in files: diff --git a/pkgs/Functions b/pkgs/Functions index ff64af3..42cfa80 100644 --- a/pkgs/Functions +++ b/pkgs/Functions @@ -12,6 +12,11 @@ DO_PACKAGE_FILENAME = $(1)$(call DO_PKG_SUFFIX,$(1)) DO_PKG_SUFFIX = \ -$(if $(PKG_VER-$(1)),$(PKG_VER-$(1)),$(PKG_VER))-$(DISTRO_SNAME)$(DISTRO_EPOCH)-$(PKG_ARCH).$(if $(PKG_REL-$(1)),$(PKG_REL-$(1)),$(PKG_REL)).ipk +define DO_INIT + # Run ldconfig + ldconfig +endef + define DO_PACKAGE @echo "#####################################################################" @echo "# $(1) - Package build started" @@ -75,6 +80,9 @@ define DO_FIX_LIBTOOL endef define DO_PREPARE + # Initialize the environment at the beginning + $(DO_INIT) + @echo "#####################################################################" @echo "# $(PKG_NAME) - Preparation started" @echo "#####################################################################" diff --git a/pkgs/Templates b/pkgs/Templates index a1a921e..f1cba10 100644 --- a/pkgs/Templates +++ b/pkgs/Templates @@ -27,6 +27,7 @@ PKG_DEPS-$(PKG_NAME_REAL)-devel = $(PKG_NAME_REAL)=$(THISVER) \ define PKG_FILES-$(PKG_NAME_REAL)-devel /usr/bin/*-config /usr/include + /usr/lib/*.a /usr/lib/pkgconfig /usr/share/aclocal */lib/*.so diff --git a/pkgs/core/basesystem/basesystem.nm b/pkgs/core/basesystem/basesystem.nm index 75562bf..9331aa1 100644 --- a/pkgs/core/basesystem/basesystem.nm +++ b/pkgs/core/basesystem/basesystem.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = basesystem -PKG_VER = +PKG_VER = $(DISTRO_VERSION) PKG_REL = 0 PKG_MAINTAINER = @@ -39,7 +39,7 @@ PKG_BUILD_DEPS = # There are no build dependencies # This is a package that pulls lots of other dependencies to always have a # useable system. PKG_DEPS += /bin/sh /sbin/init \ - coreutils file findutils gawk grep iana-etc initscripts kbd kernel less \ + coreutils file findutils gawk grep iana-etc initscripts kbd less \ module-init-tools network pakfire passwd procps psmisc sed shadow \ system-release tar udev util-linux-ng vim diff --git a/pkgs/core/ccache/ccache.nm b/pkgs/core/ccache/ccache.nm index e8a8768..80167d4 100644 --- a/pkgs/core/ccache/ccache.nm +++ b/pkgs/core/ccache/ccache.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = ccache -PKG_VER = 3.0.1 +PKG_VER = 3.1 PKG_REL = 0 PKG_MAINTAINER = @@ -34,7 +34,7 @@ PKG_URL = http://ccache.samba.org/ PKG_LICENSE = GPLv2+ PKG_SUMMARY = C/C++ compiler cache. -PKG_DEPS += zlib +PKG_BUILD_DEPS+= zlib-devel define PKG_DESCRIPTION ccache is a compiler cache. It acts as a caching pre-processor to \ @@ -43,13 +43,18 @@ define PKG_DESCRIPTION a 5 to 10 times speedup in common compilations. endef -PKG_TARBALL = $(THISAPP).tar.gz +PKG_TARBALL = $(THISAPP).tar.xz # Sets ccache max size up to 2 GB CFLAGS += -DDEFAULT_MAXSIZE=2097152 CONFIGURE_OPTIONS += \ - --mandir=/usr/share + --mandir=/usr/share/man + +define STAGE_PREPARE_CMDS + # Disable pch test that fails + cd $(DIR_APP) && sed -e "s/^pch_suite.*/& return 0/" -i test.sh +endef define STAGE_TEST cd $(DIR_APP) && make check diff --git a/pkgs/core/dhcp/dhcp.nm b/pkgs/core/dhcp/dhcp.nm index 008c9ad..e575b33 100644 --- a/pkgs/core/dhcp/dhcp.nm +++ b/pkgs/core/dhcp/dhcp.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = dhcp PKG_VER = 4.1.1 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = Networking/Daemons @@ -63,4 +63,8 @@ define STAGE_INSTALL_CMDS install -v -m 755 $(DIR_SOURCE)/dhclient-script \ $(BUILDROOT)/sbin/dhclient-script -mkdir -pv $(BUILDROOT)/var/lib/dhclient + + # Remove header files. + # There is nothing that makes use out of them. + rm -rfv $(BUILDROOT)/usr/include endef diff --git a/pkgs/core/elfutils/elfutils.nm b/pkgs/core/elfutils/elfutils.nm index 0063693..0d7f748 100644 --- a/pkgs/core/elfutils/elfutils.nm +++ b/pkgs/core/elfutils/elfutils.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = elfutils PKG_VER = 0.145 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUP = Development/Libraries @@ -61,3 +61,8 @@ endef #define STAGE_TEST # cd $(DIR_APP) && make check #endef + +# Libs are not versioned very well... +PKG_FILES-$(PKG_NAME_REAL)-libs += \ + /usr/lib/lib*$(PKG_VER).so \ + /usr/lib/elfutils diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm index bc5ad53..4bbaacd 100644 --- a/pkgs/core/glibc/glibc.nm +++ b/pkgs/core/glibc/glibc.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = glibc PKG_VER = 2.12.1 -PKG_REL = 0 +PKG_REL = 2 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUP = System/Base @@ -278,4 +278,7 @@ define STAGE_INSTALL # Configuration cp -vf $(DIR_SOURCE)/{ld.so.conf,nsswitch.conf} $(BUILDROOT)/etc -mkdir -pv $(BUILDROOT)/etc/ld.so.conf.d + + # Remove unused binaries + rm -vf $(BUILDROOT)/sbin/sln endef diff --git a/pkgs/core/libmng/libmng.nm b/pkgs/core/libmng/libmng.nm new file mode 100644 index 0000000..3709703 --- /dev/null +++ b/pkgs/core/libmng/libmng.nm @@ -0,0 +1,57 @@ +############################################################################### +# # +# 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 = libmng +PKG_VER = 1.0.10 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = System/Libraries +PKG_URL = http://www.libmng.org +PKG_LICENSE = zlib +PKG_SUMMARY = Library for Multiple-image Network Graphics support. + +PKG_BUILD_DEPS+= autoconf automake libjpeg-devel libtool zlib-devel + +define PKG_DESCRIPTION + LibMNG is a library for accessing graphics in MNG (Multi-image Network \ + Graphics) and JNG (JPEG Network Graphics) formats. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +PKG_PACKAGES += $(PKG_NAME)-devel + +CONFIGURE_OPTIONS += \ + --enable-shared \ + --disable-static \ + --with-zlib \ + --with-jpeg \ + --with-gnu-ld + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && unmaintained/autogen.sh +endef diff --git a/pkgs/core/pyQt/pyQt.nm b/pkgs/core/pyQt/pyQt.nm index 7e85ead..b885b92 100644 --- a/pkgs/core/pyQt/pyQt.nm +++ b/pkgs/core/pyQt/pyQt.nm @@ -25,8 +25,9 @@ include $(PKGROOT)/Include PKG_NAME = pyQt -PKG_VER = snapshot-4.8-3011e73e866d +PKG_VER = 4.8 PKG_REL = 0 +PKG_EPOCH = 1 PKG_MAINTAINER = PKG_GROUP = Development/Languages @@ -34,7 +35,7 @@ PKG_URL = http://www.riverbankcomputing.com/software/pyqt/ PKG_LICENSE = GPLv3 or GPLv2 with exceptions PKG_SUMMARY = Python bindings for Qt4. -PKG_BUILD_DEPS+= gcc-c++ libXext-devel python-devel qt sip-devel +PKG_BUILD_DEPS+= gcc-c++ libXext-devel python-devel qt-devel sip-devel PKG_DEPS += sip define PKG_DESCRIPTION diff --git a/pkgs/core/python-dbus/python-dbus.nm b/pkgs/core/python-dbus/python-dbus.nm index 2df7e78..f777ce9 100644 --- a/pkgs/core/python-dbus/python-dbus.nm +++ b/pkgs/core/python-dbus/python-dbus.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = dbus-python PKG_VER = 0.82.4 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Libraries @@ -34,7 +34,7 @@ PKG_URL = http://www.freedesktop.org/software/dbus/ PKG_LICENSE = MIT PKG_SUMMARY = Dbus Python Bindings. -PKG_BUILD_DEPS+= dbus-glib-devel pkg-config python +PKG_BUILD_DEPS+= dbus-glib-devel pkg-config python-devel define PKG_DESCRIPTION D-Bus python bindings for use with python programs. @@ -42,5 +42,7 @@ endef PKG_TARBALL = $(THISAPP).tar.gz +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + CONFIGURE_OPTIONS += \ --mandir=/usr/share/man diff --git a/pkgs/core/qt/qt.nm b/pkgs/core/qt/qt.nm index 22ad408..1629bdc 100644 --- a/pkgs/core/qt/qt.nm +++ b/pkgs/core/qt/qt.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = qt PKG_VER = 4.7.0 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Libraries @@ -34,10 +34,20 @@ PKG_URL = http://www.qtsoftware.com/ PKG_LICENSE = LGPLv2 with exceptions or GPLv3 with exceptions PKG_SUMMARY = Qt toolkit. -PKG_BUILD_DEPS+= fontconfig-devel gcc-c++ libjpeg-devel libpng-devel \ - libtiff-devel libX11-devel libXext-devel pcre-devel pkg-config \ +PKG_PACKAGES += $(PKG_NAME_REAL)-devel +PKG_FILES-$(PKG_NAME_REAL)-devel += \ + /usr/lib/*.prl \ + /usr/lib/qt4/q3porting.xml \ + /usr/bin \ + /usr/lib/qt4/*.prl \ + /usr/lib/qt4/mkspecs + +PKG_BUILD_DEPS+= fontconfig-devel gcc-c++ libjpeg-devel libmng-devel \ + libpng-devel libtiff-devel libX11-devel libXext-devel libXfixes-devel \ + libXrandr-devel libXrender-devel libXi-devel pcre-devel pkg-config \ xorg-x11-proto-devel zlib-devel + define PKG_DESCRIPTION Qt is a software toolkit for developing applications. endef @@ -46,55 +56,66 @@ PKG_TARBALL = $(PKG_NAME)-everywhere-opensource-src-$(PKG_VER).tar.gz CONFIGURE_OPTIONS = -v \ -prefix /usr \ + -datadir /usr/lib/qt4 \ + -headerdir /usr/include \ + -plugindir /usr/lib/qt4/plugins \ + -translationdir /usr/share/qt4/translations \ -confirm-license \ - -opensource \ - -optimized-qmake \ - -shared \ - -release \ + -fontconfig \ -largefile \ + -opensource \ -reduce-relocations \ - -openssl-linked \ - -fontconfig \ - -no-rpath \ - -no-pch \ - -no-qt3support \ - -no-multimedia \ + -release \ + -shared \ -no-audio-backend \ - -no-phonon \ - -no-phonon-backend \ - -no-svg \ - -no-javascript-jit \ - -no-cups \ + -no-dbus \ -no-gtkstyle \ + -no-cups \ + -no-javascript-jit \ + -no-multimedia \ -no-nas-sound \ + -no-nis \ + -no-openssl \ -no-opengl \ -no-openvg \ - -no-xinerama \ + -no-qt3support \ + -no-pch \ + -no-phonon \ + -no-phonon-backend \ + -no-rpath \ + -no-script \ + -no-scripttools \ + -no-separate-debug-info \ + -no-sm \ + -no-sql-db2 \ + -no-sql-ibase \ -no-sql-mysql \ + -no-sql-oci \ -no-sql-odbc \ + -no-sql-psql \ -no-sql-sqlite \ + -no-sql-sqlite2 \ + -no-sql-sqlite_symbian \ -no-sql-tds \ + -no-stl \ + -no-svg \ -no-webkit \ - -no-script\ - -no-scripttools \ - -no-gif \ - -no-libmng \ - -no-separate-debug-info \ - -no-sm \ + -no-xinerama \ -no-xshape \ - -no-xvideo \ -no-xsync \ + -no-xvideo \ -no-mmx \ -no-sse \ -no-sse2 \ -no-3dnow \ - -system-libpng \ -system-libjpeg \ + -system-libmng \ + -system-libpng \ -system-libtiff \ -system-zlib \ -nomake demos \ - -nomake examples \ - -nomake docs + -nomake docs \ + -nomake examples DIR_APP = $(DIR_SRC)/$(PKG_NAME)-everywhere-opensource-src-$(PKG_VER) @@ -104,4 +125,11 @@ endef define STAGE_INSTALL cd $(DIR_APP) && make install INSTALL_ROOT=$(BUILDROOT) + + # Remove libs for Qt designer + rm -rvf $(BUILDROOT)/usr/lib/libQtDesigner* + + # Remove translations for Qt assistant and designer + rm -rvf $(BUILDROOT)/usr/share/qt4/translations/assistant* + rm -rvf $(BUILDROOT)/usr/share/qt4/translations/designer* endef diff --git a/pkgs/core/sqlite/sqlite.nm b/pkgs/core/sqlite/sqlite.nm index 0454942..180e72b 100644 --- a/pkgs/core/sqlite/sqlite.nm +++ b/pkgs/core/sqlite/sqlite.nm @@ -24,8 +24,11 @@ include $(PKGROOT)/Include +# XXX need to fix rpath +QUALITY_AGENT_WHITELIST_RPATH = /usr/lib + PKG_NAME = sqlite -PKG_VER = 3.5.2 +PKG_VER = 3.7.3 PKG_REL = 0 PKG_MAINTAINER = @@ -34,7 +37,7 @@ PKG_URL = http://www.sqlite.org/ PKG_LICENSE = PublicDomain PKG_SUMMARY = A small an versative Database, that uses simple text files. -PKG_BUILD_DEPS+= readline-devel +PKG_BUILD_DEPS+= autoconf automake libtool ncurses-devel readline-devel tcl define PKG_DESCRIPTION SQLite is a in-process library that implements a self-contained, \ @@ -49,20 +52,16 @@ PKG_TARBALL = $(THISAPP).tar.gz PKG_PACKAGES += $(PKG_NAME)-devel -define STAGE_PREPARE_CMDS - -mkdir -pv $(DIR_SRC)/sqlite-build -endef - -define STAGE_BUILD - cd $(DIR_SRC)/sqlite-build && \ - $(DIR_APP)/configure \ - --prefix=/usr \ - --enable-threadsafe \ - --disable-tcl +CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 \ + -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_SECURE_DELETE=1 \ + -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -fno-strict-aliasing - cd $(DIR_SRC)/sqlite-build && make $(PARALLELISMFLAGS) -endef +CONFIGURE_OPTIONS += \ + --enable-threadsafe \ + --enable-threads-override-locks \ + --enable-load-extension \ + --disable-tcl -define STAGE_INSTALL - cd $(DIR_SRC)/sqlite-build && make install DESTDIR=$(BUILDROOT) +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && autoreconf -vfi endef diff --git a/pkgs/core/squashfs-tools/squashfs-tools.nm b/pkgs/core/squashfs-tools/squashfs-tools.nm index 4ee5297..cae0e46 100644 --- a/pkgs/core/squashfs-tools/squashfs-tools.nm +++ b/pkgs/core/squashfs-tools/squashfs-tools.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = squashfs-tools PKG_VER = 4.1 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUP = System/Filesystem @@ -36,6 +36,10 @@ PKG_SUMMARY = Utility for the creation of squashfs filesystems. PKG_BUILD_DEPS+= libattr-devel xz-devel zlib-devel +# XXX This package has a very weird dependency to libgcc_s.so.1. +# Can we fix this in a non-hacky way? +PKG_DEPS += libgcc_s.so.1 + define PKG_DESCRIPTION Squashfs is a highly compressed read-only filesystem for Linux. endef diff --git a/pkgs/core/swig/patches/swig-1.3.23-pylib.patch b/pkgs/core/swig/patches/swig-1.3.23-pylib.patch new file mode 100644 index 0000000..85fa1e3 --- /dev/null +++ b/pkgs/core/swig/patches/swig-1.3.23-pylib.patch @@ -0,0 +1,29 @@ +--- SWIG-1.3.23/configure.in.pylib 2004-11-02 00:45:57.000000000 +0100 ++++ SWIG-1.3.23/configure.in 2004-11-23 12:20:12.552926982 +0100 +@@ -574,9 +574,11 @@ + + # Set the include directory + ++ PYLIB=`$PYTHON -c "import sys; print sys.path[[1]]"` ++ + AC_MSG_CHECKING(for Python header files) + if test -r $PYPREFIX/include/$PYVERSION/Python.h; then +- PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/$PYLIBDIR/$PYVERSION/config" ++ PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYLIB/config" + fi + if test -z "$PYINCLUDE"; then + if test -r $PYPREFIX/include/Py/Python.h; then +@@ -587,13 +589,6 @@ + + # Set the library directory blindly. This probably won't work with older versions + AC_MSG_CHECKING(for Python library) +- dirs="$PYVERSION/config $PYVERSION/$PYLIBDIR python/$PYLIBDIR" +- for i in $dirs; do +- if test -d $PYEPREFIX/$PYLIBDIR/$i; then +- PYLIB="$PYEPREFIX/$PYLIBDIR/$i" +- break +- fi +- done + if test -z "$PYLIB"; then + AC_MSG_RESULT(Not found) + else diff --git a/pkgs/core/swig/patches/swig200-rh623854.patch b/pkgs/core/swig/patches/swig200-rh623854.patch new file mode 100644 index 0000000..5665252 --- /dev/null +++ b/pkgs/core/swig/patches/swig200-rh623854.patch @@ -0,0 +1,92 @@ +diff -up swig-2.0.0/Lib/python/pyrun.swg.rh623854 swig-2.0.0/Lib/python/pyrun.swg +--- swig-2.0.0/Lib/python/pyrun.swg.rh623854 2010-02-28 00:26:02.000000000 +0100 ++++ swig-2.0.0/Lib/python/pyrun.swg 2010-08-17 16:32:16.581604656 +0200 +@@ -45,8 +45,18 @@ + #define SWIG_SetErrorMsg SWIG_Python_SetErrorMsg + #define SWIG_ErrorType(code) SWIG_Python_ErrorType(code) + #define SWIG_Error(code, msg) SWIG_Python_SetErrorMsg(SWIG_ErrorType(code), msg) +-#define SWIG_fail goto fail ++#define SWIG_fail goto fail + ++/* ++ * Python 2.7 and newer and Python 3.1 and newer should use Capsules API instead of ++ * CObjects API. ++ */ ++#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 6) || \ ++ (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 0)) ++#define USE_CAPSULES ++#define TYPE_POINTER_NAME \ ++ ((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME) ++#endif + + /* Runtime API implementation */ + +@@ -1356,8 +1366,12 @@ SWIG_Python_GetModule(void) { + #ifdef SWIG_LINK_RUNTIME + type_pointer = SWIG_ReturnGlobalTypeList((void *)0); + #else ++#ifdef USE_CAPSULES ++ type_pointer = PyCapsule_Import(TYPE_POINTER_NAME, 0); ++#else + type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, + (char*)"type_pointer" SWIG_TYPE_TABLE_NAME); ++#endif + if (PyErr_Occurred()) { + PyErr_Clear(); + type_pointer = (void *)0; +@@ -1402,9 +1416,14 @@ PyModule_AddObject(PyObject *m, char *na + SWIGRUNTIME void + SWIG_Python_DestroyModule(void *vptr) + { ++ size_t i; ++#ifdef USE_CAPSULES ++ swig_module_info *swig_module = ++ (swig_module_info *) PyCapsule_GetPointer((PyObject *)vptr, TYPE_POINTER_NAME); ++#else + swig_module_info *swig_module = (swig_module_info *) vptr; ++#endif + swig_type_info **types = swig_module->types; +- size_t i; + for (i =0; i < swig_module->size; ++i) { + swig_type_info *ty = types[i]; + if (ty->owndata) { +@@ -1426,9 +1445,18 @@ SWIG_Python_SetModule(swig_module_info * + PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION, + swig_empty_runtime_method_table); + #endif ++#ifdef USE_CAPSULES ++ PyObject *pointer = PyCapsule_New((void *)swig_module, TYPE_POINTER_NAME, ++ (PyCapsule_Destructor)SWIG_Python_DestroyModule); ++#else + PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule); ++#endif + if (pointer && module) { ++#ifdef USE_CAPSULES ++ PyModule_AddObject(module, (char*)"type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer); ++#else + PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer); ++#endif + } else { + Py_XDECREF(pointer); + } +@@ -1449,12 +1477,20 @@ SWIG_Python_TypeQuery(const char *type) + PyObject *obj = PyDict_GetItem(cache, key); + swig_type_info *descriptor; + if (obj) { ++#ifdef USE_CAPSULES ++ descriptor = (swig_type_info *) PyCapsule_GetPointer(obj, type); ++#else + descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj); ++#endif + } else { + swig_module_info *swig_module = SWIG_Python_GetModule(); + descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type); + if (descriptor) { ++#ifdef USE_CAPSULES ++ obj = PyCapsule_New(descriptor, type, NULL); ++#else + obj = PyCObject_FromVoidPtr(descriptor, NULL); ++#endif + PyDict_SetItem(cache, key, obj); + Py_DECREF(obj); + } diff --git a/pkgs/core/swig/swig.nm b/pkgs/core/swig/swig.nm new file mode 100644 index 0000000..8f0d3aa --- /dev/null +++ b/pkgs/core/swig/swig.nm @@ -0,0 +1,57 @@ +############################################################################### +# # +# 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 = swig +PKG_VER = 2.0.1 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Development/Tools +PKG_URL = http://swig.sourceforge.net/ +PKG_LICENSE = GPLv3+ and BSD +PKG_SUMMARY = Connects C/C++/Objective C to some high-level programming \ + languages. + +PKG_BUILD_DEPS+= autoconf automake gcc-c++ pcre-devel perl python-devel + +define PKG_DESCRIPTION + Simplified Wrapper and Interface Generator (SWIG) is a software \ + development tool for connecting C, C++ and Objective C programs with a \ + variety of high-level programming languages. SWIG is primarily used \ + with Perl, Python and Tcl/TK, but it has also been extended to Java, \ + Eiffel and Guile. SWIG is normally used to create high-level \ + interpreted programming environments, systems integration, and as a \ + tool for building user interfaces. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +CONFIGURE_OPTIONS += \ + --sbindir=/sbin + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && ./autogen.sh +endef diff --git a/pkgs/core/xen/xen.nm b/pkgs/core/xen/xen.nm index 09f13e1..f5bff8d 100644 --- a/pkgs/core/xen/xen.nm +++ b/pkgs/core/xen/xen.nm @@ -72,10 +72,6 @@ define QUALITY_AGENT_WHITELIST_EXECSTACK endef define STAGE_BUILD - # This needs to be called because the configuration routine is - # damn crappy. - ldconfig - # Following two lines are disabling HVM. HVM does not work because \ # of soem PIE errors we get when we try to build the firmware part \ # needed for different architektures. diff --git a/tools/generator b/tools/generator index 89fdbfc..9cc31b0 100755 --- a/tools/generator +++ b/tools/generator @@ -34,10 +34,14 @@ function installer_image() { # (2) squashfs.img (installer) local i - for i in dev proc sys; do + for i in dev proc sys lib/modules; do mkdir -p ${dir}/${i} 2>/dev/null done + # Copy kernel modules + cp -vfr /lib/modules/${KERNEL_RELEASE} ${dir}/lib/modules/ + + # Copy overlay cp -vfr /usr/src/src/install/* ${dir} _installer_image_ext3fs \ hooks/post-receive -- IPFire 3.x development tree

1 0

[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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM October 2010