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 4ea11fef92f2d78f60f64700d047bd3e90940db4 (commit) via c653dca0a2ed6192c6acfe0f7be97569cbb0e65c (commit) via 24d34be67d30fb8447b60f9c8ee193bb46d5d03f (commit) from 02db4057c97f0f497c6c1c2039135f1742a30685 (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 4ea11fef92f2d78f60f64700d047bd3e90940db4 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 5 02:10:30 2011 +0100

Make renaming complete for db package.

commit c653dca0a2ed6192c6acfe0f7be97569cbb0e65c Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 5 00:58:45 2011 +0100

db4: Renamed the package (was db) to be compatible to any later version of db.

commit 24d34be67d30fb8447b60f9c8ee193bb46d5d03f Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 5 00:42:30 2011 +0100

Revert "db: Update to 5.1.19." plus more.

This reverts commit d737c7b6fadd6a235cde8f8b359a6bb0ac113dd2.

Got back to the 4.7 line of berkeley db. Added myself as the maintainer to take care of this package.

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

Summary of changes: pkgs/core/bind/bind.nm | 2 +- pkgs/core/cyrus-sasl/cyrus-sasl.nm | 2 +- pkgs/core/{db/db.nm => db4/db4.nm} | 20 ++++--- .../db4/patches/db-4.7.25-upstream_fixes-1.patch | 64 ++++++++++++++++++++ pkgs/core/iproute2/iproute2.nm | 2 +- pkgs/core/man-db/man-db.nm | 2 +- pkgs/core/openldap/openldap.nm | 2 +- pkgs/core/perl/perl.nm | 2 +- pkgs/core/python/python.nm | 2 +- 9 files changed, 83 insertions(+), 15 deletions(-) rename pkgs/core/{db/db.nm => db4/db4.nm} (83%) create mode 100644 pkgs/core/db4/patches/db-4.7.25-upstream_fixes-1.patch

Difference in files: diff --git a/pkgs/core/bind/bind.nm b/pkgs/core/bind/bind.nm index b5ca8f3..9041e9e 100644 --- a/pkgs/core/bind/bind.nm +++ b/pkgs/core/bind/bind.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.isc.org/products/BIND/ PKG_LICENSE = Proprietary PKG_SUMMARY = BIND provides tools for the DNS.

-PKG_BUILD_DEPS+= db-devel openssl-devel +PKG_BUILD_DEPS+= db4-devel openssl-devel

define PKG_DESCRIPTION BIND (Berkeley Internet Name Domain or named) is the most commonly used \ diff --git a/pkgs/core/cyrus-sasl/cyrus-sasl.nm b/pkgs/core/cyrus-sasl/cyrus-sasl.nm index 1bdc1fa..7d8af2c 100644 --- a/pkgs/core/cyrus-sasl/cyrus-sasl.nm +++ b/pkgs/core/cyrus-sasl/cyrus-sasl.nm @@ -34,7 +34,7 @@ PKG_URL = http://asg.web.cmu.edu/sasl/sasl-library.html PKG_LICENSE = BSD PKG_SUMMARY = The Cyrus SASL library.

-PKG_BUILD_DEPS+= db-devel openssl-devel pam-devel +PKG_BUILD_DEPS+= db4-devel openssl-devel pam-devel

define PKG_DESCRIPTION The cyrus-sasl package contains the Cyrus implementation of SASL. \ diff --git a/pkgs/core/db/db.nm b/pkgs/core/db/db.nm deleted file mode 100644 index d216ac2..0000000 --- a/pkgs/core/db/db.nm +++ /dev/null @@ -1,70 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include $(PKGROOT)/Include - -PKG_NAME = db -PKG_VER_MAJ = 5.1 -PKG_VER_MIN = 19 -PKG_VER = $(PKG_VER_MAJ).$(PKG_VER_MIN) -PKG_REL = 0 - -PKG_MAINTAINER = -PKG_GROUP = System/Libraries -PKG_URL = http://www.oracle.com/technology/products/berkeley-db/ -PKG_LICENSE = Proprietary -PKG_SUMMARY = Berkeley DB is a library that provides an embedded database. - -PKG_BUILD_DEPS+= gcc-c++ - -define PKG_DESCRIPTION - Berkeley DB (BDB) is a computer software library that provides \ - a high-performance embedded database. -endef - -PKG_TARBALL = $(THISAPP).tar.gz - -PKG_PACKAGES = $(PKG_NAME)-devel $(PKG_NAME)-utils $(PKG_NAME) $(PKG_NAME)-cxx - -PKG_FILES = /usr/lib/libdb-$(PKG_VER_MAJ).so -PKG_FILES-$(PKG_NAME)-cxx = /usr/lib/libdb_cxx-$(PKG_VER_MAJ).so -PKG_FILES-$(PKG_NAME)-devel = /usr/include /usr/lib -PKG_FILES-$(PKG_NAME)-utils = /usr/bin - -define STAGE_BUILD - cd $(DIR_APP)/build_unix && \ - CC=gcc \ - ../dist/configure \ - --prefix=/usr \ - --enable-compat185 \ - --enable-cxx \ - --disable-static - - cd $(DIR_APP)/build_unix && make $(PARALLELISMFLAGS) -endef - -define STAGE_INSTALL - cd $(DIR_APP)/build_unix && make install DESTDIR=$(BUILDROOT) \ - docdir=/usr/share/doc/$(THISAPP) -endef diff --git a/pkgs/core/db4/db4.nm b/pkgs/core/db4/db4.nm new file mode 100644 index 0000000..87a6c11 --- /dev/null +++ b/pkgs/core/db4/db4.nm @@ -0,0 +1,74 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = db +PKG_VER_MAJ = 4.7 +PKG_VER_MIN = 25 +PKG_VER = $(PKG_VER_MAJ).$(PKG_VER_MIN) +PKG_REL = 0 +PKG_EPOCH = 1 + +# Never update this to major version 5. + +PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org +PKG_GROUP = System/Libraries +PKG_URL = http://www.oracle.com/technology/products/berkeley-db/ +PKG_LICENSE = Proprietary +PKG_SUMMARY = Berkeley DB is a library that provides an embedded database. + +PKG_BUILD_DEPS+= gcc-c++ + +define PKG_DESCRIPTION + Berkeley DB (BDB) is a computer software library that provides \ + a high-performance embedded database. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +PKG_PACKAGES = $(PKG_NAME_REAL)-devel $(PKG_NAME_REAL)-utils \ + $(PKG_NAME_REAL) $(PKG_NAME_REAL)-cxx + +PKG_FILES = /usr/lib/libdb-$(PKG_VER_MAJ).so +PKG_FILES-$(PKG_NAME_REAL)-cxx = /usr/lib/libdb_cxx-$(PKG_VER_MAJ).so +PKG_FILES-$(PKG_NAME_REAL)-devel = /usr/include /usr/lib +PKG_FILES-$(PKG_NAME_REAL)-utils = /usr/bin + +define STAGE_BUILD + cd $(DIR_APP)/build_unix && \ + CC=gcc \ + ../dist/configure \ + --prefix=/usr \ + --enable-compat185 \ + --enable-cxx \ + --disable-static + + cd $(DIR_APP)/build_unix && make $(PARALLELISMFLAGS) +endef + +define STAGE_INSTALL + cd $(DIR_APP)/build_unix && make install DESTDIR=$(BUILDROOT) \ + docdir=/usr/share/doc/$(THISAPP) +endef diff --git a/pkgs/core/db4/patches/db-4.7.25-upstream_fixes-1.patch b/pkgs/core/db4/patches/db-4.7.25-upstream_fixes-1.patch new file mode 100644 index 0000000..a8de431 --- /dev/null +++ b/pkgs/core/db4/patches/db-4.7.25-upstream_fixes-1.patch @@ -0,0 +1,64 @@ +Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> +Date: 2008-09-28 +Initial Package Version: 4.7.25 +Upstream Status: From Upstream +Origin: http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch... +Description: Update to latest patch for 4.7.25 release (avoid improperly named + patches in LFS). + +diff -Naur db-4.7.25-orig/sequence/sequence.c db-4.7.25/sequence/sequence.c +--- db-4.7.25-orig/sequence/sequence.c 2008-05-05 15:25:09.000000000 -0500 ++++ db-4.7.25/sequence/sequence.c 2008-09-28 00:03:59.000000000 -0500 +@@ -187,7 +187,11 @@ + if ((ret = __db_get_flags(dbp, &tflags)) != 0) + goto err; + +- if (DB_IS_READONLY(dbp)) { ++ /* ++ * We can let replication clients open sequences, but must ++ * check later that they do not update them. ++ */ ++ if (F_ISSET(dbp, DB_AM_RDONLY)) { + ret = __db_rdonly(dbp->env, "DB_SEQUENCE->open"); + goto err; + } +@@ -244,6 +248,11 @@ + if ((ret != DB_NOTFOUND && ret != DB_KEYEMPTY) || + !LF_ISSET(DB_CREATE)) + goto err; ++ if (IS_REP_CLIENT(env) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(env, "DB_SEQUENCE->open"); ++ goto err; ++ } + ret = 0; + + rp = &seq->seq_record; +@@ -296,7 +305,12 @@ + */ + rp = seq->seq_data.data; + if (rp->seq_version == DB_SEQUENCE_OLDVER) { +-oldver: rp->seq_version = DB_SEQUENCE_VERSION; ++oldver: if (IS_REP_CLIENT(env) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(env, "DB_SEQUENCE->open"); ++ goto err; ++ } ++ rp->seq_version = DB_SEQUENCE_VERSION; + if (!F_ISSET(env, ENV_LITTLEENDIAN)) { + if (IS_DB_AUTO_COMMIT(dbp, txn)) { + if ((ret = +@@ -707,6 +721,13 @@ + + MUTEX_LOCK(env, seq->mtx_seq); + ++ if (handle_check && IS_REP_CLIENT(env) && ++ !F_ISSET(dbp, DB_AM_NOT_DURABLE)) { ++ ret = __db_rdonly(env, "DB_SEQUENCE->get"); ++ goto err; ++ } ++ ++ + if (rp->seq_min + delta > rp->seq_max) { + __db_errx(env, "Sequence overflow"); + ret = EINVAL; diff --git a/pkgs/core/iproute2/iproute2.nm b/pkgs/core/iproute2/iproute2.nm index 1d5ef6c..9419ba5 100644 --- a/pkgs/core/iproute2/iproute2.nm +++ b/pkgs/core/iproute2/iproute2.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.linuxfoundation.org/en/Net:Iproute2 PKG_LICENSE = GPLv2+ PKG_SUMMARY = Advanced IP routing and network device configuration tools.

-PKG_BUILD_DEPS+= bison db-devel flex +PKG_BUILD_DEPS+= bison db4-devel flex

define PKG_DESCRIPTION The iproute package contains networking utilities (ip and rtmon, for \ diff --git a/pkgs/core/man-db/man-db.nm b/pkgs/core/man-db/man-db.nm index c092f45..59a2459 100644 --- a/pkgs/core/man-db/man-db.nm +++ b/pkgs/core/man-db/man-db.nm @@ -34,7 +34,7 @@ PKG_URL = http://bzr.savannah.gnu.org/r/man-db/ PKG_LICENSE = GPL PKG_SUMMARY = man-db is an on-line manual database.

-PKG_BUILD_DEPS+= db-devel groff +PKG_BUILD_DEPS+= db4-devel groff PKG_DEPS += groff less

define PKG_DESCRIPTION diff --git a/pkgs/core/openldap/openldap.nm b/pkgs/core/openldap/openldap.nm index b6408f0..ce03d8f 100644 --- a/pkgs/core/openldap/openldap.nm +++ b/pkgs/core/openldap/openldap.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.openldap.org/ PKG_LICENSE = OpenLDAP PKG_SUMMARY = LDAP support libraries.

-PKG_BUILD_DEPS+= db-devel cyrus-sasl-devel groff libtool libtool-devel \ +PKG_BUILD_DEPS+= db4-devel cyrus-sasl-devel groff libtool libtool-devel \ openssl-devel pth-devel

define PKG_DESCRIPTION diff --git a/pkgs/core/perl/perl.nm b/pkgs/core/perl/perl.nm index c132584..c64b826 100644 --- a/pkgs/core/perl/perl.nm +++ b/pkgs/core/perl/perl.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.perl.org/ PKG_LICENSE = GPL+ or Artistic and GPLv2+ or Artistic PKG_SUMMARY = Practical Extraction and Report Language.

-PKG_BUILD_DEPS+= db-devel gcc-c++ gdbm-devel iana-etc perl procps zlib-devel +PKG_BUILD_DEPS+= db4-devel gcc-c++ gdbm-devel iana-etc perl procps zlib-devel

define PKG_DESCRIPTION Perl is a high-level programming language with roots in C, sed, awk \ diff --git a/pkgs/core/python/python.nm b/pkgs/core/python/python.nm index c8374e5..77028b7 100644 --- a/pkgs/core/python/python.nm +++ b/pkgs/core/python/python.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.python.org PKG_LICENSE = Python PKG_SUMMARY = An interpreted, interactive, object-oriented programming language.

-PKG_BUILD_DEPS+= autoconf automake bzip2-devel db-devel expat-devel gdbm-devel \ +PKG_BUILD_DEPS+= autoconf automake bzip2-devel db4-devel expat-devel gdbm-devel \ libffi-devel libselinux-devel ncurses-devel openssl-devel pkg-config \ readline-devel sqlite-devel tar zlib-devel

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