IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7852 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d1987759f4d6fd82ace6e63283db0ef31ec1dd0d
by git＠ipfire.org 17 Jul '11

17 Jul '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 d1987759f4d6fd82ace6e63283db0ef31ec1dd0d (commit) via 8c9716f7198c8a875b1013c757cb91f8ffc8bf11 (commit) via a9d3e87aa21700ed15e32db610f39b758d0b2543 (commit) via 9acd130ec75b6b182e626c996d7c74d0dc5428e1 (commit) from d78457e94e5e0172431e0cf118875fb5ca491459 (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 d1987759f4d6fd82ace6e63283db0ef31ec1dd0d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 17 21:26:36 2011 +0200 python-satsolver: Remove package which is not needed anymore. commit 8c9716f7198c8a875b1013c757cb91f8ffc8bf11 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 17 21:19:08 2011 +0200 libsatsolver: Update to current version from git repository (c57e9df). commit a9d3e87aa21700ed15e32db610f39b758d0b2543 Merge: 9acd130 d78457e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 17 20:20:57 2011 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 9acd130ec75b6b182e626c996d7c74d0dc5428e1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 17 16:03:20 2011 +0200 build-essentials: Always package /usr/share/pkgconfig in -devel package. ----------------------------------------------------------------------- Summary of changes: pkgs/build-essentials/build-essentials.nm | 2 +- pkgs/build-essentials/buildsystem/Templates | 1 + pkgs/libsatsolver/libsatsolver.nm | 6 +- ...er-scripts-that-do-only-export-the-needed.patch | 439 -------------------- .../patches/fix-building-without-rpm.patch | 37 -- .../python-satsolver-only-python-bindings.patch | 27 -- pkgs/python-satsolver/python-satsolver.nm | 62 --- 7 files changed, 6 insertions(+), 568 deletions(-) delete mode 100644 pkgs/libsatsolver/patches/0001-Create-linker-scripts-that-do-only-export-the-needed.patch delete mode 100644 pkgs/python-satsolver/patches/fix-building-without-rpm.patch delete mode 100644 pkgs/python-satsolver/patches/python-satsolver-only-python-bindings.patch delete mode 100644 pkgs/python-satsolver/python-satsolver.nm Difference in files: diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index 1034d6b..c708204 100644 --- a/pkgs/build-essentials/build-essentials.nm +++ b/pkgs/build-essentials/build-essentials.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = build-essentials PKG_VER = $(DISTRO_VERSION) -PKG_REL = 19 +PKG_REL = 20 PKG_EPOCH = 1 PKG_ARCH = noarch diff --git a/pkgs/build-essentials/buildsystem/Templates b/pkgs/build-essentials/buildsystem/Templates index e632adf..abf1ab0 100644 --- a/pkgs/build-essentials/buildsystem/Templates +++ b/pkgs/build-essentials/buildsystem/Templates @@ -31,6 +31,7 @@ define PKG_FILES-$(PKG_NAME_REAL)-devel /usr/share/*/cmake /usr/share/man/man2 /usr/share/man/man3 + /usr/share/pkgconfig /usr/share/vala endef diff --git a/pkgs/libsatsolver/libsatsolver.nm b/pkgs/libsatsolver/libsatsolver.nm index 94f29cd..3b33806 100644 --- a/pkgs/libsatsolver/libsatsolver.nm +++ b/pkgs/libsatsolver/libsatsolver.nm @@ -26,7 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = libsatsolver PKG_VER = 0.16.4 -PKG_REL = 4 +GIT_VER = c57e9df +PKG_REL = 5 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUPS = System/Libraries @@ -40,7 +41,8 @@ define PKG_DESCRIPTION This package contains a very fast SAT resolver written in C++. endef -PKG_TARBALL = $(THISAPP).tar.bz2 +THISAPP = $(PKG_NAME)-$(PKG_VER)-$(GIT_VER) +PKG_TARBALL = $(THISAPP).tar.xz PKG_PACKAGES += $(PKG_NAME)-devel diff --git a/pkgs/libsatsolver/patches/0001-Create-linker-scripts-that-do-only-export-the-needed.patch b/pkgs/libsatsolver/patches/0001-Create-linker-scripts-that-do-only-export-the-needed.patch deleted file mode 100644 index 5ba4fa2..0000000 --- a/pkgs/libsatsolver/patches/0001-Create-linker-scripts-that-do-only-export-the-needed.patch +++ /dev/null @@ -1,439 +0,0 @@ ->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/pkgs/python-satsolver/patches/fix-building-without-rpm.patch b/pkgs/python-satsolver/patches/fix-building-without-rpm.patch deleted file mode 100644 index 68e2767..0000000 --- a/pkgs/python-satsolver/patches/fix-building-without-rpm.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 - diff --git a/pkgs/python-satsolver/patches/python-satsolver-only-python-bindings.patch b/pkgs/python-satsolver/patches/python-satsolver-only-python-bindings.patch deleted file mode 100644 index 36905d0..0000000 --- a/pkgs/python-satsolver/patches/python-satsolver-only-python-bindings.patch +++ /dev/null @@ -1,27 +0,0 @@ -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/pkgs/python-satsolver/python-satsolver.nm b/pkgs/python-satsolver/python-satsolver.nm deleted file mode 100644 index c0c4838..0000000 --- a/pkgs/python-satsolver/python-satsolver.nm +++ /dev/null @@ -1,62 +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 = python-satsolver -PKG_VER = 0.16.0-20110429-868eae9 -PKG_REL = 1 - -PKG_MAINTAINER = -PKG_GROUPS = System/Libraries -PKG_URL = https://gitorious.org/+opensuse-developers/opensuse/sat-solver-bindings -PKG_LICENSE = BSD -PKG_SUMMARY = libsatsolver python bindings. - -PKG_BUILD_DEPS+= cmake gcc-c++ expat-devel libsatsolver-devel>=0.16.4-3 \ - python-devel swig zlib-devel - -define PKG_DESCRIPTION - libsatsolver python bindings for use with python programs. -endef - -PKG_TARBALL = sat-solver-bindings-$(PKG_VER).tar.xz - -DIR_APP = $(DIR_SRC) - -define STAGE_BUILD - cd $(DIR_APP) && mkdir build - cd $(DIR_APP)/build && cmake .. \ - -DDEBIAN=1 \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=1 - cd $(DIR_APP)/build && make $(PARALELLISMFLAGS) -endef - -define STAGE_INSTALL - # Install only the python bindings. That's all we need. - cd $(DIR_APP)/build/bindings/python && \ - make install DESTDIR=$(BUILDROOT) -endef hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d78457e94e5e0172431e0cf118875fb5ca491459
by git＠ipfire.org 17 Jul '11

