[git.ipfire.org] IPFire 3.x development tree branch, master, updated. abf738371c25cfcf754e7d30e8f645ce8377ba7b
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 abf738371c25cfcf754e7d30e8f645ce8377ba7b (commit) via 94d44cad70478751e3574f3b140cb7e2e2eb43ca (commit) via eb424a878383bc038509a7c77043a76f9035dcbe (commit) via 06681fdbb5625d68c03c5bc704b518c535d0be8a (commit) via ea33b31cd17cc6814211dddb136a9bee418e97b1 (commit) via b44947f784daec76c08687317ba728c603b6ac7e (commit) via fc4bcf51f32ad3def5ac67e76a9d32b4a2be362b (commit) via e3c2f04c5a3401a6044224b9d7db3c8ff1dc24c2 (commit) via 6be9a50eb4dc2f87a2d1b1a03c811b14356e653b (commit) via 8d49a8dd9c512d6d4abefb8f7df73d102eee7c27 (commit) via ffd22a7b7b00a6804cb68cc9de4b20e6dc3974f8 (commit) via 6ea141761d956335faa11dca2401e04ce55a219c (commit) via c73c8c2015d1a812a6802cc238fa161b0e061916 (commit) from 77c894147d5f03c3929922c285a8785c8fff7a65 (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 abf738371c25cfcf754e7d30e8f645ce8377ba7b Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 21 15:16:19 2015 +0200
subversion: Update to 1.8.13
Also rebuild against libdb
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 94d44cad70478751e3574f3b140cb7e2e2eb43ca Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 21 14:46:47 2015 +0200
squidGuard: Drop package
This will be replaced by c_icap.
squidGuard is not maintained for many many years and does not fulfill all our requirements that we have today.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit eb424a878383bc038509a7c77043a76f9035dcbe Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 21 14:44:53 2015 +0200
openldap: Rebuild against libdb
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 06681fdbb5625d68c03c5bc704b518c535d0be8a Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 21 14:42:40 2015 +0200
libsolv: Drop dependency to db4(-devel)
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ea33b31cd17cc6814211dddb136a9bee418e97b1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 21 14:42:08 2015 +0200
cyrus-sasl: Rebuild against libdb
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b44947f784daec76c08687317ba728c603b6ac7e Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 21 14:38:32 2015 +0200
bind: Drop dependency to db4(-devel)
The library is not used
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fc4bcf51f32ad3def5ac67e76a9d32b4a2be362b Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 21 14:37:29 2015 +0200
c_icap_modules: Rebuild against libdb
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e3c2f04c5a3401a6044224b9d7db3c8ff1dc24c2 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 21 14:36:15 2015 +0200
gc: Disable testsuite
The testsuite hangs forever on armv5tel
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6be9a50eb4dc2f87a2d1b1a03c811b14356e653b Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 21 14:35:21 2015 +0200
c_icap: Rebuild against libdb
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8d49a8dd9c512d6d4abefb8f7df73d102eee7c27 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 21 14:18:38 2015 +0200
man-db: Drop dependency to db4(-devel)
The library is not used at all
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ffd22a7b7b00a6804cb68cc9de4b20e6dc3974f8 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 21 14:17:56 2015 +0200
compat-db: Add db 5.2 and 4.8
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6ea141761d956335faa11dca2401e04ce55a219c Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 21 14:16:15 2015 +0200
mpfr: Update to 3.1.3
Minor bug fixes only
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c73c8c2015d1a812a6802cc238fa161b0e061916 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jun 21 14:08:57 2015 +0200
bird: Update to 1.5.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: bind/bind.nm | 5 ++-- bird/bird.nm | 2 +- c_icap/c_icap.nm | 4 +-- c_icap_modules/c_icap_modules.nm | 4 +-- compat-db/compat-db.nm | 55 ++++++++++++++++++++++++++++-------- cyrus-sasl/cyrus-sasl.nm | 4 +-- gc/gc.nm | 6 ++-- libsolv/libsolv.nm | 3 +- man-db/man-db.nm | 3 +- mpfr/mpfr.nm | 2 +- openldap/openldap.nm | 4 +-- squidGuard/squidGuard.nm | 60 ---------------------------------------- subversion/subversion.nm | 4 +-- 13 files changed, 63 insertions(+), 93 deletions(-) delete mode 100644 squidGuard/squidGuard.nm
Difference in files: diff --git a/bind/bind.nm b/bind/bind.nm index f472c55..7b6344f 100644 --- a/bind/bind.nm +++ b/bind/bind.nm @@ -5,7 +5,7 @@
name = bind version = 9.9.6-P1 -release = 1 +release = 2
groups = Networking/Tools url = http://www.isc.org/products/BIND/ @@ -27,10 +27,9 @@ build autoconf automake chrpath - db4-devel - libtool libcap-devel libidn-devel + libtool pkg-config openssl-devel >= 1.0.1h-2 shadow-utils diff --git a/bird/bird.nm b/bird/bird.nm index 977a014..5891fc0 100644 --- a/bird/bird.nm +++ b/bird/bird.nm @@ -4,7 +4,7 @@ ###############################################################################
name = bird -version = 1.4.0 +version = 1.5.0 release = 1
groups = Networking/Routing diff --git a/c_icap/c_icap.nm b/c_icap/c_icap.nm index acf65d0..9ce56c8 100644 --- a/c_icap/c_icap.nm +++ b/c_icap/c_icap.nm @@ -5,7 +5,7 @@
name = c_icap version = 0.1.7 -release = 3 +release = 4
maintainer = Christian Schmidt christian.schmidt@ipfire.org groups = Networking/Daemons @@ -25,7 +25,7 @@ build requires autoconf automake - db4-devel + libdb-devel libtool-devel zlib-devel end diff --git a/c_icap_modules/c_icap_modules.nm b/c_icap_modules/c_icap_modules.nm index d6e2911..e0fe5f2 100644 --- a/c_icap_modules/c_icap_modules.nm +++ b/c_icap_modules/c_icap_modules.nm @@ -5,7 +5,7 @@
name = c_icap_modules version = 0.1.6 -release = 2 +release = 3
maintainer = Christian Schmidt christian.schmidt@ipfire.org groups = Networking/Daemons @@ -27,7 +27,7 @@ build automake c_icap >= 0.1.7-3 clamav-devel - db4-devel + libdb-devel libtool-devel end
diff --git a/compat-db/compat-db.nm b/compat-db/compat-db.nm index df91897..8d41fa2 100644 --- a/compat-db/compat-db.nm +++ b/compat-db/compat-db.nm @@ -5,7 +5,8 @@
name = compat-db version = %{main_version} -release = 5 +# Release cannot be reset because the sub-packages won't get updated +release = 6 thisapp = db-%{version}
maintainer = Michael Tremer michael.tremer@ipfire.org @@ -24,11 +25,15 @@ end
version_db46 = 4.6.21 version_db47 = 4.7.25 -versions = %{version_db47} %{version_db46} -main_version:= %{version_db47} +version_db48 = 4.8.30 +version_db52 = 5.2.36 +versions = %{version_db52} %{version_db48} %{version_db47} %{version_db46} +main_version:= %{version_db52}
source_dl = http://download.oracle.com/berkeley-db/ -sources = db-%{version_db47}.tar.gz +sources = db-%{version_db52}.tar.gz +sources += db-%{version_db48}.tar.gz +sources += db-%{version_db47}.tar.gz sources += db-%{version_db46}.tar.gz
build @@ -37,6 +42,7 @@ build end
CFLAGS += -fno-strict-aliasing + CFLAGS += -Wno-format
configure_options += \ --enable-compat185 \ @@ -62,7 +68,7 @@ build docdir=%{datadir}/doc/db-${version}
# Remove unversioned libs. - rm -vf %{BUILDROOT}%{libdir}/libdb*-4.so + rm -vf %{BUILDROOT}%{libdir}/libdb*-{5,4}.so
# Move binaries. tag=$(echo ${version} | cut -c1,3) @@ -81,9 +87,9 @@ build rm -vf %{BUILDROOT}%{libdir}/libdb{,_cxx}.so
# Move headers. - mkdir -pv %{BUILDROOT}%{includedir}/db${version} + mkdir -pv %{BUILDROOT}%{includedir}/db-${version} mv -v %{BUILDROOT}%{includedir}/*.h \ - %{BUILDROOT}%{includedir}/db${version}/ + %{BUILDROOT}%{includedir}/db-${version}/
# Remove documentation. rm -rf %{BUILDROOT}%{datadir}/doc @@ -93,10 +99,14 @@ end
packages package %{name} - requires += compat-db46 = %{version_db46}-%{_release} - requires += compat-db47 = %{version_db47}-%{_release} + requires + compat-db52 = %{version_db52}-%{_release} + compat-db48 = %{version_db48}-%{_release} + compat-db47 = %{version_db47}-%{_release} + compat-db46 = %{version_db46}-%{_release} + end end - + template COMPATDB version = %{version_db%{version_tag}}
@@ -115,15 +125,34 @@ packages %{libdir}/libdb*-%{version_major}.so end
- requires = compat-db-headers = %{main_version}-%{_release} obsoletes db4 < 1:%{version_major} db4-devel < 1:%{version_major} db4-cxx < 1:%{version_major} db4-utils < 1:%{version_major} + + libdb < %{version_major} + end + + conflicts + libdb = %{version_major} end end
+ package %{name}52 + template COMPATDB + + version_tag = 52 + version_major = 5.2 + end + + package %{name}48 + template COMPATDB + + version_tag = 48 + version_major = 4.8 + end + package %{name}47 template COMPATDB
@@ -149,6 +178,10 @@ packages arch = noarch
files = %{includedir} + + requires + compat-db = %{main_version}-%{_release} + end end
package %{name}-debuginfo diff --git a/cyrus-sasl/cyrus-sasl.nm b/cyrus-sasl/cyrus-sasl.nm index d62843f..aa76c83 100644 --- a/cyrus-sasl/cyrus-sasl.nm +++ b/cyrus-sasl/cyrus-sasl.nm @@ -5,7 +5,7 @@
name = cyrus-sasl version = 2.1.26 -release = 1 +release = 2
groups = System/Libraries url = http://asg.web.cmu.edu/sasl/sasl-library.html @@ -23,7 +23,7 @@ source_dl = ftp://ftp.cyrusimap.org/cyrus-sasl/ build requires automake - db4-devel + libdb-devel openssl-devel pam-devel end diff --git a/gc/gc.nm b/gc/gc.nm index 6dbed1a..c7bbb00 100644 --- a/gc/gc.nm +++ b/gc/gc.nm @@ -5,7 +5,7 @@
name = gc version = 7.4.2 -release = 1 +release = 1.1
groups = System/Libraries url = http://www.hboehm.info/gc/ @@ -46,8 +46,8 @@ build end
test - # Disabled because gctest hangs forever. - make check + # Disabled because gctest hangs for ever on armv5tel + #make check end
install_cmds diff --git a/libsolv/libsolv.nm b/libsolv/libsolv.nm index 2956829..a415620 100644 --- a/libsolv/libsolv.nm +++ b/libsolv/libsolv.nm @@ -6,7 +6,7 @@ name = libsolv version = 0.4.1 git_ver = bcedc98 -release = 1.git%{git_ver} +release = 2.git%{git_ver}
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Libraries @@ -26,7 +26,6 @@ build requires gcc-c++ cmake >= 2.8.4-2 - db4-devel expat-devel zlib-devel end diff --git a/man-db/man-db.nm b/man-db/man-db.nm index 93ab669..590349e 100644 --- a/man-db/man-db.nm +++ b/man-db/man-db.nm @@ -5,7 +5,7 @@
name = man-db version = 2.7.1 -release = 2 +release = 3
groups = Documentation url = http://savannah.nongnu.org/projects/man-db @@ -24,7 +24,6 @@ sources = %{thisapp}.tar.xz
build requires - db4-devel gdbm-devel groff less diff --git a/mpfr/mpfr.nm b/mpfr/mpfr.nm index 981bd8f..bd16417 100644 --- a/mpfr/mpfr.nm +++ b/mpfr/mpfr.nm @@ -4,7 +4,7 @@ ###############################################################################
name = mpfr -version = 3.1.2 +version = 3.1.3 release = 1
groups = System/Libraries diff --git a/openldap/openldap.nm b/openldap/openldap.nm index eaaea2f..b8ecc04 100644 --- a/openldap/openldap.nm +++ b/openldap/openldap.nm @@ -5,7 +5,7 @@
name = openldap version = 2.4.40 -release = 1 +release = 2
groups = System/Daemons url = http://www.openldap.org/ @@ -27,9 +27,9 @@ sources = %{thisapp}.tgz build requires automake - db4-devel cyrus-sasl-devel groff + libdb-devel libtool libtool-devel openssl-devel diff --git a/squidGuard/squidGuard.nm b/squidGuard/squidGuard.nm deleted file mode 100644 index a45597b..0000000 --- a/squidGuard/squidGuard.nm +++ /dev/null @@ -1,60 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = squidGuard -version = 1.4.1 -release = 1 - -maintainer = Christian Schmidt christian.schmidt@ipfire.org -groups = Networking/Daemons -url = http://www.squidguard.org -license = GPLv2 -summary = Filter, redirector and access controller plugin for squid. - -description - SquidGuard is a URL redirector used to use blacklists with the - proxysoftware Squid. -end - -source_dl = http://www.squidguard.org/Downloads/ - -build - requires - bison - openldap-devel - flex - db4-devel - shadow - end - - configure_options += \ - --datadir=/usr/share \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --with-sg-config=/etc/squidGuard/squidGuard.conf \ - --with-sg-logdir=/var/log/squidGuard \ - --with-sg-dbhome=/var/lib/squidguard \ - --with-db=/usr \ - --with-db-inc=/usr/include \ - --with-db-lib=/usr/lib \ - --with-ldap - - prepare_cmds - groupadd -g 23 -r squid - useradd -u 23 -r -s /sbin/nologin -d /var/spool/squid -M \ - -c 'Squid proxy user' -g squid squid - end -end - -packages - package %{name} - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/subversion/subversion.nm b/subversion/subversion.nm index aab24ff..54ab6a7 100644 --- a/subversion/subversion.nm +++ b/subversion/subversion.nm @@ -4,7 +4,7 @@ ###############################################################################
name = subversion -version = 1.7.2 +version = 1.8.13 release = 1
groups = Development/Tools @@ -31,9 +31,9 @@ build autoconf apr-util-devel automake - db4-devel expat-devel libapr-devel + libdb-devel perl-devel sqlite-devel swig
hooks/post-receive -- IPFire 3.x development tree
-
git＠ipfire.org