* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 972881e665d8981a74b4adee2a6557d054f52bf1
@ 2016-04-08 15:26 git
0 siblings, 0 replies; only message in thread
From: git @ 2016-04-08 15:26 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 9379 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 972881e665d8981a74b4adee2a6557d054f52bf1 (commit)
via 4d95524bcc537639bb0885ee6ff135d0942c68a8 (commit)
via b365764ed706c4e10b06f7db5c44e9c3eaffed37 (commit)
via 5db9766e08ad9739d4da5aa6399867cee9d83aa3 (commit)
via 977bb4257f87c04fc88eb86fb74876e0022e2b1e (commit)
from 301beda7fb5836cfd0248c0b6a599045aa07ef16 (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 972881e665d8981a74b4adee2a6557d054f52bf1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 8 15:44:10 2016 +0100
compat-db: Add compatibility for libdb-5.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4d95524bcc537639bb0885ee6ff135d0942c68a8
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Thu Apr 7 09:38:52 2016 +0200
libdb: Update to 6.1.26
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b365764ed706c4e10b06f7db5c44e9c3eaffed37
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Thu Apr 7 09:35:12 2016 +0200
libcroco: Update to 0.6.11
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5db9766e08ad9739d4da5aa6399867cee9d83aa3
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Thu Apr 7 09:34:04 2016 +0200
libcgroup: Update to 0.41
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 977bb4257f87c04fc88eb86fb74876e0022e2b1e
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Apr 8 09:09:26 2016 +0200
compat-icu: New package.
This package provides compatiblity libraries of icu 50.2.1,
which are required by various binaries which are linked against
them.
Fixes #10961.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
compat-db/compat-db.nm | 18 +++++++++---
icu/icu.nm => compat-icu/compat-icu.nm | 39 ++++++++++++-------------
compat-icu/patches/icu-test-twodigityear.patch2 | 13 +++++++++
libcgroup/libcgroup.nm | 8 ++---
libcroco/libcroco.nm | 2 +-
libdb/libdb.nm | 6 ++--
6 files changed, 53 insertions(+), 33 deletions(-)
copy icu/icu.nm => compat-icu/compat-icu.nm (77%)
create mode 100644 compat-icu/patches/icu-test-twodigityear.patch2
Difference in files:
diff --git a/compat-db/compat-db.nm b/compat-db/compat-db.nm
index 8d41fa2..6c6c040 100644
--- a/compat-db/compat-db.nm
+++ b/compat-db/compat-db.nm
@@ -6,7 +6,7 @@
name = compat-db
version = %{main_version}
# Release cannot be reset because the sub-packages won't get updated
-release = 6
+release = 7
thisapp = db-%{version}
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -27,11 +27,13 @@ version_db46 = 4.6.21
version_db47 = 4.7.25
version_db48 = 4.8.30
version_db52 = 5.2.36
-versions = %{version_db52} %{version_db48} %{version_db47} %{version_db46}
-main_version:= %{version_db52}
+version_db53 = 5.3.28
+versions = %{version_db53} %{version_db52} %{version_db48} %{version_db47} %{version_db46}
+main_version:= %{version_db53}
source_dl = http://download.oracle.com/berkeley-db/
-sources = db-%{version_db52}.tar.gz
+sources = db-%{version_db53}.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
@@ -100,6 +102,7 @@ end
packages
package %{name}
requires
+ compat-db53 = %{version_db53}-%{_release}
compat-db52 = %{version_db52}-%{_release}
compat-db48 = %{version_db48}-%{_release}
compat-db47 = %{version_db47}-%{_release}
@@ -139,6 +142,13 @@ packages
end
end
+ package %{name}53
+ template COMPATDB
+
+ version_tag = 53
+ version_major = 5.3
+ end
+
package %{name}52
template COMPATDB
diff --git a/compat-icu/compat-icu.nm b/compat-icu/compat-icu.nm
new file mode 100644
index 0000000..47e24d4
--- /dev/null
+++ b/compat-icu/compat-icu.nm
@@ -0,0 +1,73 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = compat-icu
+version = %{ver_major}.%{ver_minor}.%{ver_plevel}
+ver_major = 50
+ver_minor = 1
+ver_plevel = 2
+release = 1
+thisapp = icu-%{version}
+
+groups = Development/Tools
+url = http://www.icu-project.org
+license = MIT and UCD and Public Domain
+summary = International Components for Unicode.
+
+description
+ Tools and utilities for developing with icu.
+end
+
+source_dl = http://download.icu-project.org/files/icu4c/%{version}/
+sources = icu4c-%{ver_major}_%{ver_minor}_%{ver_plevel}-src.tgz
+
+build
+ DIR_APP = %{DIR_SRC}/icu/source
+
+ configure_options += \
+ --disable-static \
+ --with-data-packaging=library \
+ --disable-samples
+
+ prepare_cmds
+ sed -i 's|-nodefaultlibs -nostdlib||' config/mh-linux
+ end
+
+ configure_cmds
+ # There is no source/doc/html/search/ directory
+ sed -i '/^\s\+\$(INSTALL_DATA) \$(docsrchfiles) \$(DESTDIR)\$(docdir)\/\$(docsubsrchdir)\s*$/d' Makefile
+
+ # The configure --disable-renaming and possibly other options result in icu/source/uconfig.h.prepend
+ # being created, include that content in icu/source/common/unicode/uconfig.h to propagate to consumer packages.
+ test -f uconfig.h.prepend && sed -e '/^#define __UCONFIG_H__/ r uconfig.h.prepend' \
+ -i common/unicode/uconfig.h
+ end
+
+ test
+ make check
+ end
+
+ install
+ # Install just the library and no headers.
+ mkdir -pv %{BUILDROOT}%{libdir}
+ cp -av lib/*.so.* %{BUILDROOT}%{libdir}
+ end
+end
+
+packages
+ package %{name}
+ provides
+ icu = %{thisver}
+ end
+
+ obsoletes
+ icu <= %{thisver}
+ end
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/compat-icu/patches/icu-test-twodigityear.patch2 b/compat-icu/patches/icu-test-twodigityear.patch2
new file mode 100644
index 0000000..fba90b5
--- /dev/null
+++ b/compat-icu/patches/icu-test-twodigityear.patch2
@@ -0,0 +1,13 @@
+In the year 2034 ...
+http://sourceforge.net/p/icu/mailman/message/32443311/
+--- icu.orig/source/test/intltest/dtfmttst.cpp 2013-10-04 22:48:00.000000000 +0200
++++ icu/source/test/intltest/dtfmttst.cpp 2014-06-13 19:34:40.611299572 +0200
+@@ -1129,7 +1129,7 @@
+ return;
+ }
+ parse2DigitYear(fmt, "5/6/17", date(117, UCAL_JUNE, 5));
+- parse2DigitYear(fmt, "4/6/34", date(34, UCAL_JUNE, 4));
++ parse2DigitYear(fmt, "4/6/34", date(134, UCAL_JUNE, 4));
+ }
+
+ // -------------------------------------
diff --git a/libcgroup/libcgroup.nm b/libcgroup/libcgroup.nm
index 88f06df..cf55450 100644
--- a/libcgroup/libcgroup.nm
+++ b/libcgroup/libcgroup.nm
@@ -4,8 +4,8 @@
###############################################################################
name = libcgroup
-version = 0.35.1
-release = 2
+version = 0.41
+release = 1
groups = Development/Libraries
url = http://libcg.sourceforge.net/
@@ -18,8 +18,8 @@ description
controllers.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = https://sourceforge.net/projects/libcg/files/libcgroup/v0.41/
+sources = %{thisapp}.tar.gz
build
requires
diff --git a/libcroco/libcroco.nm b/libcroco/libcroco.nm
index e90aebb..9cc9f07 100644
--- a/libcroco/libcroco.nm
+++ b/libcroco/libcroco.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libcroco
-version = 0.6.8
+version = 0.6.11
major_ver = 0.6
release = 1
diff --git a/libdb/libdb.nm b/libdb/libdb.nm
index 7c580f2..27e9534 100644
--- a/libdb/libdb.nm
+++ b/libdb/libdb.nm
@@ -4,9 +4,9 @@
###############################################################################
name = libdb
-version_major = 5
-version_minor = 3
-version_patch = 28
+version_major = 6
+version_minor = 1
+version_patch = 26
version = %{version_major}.%{version_minor}.%{version_patch}
release = 1
thisapp = db-%{version}
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-04-08 15:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-08 15:26 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 972881e665d8981a74b4adee2a6557d054f52bf1 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox