IPFire-SCM May 2011

ipfire-scm@lists.ipfire.org

1 participants
63 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 38b0ebbc9d8bb67c1a248192dea3b2b650e1291e
by git＠ipfire.org 09 May '11

09 May '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 83371d5f5705ca1605343f53c02588083a95d392
by git＠ipfire.org 08 May '11

08 May '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, pakfire3, created. ac073fba8c61fa675f7144523c26de3f55c01eac
by git＠ipfire.org 07 May '11

07 May '11

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, pakfire3 has been created at ac073fba8c61fa675f7144523c26de3f55c01eac (commit) - Log ----------------------------------------------------------------- commit ac073fba8c61fa675f7144523c26de3f55c01eac Merge: 4bdb372 93aa811 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 7 20:45:55 2011 +0200 Merge branch 'master' into python Conflicts: make.sh commit 4bdb372a5c31f8ed5b124176f9102ef69f33780f Merge: 410d03d 211ca1f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 7 20:43:22 2011 +0200 Merge branch 'master' into python commit 410d03d7abcc4fc6875e988a02097cf88b89d26c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Mar 10 19:27:19 2011 +0100 Add intltool and pakfire3-deps to make.sh. commit 4f1fb9dfb99058902c035ba12bcf072b5d85b42c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Mar 10 19:25:52 2011 +0100 pakfire3-deps: New package. Meta-package that install all dependencies for the IPFire 3.x package buildsystem. commit 392c7c96c7aad35fb50657239b5c2d11fc225113 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Mar 10 16:56:27 2011 +0100 gettext: added binaries and libs to distribution. commit ce151b3ee6929fd430e47ba381539be6071b4ac7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Mar 10 16:55:29 2011 +0100 python-lzma: unzip egg because it will not found packed. commit b5135941c9aa3e98b9367edb52d1bf73abebae60 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Mar 10 16:53:59 2011 +0100 intltool: new package. commit 404094cecae3859212b51ed731cb2b8d82673d52 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Mar 10 11:18:21 2011 +0100 sqlite: update to 3.7.3. commit 1350165bae3bc0414bf833088ea5feabe217e959 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Mar 10 11:17:46 2011 +0100 python-distutils-extra: fix installation. commit c91b4ba10f28609a3ec873dee14c4fdcca973bea Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Mar 9 10:04:03 2011 +0100 python-xattr: new package. commit 8ce0db7c97259916fd16cceac156390dc634bdc8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Mar 9 10:03:12 2011 +0100 python-progressbar: new package. commit 32c95e110ee0ec896a09dee89e65fd31afb6f8f9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Mar 9 09:50:49 2011 +0100 python-lzma: new package. commit ce457e7f72a9c968434daf0193b088f7c80a19a8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Mar 9 08:54:50 2011 +0100 python-distutils-extra: new package. commit 6d4a7d383603693a6b904563de585d52a57055de Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Mar 9 08:53:33 2011 +0100 python-distutils: new package. commit 0dcde63b29017328aaac1fa8c7655a11153a4e92 Merge: 1916a97 3046fa4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 8 19:18:57 2011 +0100 Merge branch 'master' into python commit 1916a97e7b8dce5249ad60c168fa6bc3df0864ea Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Mar 4 16:37:47 2011 +0100 python: add sqlite support. commit e12d2a3d35e304b94645f9b216aa55cda607ec96 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Mar 4 15:28:34 2011 +0100 Updated python (2.7.1). ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 93aa811ed014f3bf91add965e7f41e9de73f213c
by git＠ipfire.org 07 May '11

