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 734534fbbf53589f671897dcaf56782d6b38b1fd (commit) via fd79f07265f82418133cb897884cee9646b882a5 (commit) via 1fc81377803ed4a2e33950984a966e1c10366563 (commit) from c9b0b55d4f2a45232dec9271b000c15e33da24d0 (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 734534fbbf53589f671897dcaf56782d6b38b1fd Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 6 12:23:34 2011 +0200

Remove libsatsolver.

This is no more needed.

commit fd79f07265f82418133cb897884cee9646b882a5 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 6 12:22:34 2011 +0200

pakfire: Update to 0.9.6.

Using libsolv now.

commit 1fc81377803ed4a2e33950984a966e1c10366563 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 6 12:22:21 2011 +0200

libsolv: New package replacing libsatsolver.

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

Summary of changes: .../patches/0001-Build-only-libraries.patch | 26 ------ ...e-libsatsolver-ext-a-versioned-shared-lib.patch | 94 -------------------- .../libsatsolver.nm => libsolv/libsolv.nm} | 31 ++++--- pkgs/pakfire/pakfire.nm | 11 ++- 4 files changed, 26 insertions(+), 136 deletions(-) delete mode 100644 pkgs/libsatsolver/patches/0001-Build-only-libraries.patch delete mode 100644 pkgs/libsatsolver/patches/0001-Make-libsatsolver-ext-a-versioned-shared-lib.patch rename pkgs/{libsatsolver/libsatsolver.nm => libsolv/libsolv.nm} (77%)

