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

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 4394 bytes --]

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  276f7da92136fd121b36bb686a7e114d68182531 (commit)
      from  180993faebce075d07e22a798fd1a90355835469 (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 276f7da92136fd121b36bb686a7e114d68182531
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Apr 17 17:43:09 2012 +0200

    pakfire: Add two patches from upstream.
    
    Look inside the files to learn what they are about.

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

Summary of changes:
 pakfire/pakfire.nm                              |    2 +-
 pakfire/patches/pakfire-internalize-index.patch |   32 +++++++++++++++++++++++
 pakfire/patches/pakfire-provides-soname.patch   |   23 ++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletions(-)
 create mode 100644 pakfire/patches/pakfire-internalize-index.patch
 create mode 100644 pakfire/patches/pakfire-provides-soname.patch

Difference in files:
diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 26c7bc5..a1913b0 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -5,7 +5,7 @@
 
 name       = pakfire
 version    = 0.9.22
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = System/Packaging
diff --git a/pakfire/patches/pakfire-internalize-index.patch b/pakfire/patches/pakfire-internalize-index.patch
new file mode 100644
index 0000000..3e3e8b6
--- /dev/null
+++ b/pakfire/patches/pakfire-internalize-index.patch
@@ -0,0 +1,32 @@
+commit b856696a0a8173eaacdd03833971272de06118ce
+Author: Michael Tremer <michael.tremer(a)ipfire.org>
+Date:   Sat Apr 14 21:16:30 2012 +0200
+
+    Fix accessing index data after the transaction is done.
+
+diff --git a/python/pakfire/client/builder.py b/python/pakfire/client/builder.py
+index a039e65..2ade5dc 100644
+--- a/python/pakfire/client/builder.py
++++ b/python/pakfire/client/builder.py
+@@ -334,6 +334,7 @@ class ClientBuilder(object):
+ 		pkgs = []
+ 
+ 		for pkg in installed_packages:
++			assert pkg.uuid, "%s has got no UUID"
+ 			pkgs.append((pkg.friendly_name, pkg.uuid))
+ 
+ 		return self.conn.build_upload_buildroot(self.build_id, pkgs)
+diff --git a/python/pakfire/repository/system.py b/python/pakfire/repository/system.py
+index 642c4bd..5dcdd04 100644
+--- a/python/pakfire/repository/system.py
++++ b/python/pakfire/repository/system.py
+@@ -52,6 +52,9 @@ class RepositorySystem(base.RepositoryFactory):
+ 		# Commit the database to disk.
+ 		self.db.commit()
+ 
++		# Make sure that all data in the index is accessable.
++		self.index.optimize()
++
+ 	def add_package(self, pkg):
+ 		# Add package to the database.
+ 		self.db.add_package(pkg)
diff --git a/pakfire/patches/pakfire-provides-soname.patch b/pakfire/patches/pakfire-provides-soname.patch
new file mode 100644
index 0000000..8cc8b61
--- /dev/null
+++ b/pakfire/patches/pakfire-provides-soname.patch
@@ -0,0 +1,23 @@
+commit cf4f218f42c2a43a520eac4f3a6251d557dcbe80
+Author: Michael Tremer <michael.tremer(a)ipfire.org>
+Date:   Tue Apr 17 17:36:52 2012 +0200
+
+    find-provides: Accept bogous soname.
+    
+    This is a kind of weird bug. Some libs are "versioned" by
+    using their SONAME for symbol maps. This caused trouble
+    because the SONAME was not added to the list of provides
+    which is now changed by this commit.
+
+diff --git a/tools/find-provides b/tools/find-provides
+index 2e138ba..06b3c47 100755
+--- a/tools/find-provides
++++ b/tools/find-provides
+@@ -69,7 +69,6 @@ for file in ${binary_files}; do
+ 		/Version definitions:/ { START=1; }
+ 		/^[0-9]/ && (START==1) { print $4; }
+ 		/^$/ { START=0; }' | \
+-                grep -v ${soname} | \
+                 while read symbol ; do
+                     echo "${soname}(${symbol})$(${is_64} && echo ${mark64} | sed 's/()//')"
+                 done


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