07 May '11

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 93aa811ed014f3bf91add965e7f41e9de73f213c (commit) from f3905bf8173bfc407dba284aae52034195766f84 (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 93aa811ed014f3bf91add965e7f41e9de73f213c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat May 7 20:31:31 2011 +0200 libsatsolver: New package. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/libsatsolver | 52 +++ lfs/{elinks => libsatsolver} | 44 ++- make.sh | 1 + .../libsatsolver-Build-only-libraries.patch | 26 ++ ...er-scripts-that-do-only-export-the-needed.patch | 439 ++++++++++++++++++++ ...e-libsatsolver-ext-a-versioned-shared-lib.patch | 94 +++++ 6 files changed, 639 insertions(+), 17 deletions(-) create mode 100644 config/rootfiles/packages/libsatsolver copy lfs/{elinks => libsatsolver} (71%) create mode 100644 src/patches/libsatsolver-Build-only-libraries.patch create mode 100644 src/patches/libsatsolver-Create-linker-scripts-that-do-only-export-the-needed.patch create mode 100644 src/patches/libsatsolver-Make-libsatsolver-ext-a-versioned-shared-lib.patch Difference in files: diff --git a/config/rootfiles/packages/libsatsolver b/config/rootfiles/packages/libsatsolver new file mode 100644 index 0000000..212eeea --- /dev/null +++ b/config/rootfiles/packages/libsatsolver @@ -0,0 +1,52 @@ +#usr/include/satsolver +#usr/include/satsolver/bitmap.h +#usr/include/satsolver/chksum.h +#usr/include/satsolver/dirpool.h +#usr/include/satsolver/evr.h +#usr/include/satsolver/hash.h +#usr/include/satsolver/knownid.h +#usr/include/satsolver/md5.h +#usr/include/satsolver/policy.h +#usr/include/satsolver/pool.h +#usr/include/satsolver/pool_fileconflicts.h +#usr/include/satsolver/poolarch.h +#usr/include/satsolver/poolid.h +#usr/include/satsolver/pooltypes.h +#usr/include/satsolver/poolvendor.h +#usr/include/satsolver/problems.h +#usr/include/satsolver/queue.h +#usr/include/satsolver/repo.h +#usr/include/satsolver/repo_content.h +#usr/include/satsolver/repo_deb.h +#usr/include/satsolver/repo_deltainfoxml.h +#usr/include/satsolver/repo_helix.h +#usr/include/satsolver/repo_products.h +#usr/include/satsolver/repo_releasefile_products.h +#usr/include/satsolver/repo_repomdxml.h +#usr/include/satsolver/repo_rpmdb.h +#usr/include/satsolver/repo_rpmmd.h +#usr/include/satsolver/repo_solv.h +#usr/include/satsolver/repo_susetags.h +#usr/include/satsolver/repo_updateinfoxml.h +#usr/include/satsolver/repo_write.h +#usr/include/satsolver/repo_zyppdb.h +#usr/include/satsolver/repodata.h +#usr/include/satsolver/repopage.h +#usr/include/satsolver/rules.h +#usr/include/satsolver/sat_xfopen.h +#usr/include/satsolver/satversion.h +#usr/include/satsolver/sha1.h +#usr/include/satsolver/sha2.h +#usr/include/satsolver/solvable.h +#usr/include/satsolver/solver.h +#usr/include/satsolver/solverdebug.h +#usr/include/satsolver/strpool.h +#usr/include/satsolver/tools_util.h +#usr/include/satsolver/transaction.h +#usr/include/satsolver/util.h +usr/lib/libsatsolver.so +usr/lib/libsatsolver.so.0 +usr/lib/libsatsolver.so.0.16 +usr/lib/libsatsolverext.so +usr/lib/libsatsolverext.so.0 +usr/lib/libsatsolverext.so.0.16 diff --git a/lfs/libsatsolver b/lfs/libsatsolver new file mode 100644 index 0000000..619c477 --- /dev/null +++ b/lfs/libsatsolver @@ -0,0 +1,99 @@ +############################################################################### +# # +# 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.4 + +THISAPP = libsatsolver-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 563414330c29e9b49be0e43358185a78 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# 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) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsatsolver-Build-only-libraries.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsatsolver-Create-linker-scripts-that-do-only-export-the-needed.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsatsolver-Make-libsatsolver-ext-a-versioned-shared-lib.patch + + # 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 + + 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) + + cd $(DIR_APP)/build && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index f572b93..b89c77a 100755 --- a/make.sh +++ b/make.sh @@ -689,6 +689,7 @@ buildipfire() { ipfiremake swig ipfiremake python-m2crypto ipfiremake crda + ipfiremake libsatsolver 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/libsatsolver-Build-only-libraries.patch b/src/patches/libsatsolver-Build-only-libraries.patch new file mode 100644 index 0000000..47e24e4 --- /dev/null +++ b/src/patches/libsatsolver-Build-only-libraries.patch @@ -0,0 +1,26 @@ +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/src/patches/libsatsolver-Create-linker-scripts-that-do-only-export-the-needed.patch b/src/patches/libsatsolver-Create-linker-scripts-that-do-only-export-the-needed.patch new file mode 100644 index 0000000..5ba4fa2 --- /dev/null +++ b/src/patches/libsatsolver-Create-linker-scripts-that-do-only-export-the-needed.patch @@ -0,0 +1,439 @@ +>From a42d7e17fa3e39a8306126c19f1b3b54f1fdd79e Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Thu, 21 Apr 2011 16:40:11 +0200 +Subject: [PATCH] Create linker-scripts that do only export the needed symbols + of libsatsolver{,ext}. + +See these posts for reference: + http://lists.opensuse.org/zypp-devel/2011-04/msg00012.html + http://lists.opensuse.org/zypp-devel/2011-04/msg00014.html + +Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> +--- + ext/CMakeLists.txt | 1 + + ext/libsatsolverext.ver | 25 ++++ + src/CMakeLists.txt | 1 + + src/libsatsolver.ver | 355 +++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 382 insertions(+), 0 deletions(-) + create mode 100644 ext/libsatsolverext.ver + create mode 100644 src/libsatsolver.ver + +diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt +index 68e1c3c..d51a43b 100644 +--- a/ext/CMakeLists.txt ++++ b/ext/CMakeLists.txt +@@ -21,6 +21,7 @@ SET(libsatsolverext_HEADERS + tools_util.h repo_deb.h sat_xfopen.h) + + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") ++SET(CMAKE_SHARED_LINKER_FLAGS "${LINK_FLAGS} -Wl,--version-script=${satsolver_SOURCE_DIR}/ext/libsatsolverext.ver") + + INSTALL(FILES ${libsatsolverext_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/satsolver") + INSTALL(TARGETS satsolverext LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) +diff --git a/ext/libsatsolverext.ver b/ext/libsatsolverext.ver +new file mode 100644 +index 0000000..4869d37 +--- /dev/null ++++ b/ext/libsatsolverext.ver +@@ -0,0 +1,25 @@ ++EXT1.0 { ++ global: ++ repo_add_code11_products; ++ repo_add_content; ++ repo_add_deb; ++ repo_add_debdb; ++ repo_add_debpackages; ++ repo_add_debs; ++ repo_add_deltainfoxml; ++ repo_add_helix; ++ repo_add_products; ++ repo_add_releasefile_products; ++ repo_add_repomdxml; ++ repo_add_rpmmd; ++ repo_add_susetags; ++ repo_add_updateinfoxml; ++ repo_add_zyppdb_products; ++ repodata_write; ++ repo_write; ++ repo_write_stdkeyfilter; ++ sat_xfopen; ++ sat_xfopen_fd; ++ local: ++ *; ++}; +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 6a14d10..b54d01d 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -20,6 +20,7 @@ SET(libsatsolver_HEADERS + chksum.h md5.h sha1.h sha2.h ${CMAKE_BINARY_DIR}/src/satversion.h) + + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") ++SET(CMAKE_SHARED_LINKER_FLAGS "${LINK_FLAGS} -Wl,--version-script=${satsolver_SOURCE_DIR}/src/libsatsolver.ver") + + INSTALL(FILES ${libsatsolver_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/satsolver") + INSTALL(TARGETS satsolver LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) +diff --git a/src/libsatsolver.ver b/src/libsatsolver.ver +new file mode 100644 +index 0000000..dab3576 +--- /dev/null ++++ b/src/libsatsolver.ver +@@ -0,0 +1,355 @@ ++SAT1.0 { ++ global: ++ dataiterator_clonepos; ++ dataiterator_entersub; ++ dataiterator_free; ++ dataiterator_init; ++ dataiterator_init_clone; ++ dataiterator_jump_to_repo; ++ dataiterator_jump_to_solvid; ++ dataiterator_match; ++ dataiterator_prepend_keyname; ++ dataiterator_seek; ++ dataiterator_set_keyname; ++ dataiterator_set_match; ++ dataiterator_setpos; ++ dataiterator_setpos_parent; ++ dataiterator_set_search; ++ dataiterator_skip_attribute; ++ dataiterator_skip_repo; ++ dataiterator_skip_solvable; ++ dataiterator_step; ++ datamatcher_free; ++ datamatcher_init; ++ datamatcher_match; ++ data_read_idarray; ++ data_read_rel_idarray; ++ data_skip_key; ++ dep2str; ++ dirpool_add_dir; ++ dirpool_free; ++ dirpool_init; ++ dirpool_make_dirtraverse; ++ evrcmp; ++ evrmatch; ++ id2str; ++ map_free; ++ map_grow; ++ map_init; ++ map_init_clone; ++ policy_create_obsolete_index; ++ policy_filter_unwanted; ++ policy_findupdatepackages; ++ policy_illegal2str; ++ policy_illegal_archchange; ++ policy_illegal_vendorchange; ++ policy_is_illegal; ++ pool_add_fileconflicts_deps; ++ pool_addfileprovides; ++ pool_addfileprovides_ids; ++ pool_addrelproviders; ++ pool_add_solvable; ++ pool_add_solvable_block; ++ pool_alloctmpspace; ++ pool_arch2color_slow; ++ pool_bin2hex; ++ pool_calc_duchanges; ++ pool_calc_installsizechange; ++ pool_clear_pos; ++ pool_create; ++ pool_create_state_maps; ++ pool_createwhatprovides; ++ pool_debug; ++ pool_free; ++ pool_freeidhashes; ++ pool_free_solvable_block; ++ pool_freetmpspace; ++ pool_freewhatprovides; ++ pool_id2langid; ++ pool_job2str; ++ pool_lookup_bin_checksum; ++ pool_lookup_checksum; ++ pool_lookup_id; ++ pool_lookup_num; ++ pool_lookup_str; ++ pool_lookup_void; ++ pool_match_dep; ++ pool_match_nevr_rel; ++ pool_queuetowhatprovides; ++ pool_search; ++ pool_setarch; ++ pool_setarchpolicy; ++ pool_setdebuglevel; ++ pool_set_installed; ++ pool_set_languages; ++ pool_setvendorclasses; ++ pool_shrink_rels; ++ pool_shrink_strings; ++ pool_tmpappend; ++ pool_tmpjoin; ++ pool_trivial_installable; ++ pool_trivial_installable_noobsoletesmap; ++ pool_vendor2mask; ++ prune_best_arch_name_version; ++ prune_to_best_arch; ++ prune_to_best_version; ++ queue_alloc_one; ++ queue_alloc_one_head; ++ queue_delete; ++ queue_delete2; ++ queue_deleten; ++ queue_free; ++ queue_init; ++ queue_init_buffer; ++ queue_init_clone; ++ queue_insert; ++ queue_insert2; ++ queue_insertn; ++ rel2id; ++ repo_addid; ++ repo_addid_dep; ++ repo_add_poolstr_array; ++ repo_add_repodata; ++ repo_add_solv; ++ repo_add_solv_flags; ++ repo_create; ++ repodata_add_dirnumnum; ++ repodata_add_dirstr; ++ repodata_add_fixarray; ++ repodata_add_flexarray; ++ repodata_add_idarray; ++ repodata_add_poolstr_array; ++ repodata_chk2str; ++ repodata_create; ++ repodata_create_stubs; ++ repodata_delete; ++ repodata_delete_uninternalized; ++ repodata_dir2str; ++ repodata_disable_paging; ++ repodata_empty; ++ repodata_extend; ++ repodata_extend_block; ++ repodata_filelistfilter_matches; ++ repodata_free; ++ repodata_freedata; ++ repodata_free_schemahash; ++ repodata_globalize_id; ++ repodata_initdata; ++ repodata_internalize; ++ repodata_key2id; ++ repodata_localize_id; ++ repodata_lookup_bin_checksum; ++ repodata_lookup_id; ++ repodata_lookup_idarray; ++ repodata_lookup_num; ++ repodata_lookup_str; ++ repodata_lookup_type; ++ repodata_lookup_void; ++ repodata_merge_attrs; ++ repodata_merge_some_attrs; ++ repodata_new_handle; ++ repodata_schema2id; ++ repodata_search; ++ repodata_set_binary; ++ repodata_set_bin_checksum; ++ repodata_set_checksum; ++ repodata_set_constant; ++ repodata_set_constantid; ++ repodata_set_id; ++ repodata_set_idarray; ++ repodata_set_location; ++ repodata_set_num; ++ repodata_set_poolstr; ++ repodata_setpos_kv; ++ repodata_set_str; ++ repodata_set_void; ++ repodata_shrink; ++ repodata_str2dir; ++ repodata_stringify; ++ repo_disable_paging; ++ repo_empty; ++ repo_fix_conflicts; ++ repo_fix_supplements; ++ repo_free; ++ repo_freeallrepos; ++ repo_free_solvable_block; ++ repo_internalize; ++ repo_last_repodata; ++ repo_lookup_bin_checksum; ++ repo_lookup_checksum; ++ repo_lookup_id; ++ repo_lookup_idarray; ++ repo_lookup_num; ++ repo_lookup_str; ++ repo_lookup_type; ++ repo_lookup_void; ++ repo_matchvalue; ++ repopagestore_compress_page; ++ repopagestore_disable_paging; ++ repopagestore_free; ++ repopagestore_init; ++ repopagestore_load_page_range; ++ repopagestore_read_or_setup_pages; ++ repo_reserve_ids; ++ repo_search; ++ repo_set_id; ++ repo_set_num; ++ repo_set_poolstr; ++ repo_set_str; ++ repo_sidedata_create; ++ repo_sidedata_extend; ++ sat_bin2hex; ++ sat_calloc; ++ sat_chksum_add; ++ sat_chksum_create; ++ sat_chksum_create_from_bin; ++ sat_chksum_free; ++ sat_chksum_get; ++ sat_chksum_get_type; ++ sat_chksum_isfinished; ++ sat_chksum_str2type; ++ sat_chksum_type2str; ++ sat_dupappend; ++ sat_dupjoin; ++ sat_free; ++ sat_hex2bin; ++ sat_malloc; ++ sat_malloc2; ++ sat_MD5_Final; ++ sat_MD5_Init; ++ sat_MD5_Update; ++ sat_oom; ++ sat_realloc; ++ sat_realloc2; ++ sat_SHA1_Final; ++ sat_SHA1_Init; ++ sat_SHA1_Update; ++ sat_SHA256_Data; ++ sat_SHA256_End; ++ sat_SHA256_Final; ++ sat_SHA256_Init; ++ sat_SHA256_Update; ++ sat_SHA384_Data; ++ sat_SHA384_End; ++ sat_SHA384_Final; ++ sat_SHA384_Init; ++ sat_SHA384_Update; ++ sat_SHA512_Data; ++ sat_SHA512_End; ++ sat_SHA512_Final; ++ sat_SHA512_Init; ++ sat_SHA512_Update; ++ sat_sort; ++ sat_timems; ++ sat_version; ++ sat_version_major; ++ sat_version_minor; ++ sat_version_patch; ++ solvable2str; ++ solvable_get_location; ++ solvable_identical; ++ solvable_lookup_bin_checksum; ++ solvable_lookup_bool; ++ solvable_lookup_checksum; ++ solvable_lookup_id; ++ solvable_lookup_idarray; ++ solvable_lookup_num; ++ solvable_lookup_str; ++ solvable_lookup_str_lang; ++ solvable_lookup_str_poollang; ++ solvable_lookup_void; ++ solvable_selfprovidedep; ++ solvable_trivial_installable_map; ++ solvable_trivial_installable_queue; ++ solvable_trivial_installable_repo; ++ solver_addchoicerules; ++ solver_addduprules; ++ solver_addinfarchrules; ++ solver_addrpmrulesforsolvable; ++ solver_addrpmrulesforupdaters; ++ solver_addrpmrulesforweak; ++ solver_addrule; ++ solver_addupdaterule; ++ solver_allruleinfos; ++ solver_calc_duchanges; ++ solver_calc_installsizechange; ++ solver_calculate_noobsmap; ++ solver_create; ++ solver_create_decisions_obsoletesmap; ++ solver_createdupmaps; ++ solver_dep_installed; ++ solver_disablechoicerules; ++ solver_disablepolicyrules; ++ solver_disableproblem; ++ solver_enableproblem; ++ solver_findallproblemrules; ++ solver_findproblemrule; ++ solver_free; ++ solver_freedupmaps; ++ solver_next_problem; ++ solver_next_solution; ++ solver_next_solutionelement; ++ solver_prepare_solutions; ++ solver_printallsolutions; ++ solver_printcompleteprobleminfo; ++ solver_printdecisionq; ++ solver_printdecisions; ++ solver_printproblem; ++ solver_printprobleminfo; ++ solver_printproblemruleinfo; ++ solver_printrule; ++ solver_printruleclass; ++ solver_printruleelement; ++ solver_printsolution; ++ solver_printtransaction; ++ solver_printtrivial; ++ solver_printwatches; ++ solver_problem_count; ++ solver_problemruleinfo; ++ solver_problemruleinfo2str; ++ solver_reenablepolicyrules; ++ solver_reset; ++ solver_ruleinfo; ++ solver_run_sat; ++ solver_samerule; ++ solver_select2str; ++ solver_solution_count; ++ solver_solutionelement2str; ++ solver_solutionelement_count; ++ solver_solve; ++ solver_splitprovides; ++ solver_take_solution; ++ solver_take_solutionelement; ++ solver_trivial_installable; ++ solver_unifyrules; ++ str2id; ++ strn2id; ++ stringpool_clone; ++ stringpool_free; ++ stringpool_freehash; ++ stringpool_init; ++ stringpool_init_empty; ++ stringpool_shrink; ++ stringpool_str2id; ++ stringpool_strn2id; ++ transaction_add_obsoleted; ++ transaction_all_obs_pkgs; ++ transaction_calc_duchanges; ++ transaction_calc_installsizechange; ++ transaction_calculate; ++ transaction_check_order; ++ transaction_classify; ++ transaction_classify_pkgs; ++ transaction_free; ++ transaction_free_orderdata; ++ transaction_init; ++ transaction_init_clone; ++ transaction_installedresult; ++ transaction_obs_pkg; ++ transaction_order; ++ transaction_order_add_choices; ++ transaction_type; ++ vercmp; ++ local: ++ *; ++}; +-- +1.7.4.4 + diff --git a/src/patches/libsatsolver-Make-libsatsolver-ext-a-versioned-shared-lib.patch b/src/patches/libsatsolver-Make-libsatsolver-ext-a-versioned-shared-lib.patch new file mode 100644 index 0000000..449275c --- /dev/null +++ b/src/patches/libsatsolver-Make-libsatsolver-ext-a-versioned-shared-lib.patch @@ -0,0 +1,94 @@ +>From 1f9659b55013f222046b9d161fd5a0f2fc399cb8 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)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(a)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 + hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. ff7614b6e99c6a111be8c33ef08628054f3b3d8a
by git＠ipfire.org 06 May '11

06 May '11

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 ff7614b6e99c6a111be8c33ef08628054f3b3d8a (commit) via 6bb822e8b294d3eac5dbf7e065a4d26cda290052 (commit) from 08517964900c38aee28cbbabcb603c60ec8192d3 (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 ff7614b6e99c6a111be8c33ef08628054f3b3d8a Merge: 6bb822e 0851796 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri May 6 14:19:23 2011 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 6bb822e8b294d3eac5dbf7e065a4d26cda290052 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Thu May 5 17:55:41 2011 +0200 libidn: Update to version 1.22. ----------------------------------------------------------------------- Summary of changes: pkgs/libidn/libidn.nm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/pkgs/libidn/libidn.nm b/pkgs/libidn/libidn.nm index dac6275..3d94af7 100644 --- a/pkgs/libidn/libidn.nm +++ b/pkgs/libidn/libidn.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = libidn -PKG_VER = 1.21 +PKG_VER = 1.22 PKG_REL = 1 PKG_MAINTAINER = @@ -60,5 +60,5 @@ define STAGE_INSTALL -mkdir -pv $(BUILDROOT)/usr/lib rm -vf $(BUILDROOT)/lib/libidn.so - ln -svf ../../lib/libidn.so.11.6.4 $(BUILDROOT)/usr/lib/libidn.so + ln -svf ../../lib/libidn.so.11.6.5 $(BUILDROOT)/usr/lib/libidn.so endef hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a99de963c9f272ec8850002a734dca4aa1f77dae
by git＠ipfire.org 06 May '11

06 May '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. f3905bf8173bfc407dba284aae52034195766f84
by git＠ipfire.org 06 May '11

06 May '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 211ca1f52bb9591ece685a123527c8390ff20b91
by git＠ipfire.org 05 May '11

05 May '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 08517964900c38aee28cbbabcb603c60ec8192d3
by git＠ipfire.org 04 May '11

04 May '11

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 08517964900c38aee28cbbabcb603c60ec8192d3 (commit) via 03f80323dbe1e9cdbb822d39bd3c85e5e2a6fb82 (commit) via de0c7ee9e841026f304252e9ee3da046f4fe9500 (commit) via 607f460048ac2aeef14ec0d9cc143fd2a1845de0 (commit) via 775014b3b475a8ea58fce4afb1b71c896c697ae8 (commit) via d4347a37ef445e1a0de4062fcf514db844b13a47 (commit) via 7a8afe45fec9c3633d583a44e6e823d2dcef187e (commit) from 3cfb2e8c30f9676bab2332424f5b6e935cd5ab8e (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 08517964900c38aee28cbbabcb603c60ec8192d3 Merge: 03f8032 775014b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 5 00:06:41 2011 +0200 Merge remote-tracking branch 'maniacikarus/libidn' commit 03f80323dbe1e9cdbb822d39bd3c85e5e2a6fb82 Merge: de0c7ee 7a8afe4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 5 00:06:37 2011 +0200 Merge remote-tracking branch 'maniacikarus/file' commit de0c7ee9e841026f304252e9ee3da046f4fe9500 Merge: 607f460 d4347a3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 5 00:06:34 2011 +0200 Merge remote-tracking branch 'maniacikarus/coreutils' commit 607f460048ac2aeef14ec0d9cc143fd2a1845de0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 4 23:59:45 2011 +0200 ncurses: Split package into several subpackages. There is: -libs which contains the libs. -base with basic terminal descriptions. -term with all other terminal descriptions. commit 775014b3b475a8ea58fce4afb1b71c896c697ae8 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue May 3 21:10:54 2011 +0200 libidn: Update to version 1.21. Fixes: #188 commit d4347a37ef445e1a0de4062fcf514db844b13a47 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue May 3 20:49:19 2011 +0200 coreutils: Update to version 8.12. Fixes: #191 commit 7a8afe45fec9c3633d583a44e6e823d2dcef187e Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue May 3 20:30:18 2011 +0200 file: Update to version 5.06. Fixes: #193 ----------------------------------------------------------------------- Summary of changes: pkgs/coreutils/coreutils.nm | 2 +- pkgs/file/file.nm | 4 +- pkgs/libidn/libidn.nm | 4 +- pkgs/ncurses/ncurses.nm | 68 +++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 70 insertions(+), 8 deletions(-) Difference in files: diff --git a/pkgs/coreutils/coreutils.nm b/pkgs/coreutils/coreutils.nm index efff4da..6e1da0a 100644 --- a/pkgs/coreutils/coreutils.nm +++ b/pkgs/coreutils/coreutils.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = coreutils -PKG_VER = 8.11 +PKG_VER = 8.12 PKG_REL = 1 PKG_MAINTAINER = diff --git a/pkgs/file/file.nm b/pkgs/file/file.nm index a69483d..bc95461 100644 --- a/pkgs/file/file.nm +++ b/pkgs/file/file.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = file -PKG_VER = 5.05 -PKG_REL = 0 +PKG_VER = 5.06 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUPS = Base System/Tools diff --git a/pkgs/libidn/libidn.nm b/pkgs/libidn/libidn.nm index 16c0726..dac6275 100644 --- a/pkgs/libidn/libidn.nm +++ b/pkgs/libidn/libidn.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = libidn -PKG_VER = 1.20 +PKG_VER = 1.21 PKG_REL = 1 PKG_MAINTAINER = @@ -60,5 +60,5 @@ define STAGE_INSTALL -mkdir -pv $(BUILDROOT)/usr/lib rm -vf $(BUILDROOT)/lib/libidn.so - ln -svf ../../lib/libidn.so.11.6.3 $(BUILDROOT)/usr/lib/libidn.so + ln -svf ../../lib/libidn.so.11.6.4 $(BUILDROOT)/usr/lib/libidn.so endef diff --git a/pkgs/ncurses/ncurses.nm b/pkgs/ncurses/ncurses.nm index 8c5daef..6fd0c33 100644 --- a/pkgs/ncurses/ncurses.nm +++ b/pkgs/ncurses/ncurses.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = ncurses PKG_VER = 5.9 -PKG_REL = 1 +PKG_REL = 2 PKG_MAINTAINER = PKG_GROUPS = System/Base @@ -45,8 +45,6 @@ endef PKG_TARBALL = $(THISAPP).tar.gz -PKG_PACKAGES += $(PKG_NAME_REAL)-devel - CONFIGURE_OPTIONS += \ --mandir=/usr/share/man \ --with-shared \ @@ -69,3 +67,67 @@ define STAGE_INSTALL_CMDS echo "INPUT(-lncursesw)" >$(BUILDROOT)/usr/lib/libcursesw.so ln -sfv libncurses.so $(BUILDROOT)/usr/lib/libcurses.so endef + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel $(PKG_NAME_REAL)-libs + + +# ncurses-term +PKG_PACKAGES += $(PKG_NAME_REAL)-term + +PKG_SUMMARY-$(PKG_NAME)-term = Terminal descriptions for ncurses. + +define PKG_DESCRIPTION-$(PKG_NAME)-term + This package contains additional terminal descriptions not found in + the ncurses-base package. +endef + +PKG_FILES-$(PKG_NAME)-term = /usr/share/terminfo + + +# ncurses-base +PKG_PACKAGES += $(PKG_NAME)-base + +# The -libs packages does depend on this. +PKG_DEPS-$(PKG_NAME)-libs += $(PKG_NAME)-base + +PKG_SUMMARY-$(PKG_NAME)-base = Terminal descriptions. + +define PKG_DESCRIPTION-$(PKG_NAME)-base + This package contains descriptions of common terminals. Other terminal + descriptions are included in the ncurses-term package. +endef + +define PKG_FILES-$(PKG_NAME)-base + /usr/share/terminfo/*/Eterm* + /usr/share/terminfo/*/aterm + /usr/share/terminfo/*/bterm + /usr/share/terminfo/*/cons25 + /usr/share/terminfo/*/cygwin + /usr/share/terminfo/*/eterm* + /usr/share/terminfo/*/gnome + /usr/share/terminfo/*/gnome-256color + /usr/share/terminfo/*/hurd + /usr/share/terminfo/*/jfbterm + /usr/share/terminfo/*/konsole + /usr/share/terminfo/*/konsole-256color + /usr/share/terminfo/*/mach* + /usr/share/terminfo/*/mlterm + /usr/share/terminfo/*/mrxvt + /usr/share/terminfo/*/nsterm + /usr/share/terminfo/*/putty* + /usr/share/terminfo/*/pcansi + /usr/share/terminfo/*/rxvt + /usr/share/terminfo/*/rxvt-* + /usr/share/terminfo/*/screen + /usr/share/terminfo/*/screen-*color + /usr/share/terminfo/*/screen.* + /usr/share/terminfo/*/sun + /usr/share/terminfo/*/teraterm + /usr/share/terminfo/*/teraterm2.3 + /usr/share/terminfo/*/vte + /usr/share/terminfo/*/vte-256color + /usr/share/terminfo/*/vwmterm + /usr/share/terminfo/*/wsvt25* + /usr/share/terminfo/*/xfce + /usr/share/terminfo/*/xterm xterm-* +endef hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. d05c4e8f5ce93e85310f43fc71cb495a63d4f0ec
by git＠ipfire.org 03 May '11

03 May '11

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM May 2011