17 Jul '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 d78457e94e5e0172431e0cf118875fb5ca491459 (commit) from 696c8a02e64af5a919a72b4d4713b061356621a6 (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 d78457e94e5e0172431e0cf118875fb5ca491459 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 17 19:00:07 2011 +0200 cloog-ppl: Fix renaming of the package. I totally screwed up. ----------------------------------------------------------------------- Summary of changes: pkgs/{cloog/cloog.nm => cloog-ppl/cloog-ppl.nm} | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) rename pkgs/{cloog/cloog.nm => cloog-ppl/cloog-ppl.nm} (92%) Difference in files: diff --git a/pkgs/cloog-ppl/cloog-ppl.nm b/pkgs/cloog-ppl/cloog-ppl.nm new file mode 100644 index 0000000..098d682 --- /dev/null +++ b/pkgs/cloog-ppl/cloog-ppl.nm @@ -0,0 +1,60 @@ +############################################################################### +# # +# 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 = cloog-ppl +PKG_VER = 0.15.9 +PKG_REL = 3 + +PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> +PKG_GROUPS = System/Libraries +PKG_URL = http://www.cloog.org +PKG_LICENSE = GPLv2+ +PKG_SUMMARY = The Chunky Loop Generator. + +PKG_BUILD_DEPS+= autoconf automake gmp-devel m4 ppl-devel>=0.11.2 + +define PKG_DESCRIPTION + CLooG is a software which generates loops for scanning Z-polyhedra. That is, \ + CLooG finds the code or pseudo-code where each integral point of one or more \ + parametrized polyhedron or parametrized polyhedra union is reached. CLooG is \ + designed to avoid control overhead and to produce a very efficient code. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + +CONFIGURE_OPTIONS += \ + --with-ppl + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && sed -i configure \ + -e "s/ppl_minor_version=10/ppl_minor_version=11/" +endef + +define STAGE_TEST + cd $(DIR_APP) && make check +endef diff --git a/pkgs/cloog/cloog.nm b/pkgs/cloog/cloog.nm deleted file mode 100644 index 6d1c883..0000000 --- a/pkgs/cloog/cloog.nm +++ /dev/null @@ -1,62 +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 = cloog -PKG_VER = 0.15.9 -PKG_REL = 2 - -PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> -PKG_GROUPS = System/Libraries -PKG_URL = http://www.cloog.org -PKG_LICENSE = GPLv2+ -PKG_SUMMARY = The Chunky Loop Generator. - -PKG_BUILD_DEPS+= autoconf automake gmp-devel m4 ppl-devel>=0.11.2 - -define PKG_DESCRIPTION - CLooG is a software which generates loops for scanning Z-polyhedra. That is, \ - CLooG finds the code or pseudo-code where each integral point of one or more \ - parametrized polyhedron or parametrized polyhedra union is reached. CLooG is \ - designed to avoid control overhead and to produce a very efficient code. -endef - -PKG_TARBALL = $(PKG_NAME)-ppl-$(PKG_VER).tar.gz - -PKG_PACKAGES = $(PKG_NAME_REAL)-ppl $(PKG_NAME_REAL)-ppl-devel - -DIR_APP = $(DIR_SRC)/$(PKG_NAME)-ppl-$(PKG_VER) - -CONFIGURE_OPTIONS += \ - --with-ppl - -define STAGE_PREPARE_CMDS - cd $(DIR_APP) && sed -i configure \ - -e "s/ppl_minor_version=10/ppl_minor_version=11/" -endef - -define STAGE_TEST - cd $(DIR_APP) && make check -endef hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 696c8a02e64af5a919a72b4d4713b061356621a6
by git＠ipfire.org 17 Jul '11

