* [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. be87bcf68a6df87fc47e1017d172e8159711118a
@ 2012-03-10 15:16 git
0 siblings, 0 replies; only message in thread
From: git @ 2012-03-10 15:16 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 12342 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 be87bcf68a6df87fc47e1017d172e8159711118a (commit)
via ab6c9f359092ed00ef7bba18b1080ad85976798b (commit)
via 04fc14b1d60d93ea08551899803bbed08f56e517 (commit)
via 8654b9c308804f031506a537b2f14fc6ac89594f (commit)
from 9586919148bb9cb379ef8f34ac520093ae4fe900 (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 be87bcf68a6df87fc47e1017d172e8159711118a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 10 16:15:45 2012 +0100
python: Fix requirement for db4.
commit ab6c9f359092ed00ef7bba18b1080ad85976798b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 10 16:15:12 2012 +0100
libdb: New package.
Comes with db-5.2. Sucessor of db4.
commit 04fc14b1d60d93ea08551899803bbed08f56e517
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 10 16:13:39 2012 +0100
compat-db: New package.
This package provides older versions of db (the Berkeley Database).
It is used to make a proper transition to db-4.8.x and run
older versions of some programs which rely on db-4.7.x or db-4.6.x.
commit 8654b9c308804f031506a537b2f14fc6ac89594f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 10 16:11:32 2012 +0100
db4: Fix packing files.
Some files that belonged to the -devel package
have been in the main package which is not fixed.
-----------------------------------------------------------------------
Summary of changes:
compat-db/compat-db.nm | 156 ++++++++++++++++++++++++++++++++++++++++++++++++
db4/db4.nm | 41 +++++++++----
libdb/libdb.nm | 115 +++++++++++++++++++++++++++++++++++
python/python.nm | 4 +-
4 files changed, 301 insertions(+), 15 deletions(-)
create mode 100644 compat-db/compat-db.nm
create mode 100644 libdb/libdb.nm
Difference in files:
diff --git a/compat-db/compat-db.nm b/compat-db/compat-db.nm
new file mode 100644
index 0000000..bc9aa06
--- /dev/null
+++ b/compat-db/compat-db.nm
@@ -0,0 +1,156 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = compat-db
+version = %{version_db47}
+release = 4
+thisapp = db-%{version}
+
+maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
+groups = System/Libraries
+url = http://www.oracle.com/technology/products/berkeley-db/
+license = Proprietary
+summary = The Berkeley DB database compatibility library.
+
+description
+ Berkeley DB (BDB) is a computer software library that provides
+ a high-performance embedded database.
+
+ This package contains various version that were used in the
+ past. Some software may depend on them though.
+end
+
+version_db46 = 4.6.21
+version_db47 = 4.7.25
+versions = %{version_db47} %{version_db46}
+
+source_dl = http://download.oracle.com/berkeley-db/
+sources = db-%{version_db47}.tar.gz
+sources += db-%{version_db46}.tar.gz
+
+build
+ requires
+ gcc-c++
+ end
+
+ CFLAGS += -fno-strict-aliasing
+
+ configure_options += \
+ --enable-compat185 \
+ --enable-cxx \
+ --disable-static
+
+ build
+ for version in %{versions}; do
+ cd %{DIR_SRC}/db-${version}/build_unix
+ ../dist/configure \
+ %{configure_options}
+
+ %{MACRO_FIX_LIBTOOL}
+
+ make %{PARALLELISMFLAGS}
+ done
+ end
+
+ install
+ for version in %{versions}; do
+ cd %{DIR_SRC}/db-${version}/build_unix
+ make install DESTDIR=%{BUILDROOT} \
+ docdir=%{datadir}/doc/db-${version}
+
+ # Remove unversioned libs.
+ rm -vf %{BUILDROOT}%{libdir}/libdb*-4.so
+
+ # Move binaries.
+ tag=$(echo ${version} | cut -c1,3)
+ for bin in %{BUILDROOT}%{bindir}/*db_*; do
+ t=$(echo ${bin} | sed "s/db_/db${tag}_/g")
+ mv -v ${bin} ${t}
+ done
+
+ # Move libs.
+ major=$(echo ${version} | cut -c1-3)
+ mkdir -pv %{BUILDROOT}%{libdir}/db${version}
+ pushd %{BUILDROOT}%{libdir}/db${version}
+ ln -svf ../libdb-${major}.so libdb.so
+ ln -svf ../libdb_cxx-${major}.so libdb_cxx.so
+ popd
+ rm -vf %{BUILDROOT}%{libdir}/libdb{,_cxx}.so
+
+ # Move headers.
+ mkdir -pv %{BUILDROOT}%{includedir}/db${version}
+ mv -v %{BUILDROOT}%{includedir}/*.h \
+ %{BUILDROOT}%{includedir}/db${version}/
+
+ # Remove documentation.
+ rm -rf %{BUILDROOT}%{datadir}/doc
+ done
+ end
+end
+
+packages
+ package %{name}
+ requires += compat-db46 = %{version_db46}
+ requires += compat-db47 = %{version_db47}
+ end
+
+ template COMPATDB
+ version = %{version_db%{version_tag}}
+
+ summary = The Berkeley DB database %{version} compatibility library.
+ description
+ The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
+ embedded database support for both traditional and client/server applications.
+
+ This package contains Berkeley DB library version %{version} used for compatibility.
+ end
+
+ files
+ %{bindir}/berkeley_db%{version_tag}_*
+ %{bindir}/db%{version_tag}_*
+ %{libdir}/db%{version}
+ %{libdir}/libdb*-%{version_major}.so
+ end
+
+ requires = compat-db-headers = %{thisver}
+ obsoletes
+ db4 < 1:%{version_major}
+ db4-devel < 1:%{version_major}
+ db4-cxx < 1:%{version_major}
+ db4-utils < 1:%{version_major}
+ end
+ end
+
+ package %{name}47
+ template COMPATDB
+
+ version_tag = 47
+ version_major = 4.7
+ end
+
+ package %{name}46
+ template COMPATDB
+
+ version_tag = 46
+ version_major = 4.6
+ end
+
+ package %{name}-headers
+ summary = The Berkeley DB database compatibility headers.
+ description
+ The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
+ embedded database support for both traditional and client/server applications.
+
+ This package contains Berkeley DB library headers used for compatibility.
+ end
+ arch = noarch
+
+ files = %{includedir}
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/db4/db4.nm b/db4/db4.nm
index 0613b24..8f99439 100644
--- a/db4/db4.nm
+++ b/db4/db4.nm
@@ -7,12 +7,10 @@ name = db4
version_major = 4.8
version_minor = 30
version = %{version_major}.%{version_minor}
-release = 3
+release = 4
epoch = 1
thisapp = db-%{version}
-# Never update this to major version 5.
-
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = System/Libraries
url = http://www.oracle.com/technology/products/berkeley-db/
@@ -49,27 +47,29 @@ build
cd %{DIR_APP}/build_unix
make install DESTDIR=%{BUILDROOT} \
docdir=/usr/share/doc/%{thisapp}
+
+ # Remove unversioned libs.
+ rm -vf %{BUILDROOT}%{libdir}/libdb*-4.so
+
+ mkdir -pv %{BUILDROOT}%{includedir}/%{name}
+ mv -v %{BUILDROOT}%{includedir}/*.h %{BUILDROOT}%{includedir}/%{name}/
+ for i in db.h db_cxx.h db_185.h; do
+ ln -svf %{name}/${i} %{BUILDROOT}/%{includedir}
+ done
end
end
packages
- package db4
-
- package db4-devel
- template DEVEL
-
- # Overwrite because of epoch != 0.
- requires = %{name}=%{epoch}:%{thisver}
+ # /usr/lib64/libdb_cxx.so
- files += !%{libdir}/libdb-%{version_major}.so
- end
+ package db4
package db4-utils
summary = Command line tools for managing Berkeley DB (version 4) databases.
description = %{summary}
files
- /usr/bin
+ %{bindir}
end
end
@@ -82,6 +82,21 @@ packages
end
end
+ package db4-devel
+ template DEVEL
+
+ # Overwrite because of epoch != 0.
+ requires = %{name}=%{epoch}:%{thisver}
+
+ files
+ %{includedir}
+ %{libdir}/libdb.so
+ %{libdir}/libdb_cxx.so
+ end
+
+ #files += !%{libdir}/libdb-%{version_major}.so
+ end
+
package %{name}-debuginfo
template DEBUGINFO
end
diff --git a/libdb/libdb.nm b/libdb/libdb.nm
new file mode 100644
index 0000000..ace6d14
--- /dev/null
+++ b/libdb/libdb.nm
@@ -0,0 +1,115 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = libdb
+version_major = 5
+version_minor = 2
+version_patch = 36
+version = %{version_major}.%{version_minor}.%{version_patch}
+release = 1
+thisapp = db-%{version}
+
+soversion = %{version_major}.%{version_minor}
+
+maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
+groups = System/Libraries
+url = http://www.oracle.com/technology/products/berkeley-db/
+license = Proprietary
+summary = Berkeley DB is a library that provides an embedded database.
+
+description
+ Berkeley DB (BDB) is a computer software library that provides
+ a high-performance embedded database.
+end
+
+source_dl = http://download.oracle.com/berkeley-db/
+
+build
+ requires
+ chrpath
+ gcc-c++
+ libtool
+ perl
+ end
+
+ CFLAGS += -fno-strict-aliasing
+
+ DIR_APP = %{DIR_SRC}/%{thisapp}/dist/dist-tls
+
+ prepare_cmds
+ mkdir %{DIR_APP} && cd %{DIR_APP}
+ ln -s ../configure .
+ end
+
+ MACRO_FIX_LIBTOOL
+ # Remove libtool predep_objects and postdep_objects wonkiness so that
+ # building without -nostdlib doesn't include them twice. Because we
+ # already link with g++, weird stuff happens if you don't let the
+ # compiler handle this.
+ perl -pi -e 's/^predep_objects=".*$/predep_objects=""/' libtool
+ perl -pi -e 's/^postdep_objects=".*$/postdep_objects=""/' libtool
+ perl -pi -e 's/-shared -nostdlib/-shared/' libtool
+ end
+
+ configure_options += \
+ -C \
+ --enable-compat185 \
+ --enable-cxx \
+ --enable-sql \
+ --disable-static \
+ --disable-rpath
+
+ install_cmds
+ # Remove RPATH in all binaries.
+ for i in %{BUILDROOT}%{bindir}/*; do
+ chrpath --delete ${i}
+ done
+
+ # Remove documentation which is very big.
+ rm -rf %{BUILDROOT}%{datadir}/docs
+
+ # Remove unversioned libs.
+ rm -vf %{BUILDROOT}%{libdir}/libdb*-%{version_major}.so
+
+ mkdir -pv %{BUILDROOT}%{includedir}/%{name}
+ mv -v %{BUILDROOT}%{includedir}/*.h %{BUILDROOT}%{includedir}/%{name}/
+ for i in db.h db_cxx.h db_185.h; do
+ ln -svf %{name}/${i} %{BUILDROOT}/%{includedir}
+ done
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-devel
+ template DEVEL
+
+ files += !%{libdir}/libdb-%{soversion}.so
+ files += !%{libdir}/libdb_sql-%{soversion}.so
+ end
+
+ package %{name}-utils
+ summary = Command line tools for managing Berkeley DB (version 4) databases.
+ description = %{summary}
+
+ files
+ /usr/bin
+ end
+ end
+
+ package %{name}-cxx
+ summary = The Berkeley DB database library (version 4) for C++.
+ description = %{summary}
+
+ files
+ %{libdir}/libdb_cxx-%{soversion}.so
+ end
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/python/python.nm b/python/python.nm
index 50cac58..c4c0c7d 100644
--- a/python/python.nm
+++ b/python/python.nm
@@ -6,7 +6,7 @@
name = python
major_ver = 2.7
version = %{major_ver}.2
-release = 6
+release = 7
thisapp = Python-%{version}
groups = Development/Languages
@@ -30,7 +30,7 @@ build
autoconf
automake
bzip2-devel
- db4-devel >= 4.8
+ db4-devel >= 1:4.8
expat-devel
libffi-devel
libselinux-devel
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-03-10 15:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-10 15:16 [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. be87bcf68a6df87fc47e1017d172e8159711118a git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox