[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 57b732dbec865b4a47644a8d71a7fa1b11e36586 - IPFire-SCM

9 Mar 2011

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  57b732dbec865b4a47644a8d71a7fa1b11e36586 (commit)
       via  ecd3c6347ac99f24a7366a626ae40558c1ac2daf (commit)
       via  9bb4953ab1490bdc898832f5c959b1fa3692d9a6 (commit)
       via  0c9e602e59930ce7846f915718c22f4d0a6da37f (commit)
      from  06ff00a58d2a9e96d06b723c556683982f53bf9a (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 57b732dbec865b4a47644a8d71a7fa1b11e36586
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 9 01:26:09 2011 +0100
pakfire: Update to 0.9.2.
commit ecd3c6347ac99f24a7366a626ae40558c1ac2daf
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 9 01:17:29 2011 +0100
perl: Filter misgenerated provides/requires.
commit 9bb4953ab1490bdc898832f5c959b1fa3692d9a6
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 9 01:17:02 2011 +0100
ebtables: Filter accidently scanned requires.
commit 0c9e602e59930ce7846f915718c22f4d0a6da37f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Mar 9 01:16:36 2011 +0100
build-essentials: Add support to filter weird provides or requires.
-----------------------------------------------------------------------
Summary of changes:
 pkgs/build-essentials/build-essentials.nm          |    2 +-
 .../buildsystem-tools/functions-packager-find      |   17 +++++-
 pkgs/build-essentials/buildsystem/Constants        |    5 +-
 pkgs/ebtables/ebtables.nm                          |    4 +-
 pkgs/pakfire/pakfire.nm                            |    4 +-
 pkgs/perl/perl.nm                                  |   68 +++++++++++++++++++-
 6 files changed, 93 insertions(+), 7 deletions(-)
Difference in files:

diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm
index b70c0b4..d6f10cd 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        = 4
+PKG_REL        = 5
 PKG_EPOCH      = 1
 PKG_ARCH       = noarch
diff --git a/pkgs/build-essentials/buildsystem-tools/functions-packager-find b/pkgs/build-essentials/buildsystem-tools/functions-packager-find
index 80f5457..246c248 100644
--- a/pkgs/build-essentials/buildsystem-tools/functions-packager-find
+++ b/pkgs/build-essentials/buildsystem-tools/functions-packager-find
@@ -49,6 +49,11 @@ function find_requires() {
    local requires
    for require in $(listsort ${PKG_DEPS} ${interpreters} ${neededs} ${links} ${others}); do
    	[ "${require:0:3}" = "ld-" ] && continue
+
+		if [ -n "${PKG_REQUIRES_FILTER}" ]; then
+			grep -qE "${PKG_REQUIRES_FILTER}" <<< "${require}" && continue
+		fi
+
    	listmatch ${require} ${provides} || requires="${requires} ${require}"
    done
@@ -71,7 +76,17 @@ function find_provides() {
    others="${others} $(find_perl_provides ${dirs})"
    others="${others} $(find_pkgconfig_provides ${dirs})"
-	listsort ${PKG_PROVIDES} ${sonames} ${others}
+	local provide
+	local provides
+	for provide in $(listsort ${PKG_PROVIDES} ${sonames} ${others}); do
+		if [ -n "${PKG_PROVIDES_FILTER}" ]; then
+			grep -qE "${PKG_PROVIDES_FILTER}" <<< "${provide}" && continue
+		fi
+
+		provides="${provides} ${provide}"
+	done
+
+	echo ${provides}
 }
function find_interpreters() {
diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants
index 3159e32..e23671a 100644
--- a/pkgs/build-essentials/buildsystem/Constants
+++ b/pkgs/build-essentials/buildsystem/Constants
@@ -73,7 +73,10 @@ PKG_VARIABLES = \
    PKG_RELEASE \
    PKG_SUMMARY \
    PKG_URL \
-	PKG_VER
+	PKG_VER \
+	\
+	PKG_PROVIDES_FILTER \
+	PKG_REQUIRES_FILTER
# Variables that exported to the packager process
 # These reflect settings from the build system
diff --git a/pkgs/ebtables/ebtables.nm b/pkgs/ebtables/ebtables.nm
index 7be3632..6d0254f 100644
--- a/pkgs/ebtables/ebtables.nm
+++ b/pkgs/ebtables/ebtables.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = ebtables
 PKG_VER        = v2.0.9-2
-PKG_REL        = 0
+PKG_REL        = 1
PKG_MAINTAINER =
 PKG_GROUP      = Networking/Tools
@@ -44,6 +44,8 @@ PKG_TARBALL    = $(THISAPP).tar.gz
CFLAGS += -Wall
+PKG_REQUIRES_FILTER = libebt
+
 define QUALITY_AGENT_WHITELIST_RPATH
    /lib/ebtables
 endef
diff --git a/pkgs/pakfire/pakfire.nm b/pkgs/pakfire/pakfire.nm
index e3cdc39..8d50c08 100644
--- a/pkgs/pakfire/pakfire.nm
+++ b/pkgs/pakfire/pakfire.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
PKG_NAME       = pakfire
-PKG_VER        = 0.9.1
+PKG_VER        = 0.9.2
 PKG_REL        = 1
 PKG_ARCH       = noarch
@@ -35,7 +35,7 @@ PKG_URL        = http://www.ipfire.org/
 PKG_LICENSE    = GPLv3+
 PKG_SUMMARY    = Package installer/updater.
-PKG_BUILD_DEPS = python-devel python-distutils-extra
+PKG_BUILD_DEPS = python-devel python-distutils-extra $(PKG_DEPS)
 PKG_DEPS      += pyliblzma python-progressbar python-urlgrabber pyxattr \
    system-release
diff --git a/pkgs/perl/perl.nm b/pkgs/perl/perl.nm
index c9a8cec..a556292 100644
--- a/pkgs/perl/perl.nm
+++ b/pkgs/perl/perl.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME       = perl
 PKG_VER        = 5.12.3
-PKG_REL        = 2
+PKG_REL        = 3
PKG_MAINTAINER =
 PKG_GROUP      = Development/Languages
@@ -50,12 +50,78 @@ endef
PKG_TARBALL    = $(THISAPP).tar.gz
+# Filter string for very weird dependencies.
+PKG_REQUIRES_FILTER = (DBD::SQLite|DBIx::Simple|perl>=[0-9]:.*|NDBM_File|Your::Module::Here|FCGI|Mac::.*)
+
 define QUALITY_AGENT_WHITELIST_RPATH
    /lib
    /usr/lib
    /usr/lib/perl5/CORE
 endef
+# These provides are needed by the perl pkg itself with auto-generated perl.req
+PKG_PROVIDES-perl += \
+	perl(VMS::Filespec) \
+	perl(VMS::Stdio)
+
+# Compat provides
+PKG_PROVIDES-perl += \
+	perl(:MODULE_COMPAT_5.12.3) \
+	perl(:MODULE_COMPAT_5.12.2) \
+	perl(:MODULE_COMPAT_5.12.1) \
+	perl(:MODULE_COMPAT_5.12.0)
+
+# Threading provides
+PKG_PROVIDES-perl += \
+	perl(:WITH_ITHREADS) \
+	perl(:WITH_THREADS)
+
+# Largefile provides
+PKG_PROVIDES-perl += perl(:WITH_LARGEFILES)
+
+# PerlIO provides
+PKG_PROVIDES-perl += perl(:WITH_PERLIO)
+
+# File provides
+PKG_PROVIDES-perl += \
+	perl(abbrev.pl) \
+	perl(assert.pl) \
+	perl(bigfloat.pl) \
+	perl(bigint.pl) \
+	perl(bigrat.pl) \
+	perl(bytes_heavy.pl) \
+	perl(cacheout.pl) \
+	perl(complete.pl) \
+	perl(ctime.pl) \
+	perl(dotsh.pl) \
+	perl(dumpvar.pl) \
+	perl(exceptions.pl) \
+	perl(fastcwd.pl) \
+	perl(find.pl) \
+	perl(finddepth.pl) \
+	perl(flush.pl) \
+	perl(ftp.pl) \
+	perl(getcwd.pl) \
+	perl(getopt.pl) \
+	perl(getopts.pl) \
+	perl(hostname.pl) \
+	perl(importenv.pl) \
+	perl(look.pl) \
+	perl(newgetopt.pl) \
+	perl(open2.pl) \
+	perl(open3.pl) \
+	perl(perl5db.pl) \
+	perl(pwd.pl) \
+	perl(shellwords.pl) \
+	perl(stat.pl) \
+	perl(syslog.pl) \
+	perl(tainted.pl) \
+	perl(termcap.pl) \
+	perl(timelocal.pl) \
+	perl(utf8_heavy.pl) \
+	perl(validate.pl) \
+	perl(Carp::Heavy)
+
 define STAGE_PREPARE_CMDS
    cd $(DIR_APP) && sed -i 's/command /command[ -]/' makedepend.SH
 endef
hooks/post-receive
--
IPFire 3.x development tree

    