17 Jul '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 696c8a02e64af5a919a72b4d4713b061356621a6 (commit) via a4f22872c1b928e7dcef064caa2d522a1754bb92 (commit) from 63c28eecda75db7a22842c8bfbe17085bb44ee6f (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 696c8a02e64af5a919a72b4d4713b061356621a6 Merge: 63c28ee a4f2287 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 17 14:03:31 2011 +0200 Merge remote-tracking branch 'stevee/updates' commit a4f22872c1b928e7dcef064caa2d522a1754bb92 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Jul 10 21:24:00 2011 +0200 systemd: Update to 29. ----------------------------------------------------------------------- Summary of changes: ...manpages.patch => systemd-29-no-manpages.patch} | 14 +++++++------- pkgs/systemd/systemd.nm | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) rename pkgs/systemd/patches/{systemd-28-no-manpages.patch => systemd-29-no-manpages.patch} (89%) Difference in files: diff --git a/pkgs/systemd/patches/systemd-28-no-manpages.patch b/pkgs/systemd/patches/systemd-28-no-manpages.patch deleted file mode 100644 index 9685c60..0000000 --- a/pkgs/systemd/patches/systemd-28-no-manpages.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -Nur a/Makefile.am b/Makefile.am ---- a/Makefile.am 2011-05-26 19:18:54.000000000 +0200 -+++ b/Makefile.am 2011-06-04 20:56:50.863488131 +0200 -@@ -567,79 +567,13 @@ - src/readahead-common.h \ - src/ask-password-api.h - --MANPAGES = \ -- man/systemd.1 \ -- man/systemctl.1 \ -- man/systemadm.1 \ -- man/systemd-cgls.1 \ -- man/systemd-nspawn.1 \ -- man/systemd-tmpfiles.8 \ -- man/systemd-notify.1 \ -- man/sd_notify.3 \ -- man/sd_readahead.3 \ -- man/sd_booted.3 \ -- man/sd_listen_fds.3 \ -- man/sd_is_fifo.3 \ -- man/systemd.unit.5 \ -- man/systemd.service.5 \ -- man/systemd.socket.5 \ -- man/systemd.mount.5 \ -- man/systemd.automount.5 \ -- man/systemd.swap.5 \ -- man/systemd.timer.5 \ -- man/systemd.path.5 \ -- man/systemd.target.5 \ -- man/systemd.device.5 \ -- man/systemd.snapshot.5 \ -- man/systemd.exec.5 \ -- man/daemon.7 \ -- man/sd-daemon.7 \ -- man/sd-readahead.7 \ -- man/runlevel.8 \ -- man/telinit.8 \ -- man/halt.8 \ -- man/shutdown.8 \ -- man/pam_systemd.8 \ -- man/systemd.conf.5 \ -- man/tmpfiles.d.5 \ -- man/hostname.5 \ -- man/machine-id.5 \ -- man/vconsole.conf.5 \ -- man/locale.conf.5 \ -- man/os-release.5 \ -- man/machine-info.5 \ -- man/modules-load.d.5 \ -- man/sysctl.d.5 \ -- man/systemd-ask-password.1 -+MANPAGES = # - --if ENABLE_BINFMT --MANPAGES += \ -- man/binfmt.d.5 --endif -+MANPAGES_ALIAS = # - --MANPAGES_ALIAS = \ -- man/reboot.8 \ -- man/poweroff.8 \ -- man/sd_is_socket.3 \ -- man/sd_is_socket_unix.3 \ -- man/sd_is_socket_inet.3 \ -- man/sd_notifyf.3 \ -- man/init.1 -- --man/reboot.8: man/halt.8 --man/poweroff.8: man/halt.8 --man/sd_is_socket.3: man/sd_is_fifo.3 --man/sd_is_socket_unix.3: man/sd_is_fifo.3 --man/sd_is_socket_inet.3: man/sd_is_fifo.3 --man/sd_notifyf.3: man/sd_notify.3 --man/init.1: man/systemd.1 -- --dist_man_MANS = \ -- $(MANPAGES) \ -- $(MANPAGES_ALIAS) -+dist_man_MANS = # - --nodist_man_MANS = \ -- man/systemd.special.7 -+nodist_man_MANS = # - - XML_FILES = \ - ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} diff --git a/pkgs/systemd/patches/systemd-29-no-manpages.patch b/pkgs/systemd/patches/systemd-29-no-manpages.patch new file mode 100644 index 0000000..f935d25 --- /dev/null +++ b/pkgs/systemd/patches/systemd-29-no-manpages.patch @@ -0,0 +1,87 @@ +diff -Nur a/Makefile.am b/Makefile.am +--- a/Makefile.am 2011-06-16 13:17:51.000000000 +0200 ++++ b/Makefile.am 2011-07-10 19:09:54.169403422 +0200 +@@ -565,79 +565,13 @@ + src/readahead-common.h \ + src/ask-password-api.h + +-MANPAGES = \ +- man/systemd.1 \ +- man/systemctl.1 \ +- man/systemadm.1 \ +- man/systemd-cgls.1 \ +- man/systemd-nspawn.1 \ +- man/systemd-tmpfiles.8 \ +- man/systemd-notify.1 \ +- man/sd_notify.3 \ +- man/sd_readahead.3 \ +- man/sd_booted.3 \ +- man/sd_listen_fds.3 \ +- man/sd_is_fifo.3 \ +- man/systemd.unit.5 \ +- man/systemd.service.5 \ +- man/systemd.socket.5 \ +- man/systemd.mount.5 \ +- man/systemd.automount.5 \ +- man/systemd.swap.5 \ +- man/systemd.timer.5 \ +- man/systemd.path.5 \ +- man/systemd.target.5 \ +- man/systemd.device.5 \ +- man/systemd.snapshot.5 \ +- man/systemd.exec.5 \ +- man/daemon.7 \ +- man/sd-daemon.7 \ +- man/sd-readahead.7 \ +- man/runlevel.8 \ +- man/telinit.8 \ +- man/halt.8 \ +- man/shutdown.8 \ +- man/pam_systemd.8 \ +- man/systemd.conf.5 \ +- man/tmpfiles.d.5 \ +- man/hostname.5 \ +- man/machine-id.5 \ +- man/vconsole.conf.5 \ +- man/locale.conf.5 \ +- man/os-release.5 \ +- man/machine-info.5 \ +- man/modules-load.d.5 \ +- man/sysctl.d.5 \ +- man/systemd-ask-password.1 ++MANPAGES = + +-if ENABLE_BINFMT +-MANPAGES += \ +- man/binfmt.d.5 +-endif ++MANPAGES_ALIAS = + +-MANPAGES_ALIAS = \ +- man/reboot.8 \ +- man/poweroff.8 \ +- man/sd_is_socket.3 \ +- man/sd_is_socket_unix.3 \ +- man/sd_is_socket_inet.3 \ +- man/sd_notifyf.3 \ +- man/init.1 +- +-man/reboot.8: man/halt.8 +-man/poweroff.8: man/halt.8 +-man/sd_is_socket.3: man/sd_is_fifo.3 +-man/sd_is_socket_unix.3: man/sd_is_fifo.3 +-man/sd_is_socket_inet.3: man/sd_is_fifo.3 +-man/sd_notifyf.3: man/sd_notify.3 +-man/init.1: man/systemd.1 +- +-dist_man_MANS = \ +- $(MANPAGES) \ +- $(MANPAGES_ALIAS) ++dist_man_MANS = + +-nodist_man_MANS = \ +- man/systemd.special.7 ++nodist_man_MANS = + + XML_FILES = \ + ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} diff --git a/pkgs/systemd/systemd.nm b/pkgs/systemd/systemd.nm index 843845d..0b92e32 100644 --- a/pkgs/systemd/systemd.nm +++ b/pkgs/systemd/systemd.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = systemd -PKG_VER = 28 -PKG_REL = 3 +PKG_VER = 29 +PKG_REL = 1 PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUPS = System/Base hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 63c28eecda75db7a22842c8bfbe17085bb44ee6f
by git＠ipfire.org 17 Jul '11

