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 5943bf3ecc42ce8c8b1f95b92f38f093f4115607 (commit) via d4e634955c76cc787b661890df3dabfbf39b39f0 (commit) via 081f097387e30b25f694197d460e31571b0cd386 (commit) via ebc354b84632f51581191d542e6571e30b731601 (commit) via 66befe59522b9b4721f4318cc69063304c1da448 (commit) via 0b776fba15e1724b290722d8f6b84ef54afe996d (commit) from 130b6bb3d57a98c49baaaf6b6e63409b3cf776da (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 5943bf3ecc42ce8c8b1f95b92f38f093f4115607 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 13 19:56:18 2011 +0200

python-satsolver: Make package working.

commit d4e634955c76cc787b661890df3dabfbf39b39f0 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 13 19:48:43 2011 +0200

libsatsolver: Fix missing __qsort_r.

Our version of glibc does not provide __qsort_r so we need to ship another one.

commit 081f097387e30b25f694197d460e31571b0cd386 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 13 19:48:18 2011 +0200

cmake: Update to 2.6.4.

Needed to build python-satsolver.

commit ebc354b84632f51581191d542e6571e30b731601 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 13 18:19:12 2011 +0200

python-satsolver: Fix download location.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 66befe59522b9b4721f4318cc69063304c1da448 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed May 11 22:13:59 2011 +0200

python-satsolver: New package.

Only initial commit - package doesn't build atm - needs fixing.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 0b776fba15e1724b290722d8f6b84ef54afe996d Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 13 16:25:21 2011 +0200

gmp: Update to 4.2.4.

Needed this update to fix building php without an executable stack that was caused by gmp.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/gmp | 8 ++-- lfs/cmake | 4 +- lfs/gmp | 7 ++- lfs/libsatsolver | 3 + lfs/{libpng => python-satsolver} | 43 +++++++++++++++---- make.sh | 1 + .../python-satsolver-only-python-bindings.patch | 27 ++++++++++++ .../python-satsover-fix-building-without-rpm.patch | 37 +++++++++++++++++ 8 files changed, 112 insertions(+), 18 deletions(-) copy lfs/{libpng => python-satsolver} (72%) create mode 100644 src/patches/python-satsolver-only-python-bindings.patch create mode 100644 src/patches/python-satsover-fix-building-without-rpm.patch

Difference in files: diff --git a/config/rootfiles/common/gmp b/config/rootfiles/common/gmp index 6bf3940..669d191 100644 --- a/config/rootfiles/common/gmp +++ b/config/rootfiles/common/gmp @@ -8,14 +8,14 @@ #usr/lib/libgmp.la usr/lib/libgmp.so usr/lib/libgmp.so.3 -usr/lib/libgmp.so.3.3.0 +usr/lib/libgmp.so.3.4.4 #usr/lib/libgmpxx.a #usr/lib/libgmpxx.la #usr/lib/libgmpxx.so -#usr/lib/libgmpxx.so.3 -#usr/lib/libgmpxx.so.3.0.2 +#usr/lib/libgmpxx.so.4 +#usr/lib/libgmpxx.so.4.0.4 #usr/lib/libmp.a #usr/lib/libmp.la #usr/lib/libmp.so #usr/lib/libmp.so.3 -#usr/lib/libmp.so.3.1.4 +#usr/lib/libmp.so.3.1.13 diff --git a/lfs/cmake b/lfs/cmake index 56e0016..6b7aff6 100644 --- a/lfs/cmake +++ b/lfs/cmake @@ -24,7 +24,7 @@

include Config

-VER = 2.4.8 +VER = 2.6.4

THISAPP = cmake-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = f5dd061c31765a49dc17ae8bdc986779 +$(DL_FILE)_MD5 = 50f387d0436696c4a68b5512a72c9cde

install : $(TARGET)

diff --git a/lfs/gmp b/lfs/gmp index 5d723e5..10cd28f 100644 --- a/lfs/gmp +++ b/lfs/gmp @@ -24,7 +24,7 @@

include Config

-VER = 4.2 +VER = 4.2.4

THISAPP = gmp-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = aa4a4534e8870ab8ba3c093239057cca +$(DL_FILE)_MD5 = fc1e3b3a2a5038d4d74138d0b9cf8dbe

install : $(TARGET)

@@ -70,7 +70,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --enable-cxx --enable-mpbsd --build=$(BUILDTARGET) --disable-nls + cd $(DIR_APP) && ABI=32 ./configure --prefix=/usr --enable-cxx \ + --enable-mpbsd --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/libsatsolver b/lfs/libsatsolver index 771430b..778375a 100644 --- a/lfs/libsatsolver +++ b/lfs/libsatsolver @@ -93,6 +93,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # do not support RPM. cd $(DIR_APP) && sed -e "s/DEBIAN/FEDORA/g" -i ext/CMakeLists.txt

+ # Our version of glibc has no __qsort_r + cd $(DIR_APP) && echo "#define USE_OWN_QSORT" >> src/util.h + cd $(DIR_APP) && mkdir build cd $(DIR_APP)/build && cmake .. -DFEDORA=1 \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/lfs/python-satsolver b/lfs/python-satsolver new file mode 100644 index 0000000..0974a15 --- /dev/null +++ b/lfs/python-satsolver @@ -0,0 +1,102 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.16.0-20110429-868eae9 + +THISAPP = sat-solver-bindings-$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = http://source.ipfire.org/source-3.x +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +PROG = python-satsolver +DEPS = "libsatsolver" +PAK_VER = 1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 479f3b57a9f9a59c7b24e37aedda7469 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist : + $(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + + # Workaround for weak tarball + @rm -rf $(DIR_APP) && mkdir $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) -C $(DIR_APP) + + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-satsover-fix-building-without-rpm.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-satsolver-only-python-bindings.patch + + # Aaaahh! + cd $(DIR_APP) && sed -e "s/-Werror//g" -i CMakeLists.txt + + cd $(DIR_APP) && mkdir build + cd $(DIR_APP)/build && cmake .. -DDEBIAN=1 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=1 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python2.7 + + cd $(DIR_APP)/build && make $(PARALELLISMFLAGS) + + # Install only the python bindings. That's all we need. + cd $(DIR_APP)/build/bindings/python && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 22af839..ccb1dbc 100755 --- a/make.sh +++ b/make.sh @@ -691,6 +691,7 @@ buildipfire() { ipfiremake python-m2crypto ipfiremake crda ipfiremake libsatsolver + ipfiremake python-satsolver echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild diff --git a/src/patches/python-satsolver-only-python-bindings.patch b/src/patches/python-satsolver-only-python-bindings.patch new file mode 100644 index 0000000..36905d0 --- /dev/null +++ b/src/patches/python-satsolver-only-python-bindings.patch @@ -0,0 +1,27 @@ +diff -Nur old/bindings/CMakeLists.txt new/bindings/CMakeLists.txt +--- old/bindings/CMakeLists.txt 2011-04-11 22:51:37.891109001 +0200 ++++ new/bindings/CMakeLists.txt 2011-04-11 22:55:52.859108992 +0200 +@@ -21,17 +21,17 @@ + #FIND_PACKAGE(PerlLibs) + FIND_PACKAGE(Perl) + +-IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) +- ADD_SUBDIRECTORY(ruby) +-ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) ++#IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) ++# ADD_SUBDIRECTORY(ruby) ++#ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) + + IF (PYTHON_LIBRARY) + ADD_SUBDIRECTORY(python) + ENDIF(PYTHON_LIBRARY) + +-IF (PERL_EXECUTABLE) +- ADD_SUBDIRECTORY(perl) +-ENDIF (PERL_EXECUTABLE) ++#IF (PERL_EXECUTABLE) ++# ADD_SUBDIRECTORY(perl) ++#ENDIF (PERL_EXECUTABLE) + + SET(bindings_devel_dir "${CMAKE_CURRENT_BINARY_DIR}/satsolver-bindings") + ADD_CUSTOM_COMMAND ( diff --git a/src/patches/python-satsover-fix-building-without-rpm.patch b/src/patches/python-satsover-fix-building-without-rpm.patch new file mode 100644 index 0000000..68e2767 --- /dev/null +++ b/src/patches/python-satsover-fix-building-without-rpm.patch @@ -0,0 +1,37 @@ +diff -Nur src/bindings/pool.i sat-solver-bindings/bindings/pool.i +--- src/bindings/pool.i 2011-04-25 12:03:31.000000000 +0000 ++++ sat-solver-bindings/bindings/pool.i 2011-04-29 18:40:59.645929695 +0000 +@@ -474,6 +474,7 @@ + return repo; + } + ++#if defined(FEDORA) + /* + * Add RPM database to Pool. + * +@@ -493,6 +494,7 @@ + repo_add_rpmdb( repo, NULL, rootdir, 0 ); + return repo; + } ++#endif + + %newobject create_repo; + /* +diff -Nur src/bindings/repo.i sat-solver-bindings/bindings/repo.i +--- src/bindings/repo.i 2011-04-25 12:03:31.000000000 +0000 ++++ sat-solver-bindings/bindings/repo.i 2011-04-29 18:37:13.856570319 +0000 +@@ -139,11 +139,13 @@ + } + } + ++#if defined(FEDORA) + /* + * Add RPM database, optionally passing a _root_ directory + */ + void add_rpmdb( const char *rootdir ) + { repo_add_rpmdb( $self, NULL, rootdir, 0); } ++#endif + + /* + * Create solvable with +name+ and +evr+ in the Repo +

hooks/post-receive -- IPFire 2.x development tree