Difference in files: diff --git a/pkgs/libsatsolver/libsatsolver.nm b/pkgs/libsatsolver/libsatsolver.nm deleted file mode 100644 index 3b33806..0000000 --- a/pkgs/libsatsolver/libsatsolver.nm +++ /dev/null @@ -1,75 +0,0 @@ -############################################################################### -# # -# 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 = libsatsolver -PKG_VER = 0.16.4 -GIT_VER = c57e9df -PKG_REL = 5 - -PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org -PKG_GROUPS = System/Libraries -PKG_URL = http://gitorious.org/opensuse/sat-solver -PKG_LICENSE = BSD -PKG_SUMMARY = A SAT solver written in C++. - -PKG_BUILD_DEPS+= gcc-c++ cmake db4-devel expat-devel zlib-devel - -define PKG_DESCRIPTION - This package contains a very fast SAT resolver written in C++. -endef - -THISAPP = $(PKG_NAME)-$(PKG_VER)-$(GIT_VER) -PKG_TARBALL = $(THISAPP).tar.xz - -PKG_PACKAGES += $(PKG_NAME)-devel - -define STAGE_PREPARE_CMDS - # Who releases code with -Werror? - cd $(DIR_APP) && sed -e "s/-Werror//g" -i CMakeLists.txt - - # Make sure that libsatsolverext is linked properly to all needed - # libraries. - cd $(DIR_APP) && echo "TARGET_LINK_LIBRARIES(satsolverext satsolver $${EXPAT_LIBRARY} $${ZLIB_LIBRARY})" \ - >> ext/CMakeLists.txt - - # Remove the RPM stuff when we build with -DFEDORA=1 because we - # do not support RPM. - cd $(DIR_APP) && sed -e "s/DEBIAN/FEDORA/g" -i ext/CMakeLists.txt -endef - -# Define debian as distro to get weak of rpm header files. -define STAGE_BUILD - cd $(DIR_APP) && mkdir build - cd $(DIR_APP)/build && cmake .. -DFEDORA=1 \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=1 - cd $(DIR_APP)/build && make $(PARALELLISMFLAGS) -endef - -define STAGE_INSTALL - cd $(DIR_APP)/build && make install DESTDIR=$(BUILDROOT) -endef diff --git a/pkgs/libsatsolver/patches/0001-Build-only-libraries.patch b/pkgs/libsatsolver/patches/0001-Build-only-libraries.patch deleted file mode 100644 index 47e24e4..0000000 --- a/pkgs/libsatsolver/patches/0001-Build-only-libraries.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Nur old/CMakeLists.txt new/CMakeLists.txt ---- old/CMakeLists.txt 2011-04-10 23:55:09.506257000 +0200 -+++ new/CMakeLists.txt 2011-04-10 23:46:30.612257002 +0200 -@@ -32,7 +32,7 @@ - INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) - - FIND_PACKAGE(EXPAT REQUIRED) --FIND_PACKAGE(Check REQUIRED) -+#FIND_PACKAGE(Check REQUIRED) - FIND_PACKAGE(ZLIB REQUIRED) - - IF ( FEDORA ) -@@ -190,10 +190,10 @@ - - ADD_SUBDIRECTORY(src) - ADD_SUBDIRECTORY(ext) --ADD_SUBDIRECTORY(tools) --ADD_SUBDIRECTORY(tests) --ADD_SUBDIRECTORY(examples) --ADD_SUBDIRECTORY(doc) -+#ADD_SUBDIRECTORY(tools) -+#ADD_SUBDIRECTORY(tests) -+#ADD_SUBDIRECTORY(examples) -+#ADD_SUBDIRECTORY(doc) - - MESSAGE(STATUS "version: ${VERSION}") diff --git a/pkgs/libsatsolver/patches/0001-Make-libsatsolver-ext-a-versioned-shared-lib.patch b/pkgs/libsatsolver/patches/0001-Make-libsatsolver-ext-a-versioned-shared-lib.patch deleted file mode 100644 index 449275c..0000000 --- a/pkgs/libsatsolver/patches/0001-Make-libsatsolver-ext-a-versioned-shared-lib.patch +++ /dev/null @@ -1,94 +0,0 @@ ->From 1f9659b55013f222046b9d161fd5a0f2fc399cb8 Mon Sep 17 00:00:00 2001 -From: Michael Tremer michael.tremer@ipfire.org -Date: Thu, 21 Apr 2011 12:48:41 +0200 -Subject: [PATCH] Make libsatsolver{,ext} a versioned shared lib. - -Most distributions only do accept shared libraries because of -relro and hardening stuff. - -Previously, libsatsolver was statically compiled because the ABI -was assumed to be changed from time to time but has now become -very stable. - -Signed-off-by: Michael Tremer michael.tremer@ipfire.org ---- - ext/CMakeLists.txt | 6 +++++- - src/CMakeLists.txt | 6 +++++- - tools/CMakeLists.txt | 12 ++++++------ - 3 files changed, 16 insertions(+), 8 deletions(-) - -diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt -index 8e71eee..68e1c3c 100644 ---- a/ext/CMakeLists.txt -+++ b/ext/CMakeLists.txt -@@ -8,7 +8,11 @@ SET(libsatsolverext_SRCS - ${libsatsolverext_SRCS} pool_fileconflicts.c repo_rpmdb.c) - ENDIF (NOT DEBIAN) - --ADD_LIBRARY(satsolverext STATIC ${libsatsolverext_SRCS}) -+ADD_LIBRARY(satsolverext SHARED ${libsatsolverext_SRCS}) -+SET_TARGET_PROPERTIES(satsolverext PROPERTIES -+ VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}" -+ SOVERSION "${LIBSATSOLVER_MAJOR}" -+) - - SET(libsatsolverext_HEADERS - pool_fileconflicts.h repo_content.h repo_deltainfoxml.h repo_helix.h repo_products.h -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9bd0fde..6a14d10 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -6,7 +6,11 @@ SET(libsatsolver_SRCS - transaction.c rules.c problems.c - chksum.c md5.c sha1.c sha2.c satversion.c) - --ADD_LIBRARY(satsolver STATIC ${libsatsolver_SRCS}) -+ADD_LIBRARY(satsolver SHARED ${libsatsolver_SRCS}) -+SET_TARGET_PROPERTIES(satsolver PROPERTIES -+ VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}" -+ SOVERSION "${LIBSATSOLVER_MAJOR}" -+) - - SET(libsatsolver_HEADERS - bitmap.h evr.h hash.h policy.h poolarch.h poolvendor.h pool.h -diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index 79d4890..7696612 100644 ---- a/tools/CMakeLists.txt -+++ b/tools/CMakeLists.txt -@@ -20,19 +20,19 @@ ADD_EXECUTABLE(rpmmd2solv rpmmd2solv.c) - TARGET_LINK_LIBRARIES(rpmmd2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(helix2solv helix2solv.c) --TARGET_LINK_LIBRARIES(helix2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY}) -+TARGET_LINK_LIBRARIES(helix2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(susetags2solv susetags2solv.c) --TARGET_LINK_LIBRARIES(susetags2solv toolstuff satsolverext satsolver ${ZLIB_LIBRARY}) -+TARGET_LINK_LIBRARIES(susetags2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(updateinfoxml2solv updateinfoxml2solv.c) --TARGET_LINK_LIBRARIES(updateinfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY}) -+TARGET_LINK_LIBRARIES(updateinfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(deltainfoxml2solv deltainfoxml2solv.c) --TARGET_LINK_LIBRARIES(deltainfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY}) -+TARGET_LINK_LIBRARIES(deltainfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(repomdxml2solv repomdxml2solv.c) --TARGET_LINK_LIBRARIES(repomdxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY}) -+TARGET_LINK_LIBRARIES(repomdxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(installcheck installcheck.c) - TARGET_LINK_LIBRARIES(installcheck satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) -@@ -44,7 +44,7 @@ ADD_EXECUTABLE(dumpsolv dumpsolv.c ) - TARGET_LINK_LIBRARIES(dumpsolv satsolver) - - ADD_EXECUTABLE(mergesolv mergesolv.c ) --TARGET_LINK_LIBRARIES(mergesolv toolstuff satsolverext satsolver) -+TARGET_LINK_LIBRARIES(mergesolv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - install(TARGETS - mergesolv --- -1.7.4.4 - diff --git a/pkgs/libsolv/libsolv.nm b/pkgs/libsolv/libsolv.nm new file mode 100644 index 0000000..d017560 --- /dev/null +++ b/pkgs/libsolv/libsolv.nm @@ -0,0 +1,80 @@ +############################################################################### +# # +# 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 = libsolv +PKG_VER = 0.0.0 +GIT_VER = 0db9d7f +PKG_REL = 1 + +PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org +PKG_GROUPS = System/Libraries +PKG_URL = https://github.com/openSUSE/libsolv +PKG_LICENSE = BSD +PKG_SUMMARY = A library for solving package dependencies. + +PKG_BUILD_DEPS+= gcc-c++ cmake db4-devel expat-devel zlib-devel + +define PKG_DESCRIPTION + A library for solving package dependencies by using a SAT + resolver written in C++. +endef + +THISAPP = $(PKG_NAME)-$(PKG_VER)-$(GIT_VER) +PKG_TARBALL = $(THISAPP).tar.gz + +PKG_PACKAGES += $(PKG_NAME)-devel + +define STAGE_PREPARE_CMDS + # Do not build bindings, examples and tools. + cd $(DIR_APP) && sed "/bindings/d" -i CMakeLists.txt + cd $(DIR_APP) && sed "/examples/d" -i CMakeLists.txt + cd $(DIR_APP) && sed "/tools/d" -i CMakeLists.txt + + # Make sure that libsatsolverext is linked properly to all needed + # libraries. + cd $(DIR_APP) && echo "TARGET_LINK_LIBRARIES(libsolvext libsolv $${EXPAT_LIBRARY} $${ZLIB_LIBRARY})" \ + >> ext/CMakeLists.txt + + # Remove the RPM stuff when we build with -DFEDORA=1 because we + # do not support RPM. + cd $(DIR_APP) && sed -e "s/DEBIAN/FEDORA/g" -i ext/CMakeLists.txt +endef + +define STAGE_BUILD + cd $(DIR_APP) && mkdir build + cd $(DIR_APP)/build && cmake .. -DFEDORA=1 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=1 + cd $(DIR_APP)/build && make $(PARALELLISMFLAGS) +endef + +define STAGE_INSTALL + cd $(DIR_APP)/build && make install DESTDIR=$(BUILDROOT) + + # Remove unusable header. + rm -vf $(BUILDROOT)/usr/include/solv/repo_rpmdb.h +endef diff --git a/pkgs/pakfire/pakfire.nm b/pkgs/pakfire/pakfire.nm index c0e14c2..fadcd9d 100644 --- a/pkgs/pakfire/pakfire.nm +++ b/pkgs/pakfire/pakfire.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include

PKG_NAME = pakfire -PKG_VER = 0.9.4 -PKG_REL = 2 +PKG_VER = 0.9.6 +PKG_REL = 1

PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUPS = Base System/Packaging @@ -36,7 +36,7 @@ PKG_SUMMARY = Package installer/updater.

PKG_BUILD_DEPS+= \ intltool \ - libsatsolver-devel>=0.16.4-5 \ + libsolv-devel \ python-devel \ python-distutils-extra

@@ -56,6 +56,11 @@ PKG_TARBALL = $(THISAPP).tar.gz

export CFLAGS += -fno-strict-aliasing

+define STAGE_TEST + # Check, if the binary module is loadable. + cd $(DIR_APP)/build/lib*/pakfire/ && python -c "import _pakfire" +endef + # Build package

PKG_PACKAGES += $(PKG_NAME)-build

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