17 Jul '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 63c28eecda75db7a22842c8bfbe17085bb44ee6f (commit) from f0d77f5d9dbda65c3bb3913ce8935515a01ff662 (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 63c28eecda75db7a22842c8bfbe17085bb44ee6f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 17 12:54:23 2011 +0200 cloog: Bump release version. ----------------------------------------------------------------------- Summary of changes: pkgs/cloog/cloog.nm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/pkgs/cloog/cloog.nm b/pkgs/cloog/cloog.nm index 1c955f2..6d1c883 100644 --- a/pkgs/cloog/cloog.nm +++ b/pkgs/cloog/cloog.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = cloog PKG_VER = 0.15.9 -PKG_REL = 1 +PKG_REL = 2 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUPS = System/Libraries hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f0d77f5d9dbda65c3bb3913ce8935515a01ff662
by git＠ipfire.org 16 Jul '11

16 Jul '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. e1102ce9f83d7c4f0ea5be4ad63adb58d63a228e
by git＠ipfire.org 15 Jul '11

15 Jul '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. fb68cdcc55136d363f2d7d60c364c1320653202f
by git＠ipfire.org 15 Jul '11

15 Jul '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 fb68cdcc55136d363f2d7d60c364c1320653202f (commit) via 75ef154bdff06d03276f858bd1e2db779b17ca77 (commit) from 9aa13044902ceadc58865ed6354e0c237987dde9 (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 fb68cdcc55136d363f2d7d60c364c1320653202f Merge: 75ef154 9aa1304 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 15 23:36:30 2011 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 75ef154bdff06d03276f858bd1e2db779b17ca77 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 15 18:07:14 2011 +0200 mpc: Fix build of shared libs. ----------------------------------------------------------------------- Summary of changes: pkgs/mpc/mpc.nm | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) Difference in files: diff --git a/pkgs/mpc/mpc.nm b/pkgs/mpc/mpc.nm index c720c7f..163a705 100644 --- a/pkgs/mpc/mpc.nm +++ b/pkgs/mpc/mpc.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = mpc PKG_VER = 0.9 -PKG_REL = 0 +PKG_REL = 1 PKG_MAINTAINER = PKG_GROUPS = System/Libraries @@ -46,6 +46,9 @@ PKG_TARBALL = $(THISAPP).tar.gz PKG_PACKAGES += $(PKG_NAME_REAL)-devel +# http://lists.gforge.inria.fr/pipermail/mpc-discuss/2011-February/000805.html +export EGREP=egrep + define STAGE_TEST cd $(DIR_APP) && make check endef hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. cffed7aa4b730c3d961b6c135d9d7d9f3964b97c
by git＠ipfire.org 14 Jul '11

