###############################################################################
name = pakfire
-version = 0.9.20
-release = 7
+version = 0.9.21
+release = 1
maintainer = Michael Tremer <michael.tremer@ipfire.org>
groups = System/Packaging
+++ /dev/null
-From 0f8823593c2c815b3dc2c7c9cb74b4d7a6b218de Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer@ipfire.org>
-Date: Wed, 29 Feb 2012 12:29:07 +0100
-Subject: [PATCH] Change default hub to pakfirehub.ipfire.org.
-
----
- examples/client.conf | 2 +-
- examples/daemon.conf | 2 +-
- python/pakfire/client/base.py | 2 +-
- python/pakfire/config.py | 4 ++--
- python/pakfire/constants.py | 3 +++
- 5 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/examples/client.conf b/examples/client.conf
-index da57d03..6c59de9 100644
---- a/examples/client.conf
-+++ b/examples/client.conf
-@@ -3,7 +3,7 @@
- [client]
-
- # The URL of the server to connect to.
--# server = https://pakfire.ipfire.org/
-+# server = https://pakfirehub.ipfire.org/
-
- # Your credentials to log in on the hub.
- # username = ipfire
-diff --git a/examples/daemon.conf b/examples/daemon.conf
-index 525cc1f..143a7f6 100644
---- a/examples/daemon.conf
-+++ b/examples/daemon.conf
-@@ -3,7 +3,7 @@
- [daemon]
-
- # The URL of the server to connect to.
--# server = https://pakfire.ipfire.org/
-+# server = https://pakfirehub.ipfire.org/
-
- # The hostname of this machine.
- # hostname = <automatically detected>
-diff --git a/python/pakfire/client/base.py b/python/pakfire/client/base.py
-index 1886e2b..3ac4bef 100644
---- a/python/pakfire/client/base.py
-+++ b/python/pakfire/client/base.py
-@@ -51,7 +51,7 @@ class PakfireClient(object):
- ret += "%s:%s@" % (username, password)
-
- # Add host and path components.
-- ret += "%s/pakfirehub/%s" % (url.netloc, self.type)
-+ ret += "/".join((url.netloc, self.type))
-
- return ret
-
-diff --git a/python/pakfire/config.py b/python/pakfire/config.py
-index c7ab143..0d32784 100644
---- a/python/pakfire/config.py
-+++ b/python/pakfire/config.py
-@@ -237,7 +237,7 @@ class ConfigClient(_Config):
- "client" : {
- # The default server is the official Pakfire
- # server.
-- "server" : "https://pakfire.ipfire.org",
-+ "server" : PAKFIRE_HUB,
- },
- }
-
-@@ -249,7 +249,7 @@ class ConfigDaemon(_Config):
- "daemon" : {
- # The default server is the official Pakfire
- # server.
-- "server" : "https://pakfire.ipfire.org",
-+ "server" : PAKFIRE_HUB,
-
- # The default hostname is the host name of this
- # machine.
-diff --git a/python/pakfire/constants.py b/python/pakfire/constants.py
-index 2998ab7..2c091e4 100644
---- a/python/pakfire/constants.py
-+++ b/python/pakfire/constants.py
-@@ -27,6 +27,9 @@ from __version__ import PAKFIRE_VERSION
-
- PAKFIRE_LEAST_COMPATIBLE_VERSION = PAKFIRE_VERSION
-
-+# The default hub to connect to.
-+PAKFIRE_HUB = "https://pakfirehub.ipfire.org/"
-+
- SYSCONFDIR = "/etc"
- SCRIPT_DIR = "/usr/lib/pakfire"
-
---
-1.7.3.4
-
+++ /dev/null
-From cd37f1637dc038f2ebdfc514882e4b600d85a606 Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer@ipfire.org>
-Date: Sat, 10 Mar 2012 13:25:41 +0100
-Subject: [PATCH] QA: Check for nested $BUILDROOT.
-
----
- tools/quality-agent.d/095-directory-layout | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tools/quality-agent.d/095-directory-layout b/tools/quality-agent.d/095-directory-layout
-index 3f946a1..d605fe9 100755
---- a/tools/quality-agent.d/095-directory-layout
-+++ b/tools/quality-agent.d/095-directory-layout
-@@ -4,7 +4,7 @@
-
- DESC="The filelayout should comply to the FHS."
-
--DIRS="/etc/init.d /etc/rc.d /lib/pkgconfig /usr/etc /usr/libexec /usr/local /usr/man /usr/usr /usr/var"
-+DIRS="/etc/init.d /etc/rc.d /lib/pkgconfig /usr/etc /usr/libexec /usr/local /usr/man /usr/usr /usr/var ${BUILDROOT}"
-
- function check() {
- # Do nothing, if directory check was disabled.
---
-1.7.3.4
-
+++ /dev/null
-From 90919c62214dd821048027cce5752a8d7f64d437 Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer@ipfire.org>
-Date: Wed, 29 Feb 2012 18:37:50 +0100
-Subject: [PATCH] Don't download mirrorlist at repository initialization.
-
----
- python/pakfire/downloader.py | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/python/pakfire/downloader.py b/python/pakfire/downloader.py
-index 3bfbff2..f89681f 100644
---- a/python/pakfire/downloader.py
-+++ b/python/pakfire/downloader.py
-@@ -190,8 +190,6 @@ class MirrorList(object):
- # Save URL to more mirrors.
- self.mirrorlist = repo._mirrors
-
-- self.update(force=False)
--
- @property
- def distro(self):
- return self.repo.distro
-@@ -245,6 +243,7 @@ class MirrorList(object):
- f.close()
-
- # Read mirrorlist from cache and parse it.
-+ self.forget_mirrors()
- with self.cache.open(cache_filename) as f:
- self.parse_mirrordata(f.read())
-
-@@ -259,6 +258,9 @@ class MirrorList(object):
-
- self.__mirrors.append(mirror)
-
-+ def forget_mirrors(self):
-+ self.__mirrors = []
-+
- @property
- def preferred(self):
- """
-@@ -289,6 +291,9 @@ class MirrorList(object):
- """
- Return a MirrorGroup object for the given grabber.
- """
-+ # Make sure the mirrorlist is up to date.
-+ self.update()
-+
- # A list of mirrors that is passed to MirrorGroup.
- mirrors = []
-
---
-1.7.3.4
-
+++ /dev/null
-From 1f2968430df446dcbf0e27ff870ac7aa6e8113cd Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer@ipfire.org>
-Date: Tue, 6 Mar 2012 16:11:01 +0100
-Subject: [PATCH] Fix library check when updating GCC.
-
-As it only happens on ARM, the new GCC libdir is not found.
----
- tools/quality-agent.d/003-libs-location | 7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/tools/quality-agent.d/003-libs-location b/tools/quality-agent.d/003-libs-location
-index 48b2521..ce5ba72 100755
---- a/tools/quality-agent.d/003-libs-location
-+++ b/tools/quality-agent.d/003-libs-location
-@@ -16,13 +16,16 @@ esac
-
- # Find gcc libdir.
- gcc_libdir=$(gcc -print-libgcc-file-name)
--gcc_libdir=$(dirname ${gcc_libdir})
-+for i in 1 2; do
-+ gcc_libdir=$(dirname ${gcc_libdir})
-+done
-+gcc_libdir=$(ls ${BUILDROOT}${gcc_libdir}/* 2>/dev/null | tail -n1)
-
- function check() {
- local failed=0
- local found
-
-- for lib in $(find ${BUILDROOT}/${libdir} -type f -name "lib*.so.*" 2>/dev/null); do
-+ for lib in $(find ${BUILDROOT}/{,usr/}${libdir} -type f -name "lib*.so.*" 2>/dev/null); do
- lib=${lib##*/}
- lib=${lib%%.so*}
-
---
-1.7.3.4
-
+++ /dev/null
-From 123f594fe738d6eb0a9238d094bbfbce7d4355b3 Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer@ipfire.org>
-Date: Sat, 10 Mar 2012 11:45:20 +0100
-Subject: [PATCH] QA: Don't use ls to list all directories in libs-location check.
-
----
- tools/quality-agent.d/003-libs-location | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tools/quality-agent.d/003-libs-location b/tools/quality-agent.d/003-libs-location
-index ce5ba72..4c2e8ba 100755
---- a/tools/quality-agent.d/003-libs-location
-+++ b/tools/quality-agent.d/003-libs-location
-@@ -19,7 +19,7 @@ gcc_libdir=$(gcc -print-libgcc-file-name)
- for i in 1 2; do
- gcc_libdir=$(dirname ${gcc_libdir})
- done
--gcc_libdir=$(ls ${BUILDROOT}${gcc_libdir}/* 2>/dev/null | tail -n1)
-+gcc_libdir=$(find ${BUILDROOT}${gcc_libdir}/* -type d -maxdepth 1 2>/dev/null | sort | head -n1)
-
- function check() {
- local failed=0
---
-1.7.3.4
-
+++ /dev/null
-commit da1de278eca7d6663cce89f7c1ad2a312fda8abb
-Author: Michael Tremer <michael.tremer@ipfire.org>
-Date: Sun Mar 11 15:03:21 2012 +0100
-
- QA: libs-location: Don't search in the deep.
-
-diff --git a/tools/quality-agent.d/003-libs-location b/tools/quality-agent.d/003-libs-location
-index 4c2e8ba..479f170 100755
---- a/tools/quality-agent.d/003-libs-location
-+++ b/tools/quality-agent.d/003-libs-location
-@@ -25,7 +25,7 @@ function check() {
- local failed=0
- local found
-
-- for lib in $(find ${BUILDROOT}/{,usr/}${libdir} -type f -name "lib*.so.*" 2>/dev/null); do
-+ for lib in $(find ${BUILDROOT}/{,usr/}${libdir} -maxdepth 1 -type f -name "lib*.so.*" 2>/dev/null); do
- lib=${lib##*/}
- lib=${lib%%.so*}
-
+++ /dev/null
-commit 6230230c96c4961d6e5e7aed176d4859dd744b03
-Author: Michael Tremer <michael.tremer@ipfire.org>
-Date: Sat Mar 17 13:12:57 2012 +0100
-
- Fix automatic pkgconfig dependencies.
-
- The pkgconfig package was added as "provides" instead of a
- dependency when .pc files were in a package.
-
-diff --git a/tools/find-provides b/tools/find-provides
-index 8a3e3cb..0be2de7 100755
---- a/tools/find-provides
-+++ b/tools/find-provides
-@@ -81,9 +81,6 @@ if [ -n "${pkgconfig}" -a -x "${pkgconfig}" ]; then
- # We have a dependency. Make a note that we need the pkgconfig
- # tool for this package.
- echo "pkgconfig(${n}) ${r} ${v}"
--
-- # The dependency on the pkgconfig package itself.
-- echo "pkgconfig"
- done
- done | sort -u
- fi
-diff --git a/tools/find-requires b/tools/find-requires
-index 044c59f..9a98c32 100755
---- a/tools/find-requires
-+++ b/tools/find-requires
-@@ -142,6 +142,9 @@ fi
- pkgconfig=$(which pkg-config)
- if [ -n "${pkgconfig}" -a -x "${pkgconfig}" ]; then
- for file in ${pkgconfig_files}; do
-+ # The dependency for the pkgconfig package itself.
-+ echo "pkgconfig"
-+
- ${pkgconfig} --print-requires --print-requires-private "${file}" 2> /dev/null | while read n r v ; do
- echo "pkgconfig(${n})" "${r}" "${v}"
- done
+++ /dev/null
-commit d16c15690f94589c2667a5096c21cec16daee7b7
-Author: Michael Tremer <michael.tremer@ipfire.org>
-Date: Sun Mar 11 19:53:10 2012 +0100
-
- find-requires: Filter false positives for python abi.
-
-diff --git a/tools/find-requires b/tools/find-requires
-index 52b6651..044c59f 100755
---- a/tools/find-requires
-+++ b/tools/find-requires
-@@ -43,14 +43,16 @@ while read file; do
- */usr/lib*/python*/*)
- # Sort out all python files.
- ;;
-- */usr/lib*/python*)
-+ */usr/lib/python*|*/usr/lib64/python*)
- # This will only get the python directory.
- file=$(basename ${file})
-
- # Strip the python version from the string.
- python_version="${file#python}"
-
-- echo "python-abi = ${python_version}"
-+ if [ -n "${python_version}" ]; then
-+ echo "python-abi = ${python_version}"
-+ fi
- continue
- ;;
- esac
+++ /dev/null
-commit 882bb1851ab12ee3ba1561552faf90850e212052
-Author: Michael Tremer <michael.tremer@ipfire.org>
-Date: Sun Mar 11 17:59:34 2012 +0100
-
- QA: libs-location: Revert checking in /usr/lib(64).
-
- That was not such a good idea because upstream is messing
- too much with library names.
-
-diff --git a/tools/quality-agent.d/003-libs-location b/tools/quality-agent.d/003-libs-location
-index 479f170..0ee8237 100755
---- a/tools/quality-agent.d/003-libs-location
-+++ b/tools/quality-agent.d/003-libs-location
-@@ -25,7 +25,7 @@ function check() {
- local failed=0
- local found
-
-- for lib in $(find ${BUILDROOT}/{,usr/}${libdir} -maxdepth 1 -type f -name "lib*.so.*" 2>/dev/null); do
-+ for lib in $(find ${BUILDROOT}/${libdir} -maxdepth 1 -type f -name "lib*.so.*" 2>/dev/null); do
- lib=${lib##*/}
- lib=${lib%%.so*}
-
+++ /dev/null
-From 7cefdc0a2cb917e16c95d522fb1e3d4ed600faca Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer@ipfire.org>
-Date: Wed, 7 Mar 2012 17:11:37 +0100
-Subject: [PATCH] Fix definition of sharedstatedir.
-
----
- macros/arch.macro | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/macros/arch.macro b/macros/arch.macro
-index e756b8e..536e9d2 100644
---- a/macros/arch.macro
-+++ b/macros/arch.macro
-@@ -8,7 +8,7 @@ sbindir = %{exec_prefix}/sbin
- libexecdir = %{exec_prefix}/lib
- datadir = %{prefix}/share
- sysconfdir = /etc
--sharedstatedir = %{prefix}/com
-+sharedstatedir = %{localstatedir}/lib
- localstatedir = /var
- lib = lib
- libdir = %{exec_prefix}/%{lib}
---
-1.7.3.4
-
+++ /dev/null
-From 8fe602a7c5b3de4c4531d05c0dc1cf4d6bb9fb06 Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer@ipfire.org>
-Date: Wed, 29 Feb 2012 11:10:33 +0100
-Subject: [PATCH] Update repositories only when they are actually enabled.
-
----
- python/pakfire/cli.py | 8 +++++++-
- python/pakfire/repository/__init__.py | 4 ++++
- python/pakfire/repository/base.py | 3 ++-
- 3 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/python/pakfire/cli.py b/python/pakfire/cli.py
-index 8bab886..7a94900 100644
---- a/python/pakfire/cli.py
-+++ b/python/pakfire/cli.py
-@@ -768,8 +768,14 @@ class CliBuilderIntern(Cli):
-
- conf = config.ConfigBuilder()
-
-+ if self.args.nodeps:
-+ disable_repos = ["*"]
-+ else:
-+ disable_repos = None
-+
- pakfire._build(pkg, builder_mode=self.args.mode, config=conf,
-- arch=self.args.arch, resultdir=self.args.resultdir)
-+ disable_repos=disable_repos, arch=self.args.arch,
-+ resultdir=self.args.resultdir)
-
-
- class CliClient(Cli):
-diff --git a/python/pakfire/repository/__init__.py b/python/pakfire/repository/__init__.py
-index f6b2f6e..39872da 100644
---- a/python/pakfire/repository/__init__.py
-+++ b/python/pakfire/repository/__init__.py
-@@ -68,6 +68,10 @@ class Repositories(object):
-
- # Disable all repositories here as demanded on commandline
- if disable_repos:
-+ # * is magic to disable all repositories.
-+ if "*" in disable_repos:
-+ disable_repos = [r.name for r in self]
-+
- for repo in disable_repos:
- self.disable_repo(repo)
-
-diff --git a/python/pakfire/repository/base.py b/python/pakfire/repository/base.py
-index 7fb8362..59d8615 100644
---- a/python/pakfire/repository/base.py
-+++ b/python/pakfire/repository/base.py
-@@ -115,7 +115,8 @@ class RepositoryFactory(object):
- """
- assert self.index
-
-- self.index.update(force, offline=offline)
-+ if force or self.enabled:
-+ self.index.update(force, offline=offline)
-
- def clean(self):
- """
---
-1.7.3.4
-
projects / people / stevee / ipfire-3.x.git / commitdiff
