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

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 4613 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  86fb1cccf0f99dbc62d1cfc831a6d0eb20237c35 (commit)
       via  cce8982b41830878ccad741214fa2a205e30fe15 (commit)
       via  20ec0afc327195b17cc2dda711ecfa280b28c55b (commit)
      from  e63d3291910086dffc8e2e82cc9319d3d815c139 (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 86fb1cccf0f99dbc62d1cfc831a6d0eb20237c35
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Mar 11 18:27:13 2012 +0100

    rtorrent: Update to 0.8.9.

commit cce8982b41830878ccad741214fa2a205e30fe15
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Mar 11 18:24:54 2012 +0100

    libtorrent: Update to 0.12.9.
    
    Fixes a build issue with the older version.

commit 20ec0afc327195b17cc2dda711ecfa280b28c55b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Mar 11 17:53:08 2012 +0100

    compat-db: Fix installation issue.
    
    Package compat-db46 could not be installed because of
    unmet dependencies (#10060).

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

Summary of changes:
 compat-db/compat-db.nm   |   11 ++++++-----
 libtorrent/libtorrent.nm |    7 ++++---
 rtorrent/rtorrent.nm     |    9 +++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

Difference in files:
diff --git a/compat-db/compat-db.nm b/compat-db/compat-db.nm
index bc9aa06..df91897 100644
--- a/compat-db/compat-db.nm
+++ b/compat-db/compat-db.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = compat-db
-version    = %{version_db47}
-release    = 4
+version    = %{main_version}
+release    = 5
 thisapp    = db-%{version}
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -25,6 +25,7 @@ end
 version_db46 = 4.6.21
 version_db47 = 4.7.25
 versions     = %{version_db47} %{version_db46}
+main_version:= %{version_db47}
 
 source_dl  = http://download.oracle.com/berkeley-db/
 sources    = db-%{version_db47}.tar.gz
@@ -92,8 +93,8 @@ end
 
 packages
 	package %{name}
-		requires += compat-db46 = %{version_db46}
-		requires += compat-db47 = %{version_db47}
+		requires += compat-db46 = %{version_db46}-%{_release}
+		requires += compat-db47 = %{version_db47}-%{_release}
 	end
 	
 	template COMPATDB
@@ -114,7 +115,7 @@ packages
 			%{libdir}/libdb*-%{version_major}.so
 		end
 
-		requires = compat-db-headers = %{thisver}
+		requires = compat-db-headers = %{main_version}-%{_release}
 		obsoletes
 			db4 < 1:%{version_major}
 			db4-devel < 1:%{version_major}
diff --git a/libtorrent/libtorrent.nm b/libtorrent/libtorrent.nm
index 9cbeb8c..18bf990 100644
--- a/libtorrent/libtorrent.nm
+++ b/libtorrent/libtorrent.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = libtorrent
-version    = 0.12.7
+version    = 0.12.9
 release    = 1
 
 groups     = Internet/P2P
@@ -17,7 +17,7 @@ description
 	focus on high performance and good code.
 end
 
-source_dl  =
+source_dl  = http://libtorrent.rakshasa.no/downloads/
 
 build
 	requires
@@ -25,11 +25,12 @@ build
 		libsigc++-devel
 		openssl-devel
 	end
+
+	CFLAGS += -fno-strict-aliasing
 end
 
 packages
 	package %{name}
-	end
 
 	package %{name}-devel
 		template DEVEL
diff --git a/rtorrent/rtorrent.nm b/rtorrent/rtorrent.nm
index ae55fe5..6f3f379 100644
--- a/rtorrent/rtorrent.nm
+++ b/rtorrent/rtorrent.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = rtorrent
-version    = 0.8.7
+version    = 0.8.9
 release    = 1
 
 groups     = Internet/P2P
@@ -24,19 +24,20 @@ source_dl  = http://libtorrent.rakshasa.no/downloads/
 
 build
 	requires
-		 gcc-c++
+		gcc-c++
 		libcurl-devel
 		libsigc++-devel
-		libtorrent-devel
+		libtorrent-devel >= 0.12.9
 		ncurses-devel
 	end
 
+	CFLAGS += -fno-strict-aliasing
+
 	make_build_targets += LDFLAGS=-lpthread
 end
 
 packages
 	package %{name}
-	end
 
 	package %{name}-debuginfo
 		template DEBUGINFO


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