14 Jul '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, next has been updated via cffed7aa4b730c3d961b6c135d9d7d9f3964b97c (commit) from 7c6248e1b578bc51a4dad9b8d0f562c2081fabba (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 cffed7aa4b730c3d961b6c135d9d7d9f3964b97c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jul 14 22:55:29 2011 +0200 qemu: switch to qemu-kvm to support more kvm features. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/qemu | 2 ++ lfs/qemu | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index d061319..f04fdfb 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -14,6 +14,7 @@ usr/bin/qemu-nbd usr/share/qemu usr/share/qemu/bamboo.dtb usr/share/qemu/bios.bin +usr/share/qemu/extboot.bin usr/share/qemu/gpxe-eepro100-80861209.rom usr/share/qemu/keymaps usr/share/qemu/keymaps/ar @@ -64,6 +65,7 @@ usr/share/qemu/pxe-pcnet.bin usr/share/qemu/pxe-rtl8139.bin usr/share/qemu/pxe-virtio.bin usr/share/qemu/s390-zipl.rom +usr/share/qemu/vapic.bin usr/share/qemu/vgabios-cirrus.bin usr/share/qemu/vgabios-qxl.bin usr/share/qemu/vgabios-stdvga.bin diff --git a/lfs/qemu b/lfs/qemu index 03c20d5..2751550 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -26,13 +26,13 @@ include Config VER = 0.14.1 -THISAPP = qemu-$(VER) +THISAPP = qemu-kvm-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu -PAK_VER = 11 +PAK_VER = 12 DEPS = "sdl" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b6c713a8db638e173af53a62d5178640 +$(DL_FILE)_MD5 = ed37a2c0b1981220b842920140574c63 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. 7c6248e1b578bc51a4dad9b8d0f562c2081fabba
by git＠ipfire.org 13 Jul '11

13 Jul '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, next has been updated via 7c6248e1b578bc51a4dad9b8d0f562c2081fabba (commit) via 7b57b6f44151e64ac223524e13fc4b46d78ed1c3 (commit) via c882707abe265b825831770c6c6f8061f42092ca (commit) from 504d7a75581d39ef8fbff8a5da33f1efabc8b7f3 (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 7c6248e1b578bc51a4dad9b8d0f562c2081fabba Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jul 13 22:55:03 2011 +0200 kernel: update to 2.6.32.43. commit 7b57b6f44151e64ac223524e13fc4b46d78ed1c3 Merge: 504d7a7 c882707 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 12 22:30:47 2011 +0200 Merge commit 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: config/cfgroot/graphs.pl | 1 - lfs/linux | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 5eb96d8..8d047c2 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -1009,7 +1009,6 @@ sub updatecpufreqgraph { "--alt-y-grid", "-w 600", "-h 125", - "-l 0", "-r", "-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period}, "-v MHz", diff --git a/lfs/linux b/lfs/linux index 940b36b..c39fb74 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -PATCHLEVEL = .42 -VER = 2.6.32.42 +PATCHLEVEL = .43 +VER = 2.6.32.43 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -68,7 +68,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2 -$(DL_FILE)_MD5 = f1bb2e5ff5ae8d552e6cedeaa70da25e +$(DL_FILE)_MD5 = d6819da012da0d9772ac79da9dce3d63 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c882707abe265b825831770c6c6f8061f42092ca
by git＠ipfire.org 12 Jul '11

12 Jul '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 c882707abe265b825831770c6c6f8061f42092ca (commit) from 70618607ef700161b5ad688338424e79334ef3ff (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 c882707abe265b825831770c6c6f8061f42092ca Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue Jul 12 07:45:00 2011 +0200 graphs.pl remove lower bound for frequencies ----------------------------------------------------------------------- Summary of changes: config/cfgroot/graphs.pl | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 5eb96d8..8d047c2 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -1009,7 +1009,6 @@ sub updatecpufreqgraph { "--alt-y-grid", "-w 600", "-h 125", - "-l 0", "-r", "-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period}, "-v MHz", hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM