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 6f7c49953f42d68b9dd4dba193552fbe0eb6bcff (commit) via 2979fbcc735da1f72d19bc00b5279a03e1bfb043 (commit) via ee1f8b9c006a379c5371ac9dc76359bd06c88143 (commit) via 98456149ee0ead19fa940683be00cb344f5cf58f (commit) via a6e1e32de4b6b5c2d651a55cfb4d286991456f6a (commit) from aab9fcba44f96681367f1cd07fb64548104d0bc6 (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 6f7c49953f42d68b9dd4dba193552fbe0eb6bcff Merge: a6e1e32 2979fbc Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Apr 27 15:35:32 2014 +0200
Merge remote-tracking branch 'stevee/compat-packages'
commit 2979fbcc735da1f72d19bc00b5279a03e1bfb043 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Apr 22 21:14:21 2014 +0200
pcre: Move pcre-compat package into own build file.
Fixes #10523.
commit ee1f8b9c006a379c5371ac9dc76359bd06c88143 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Apr 27 11:50:31 2014 +0200
mpfr: Move mpfr-compat package into own build file.
Update the mpfr main package to 3.1.2 to allow build with gmp 6.0.0 or higher.
The compat-mpfr package cannot be build with gmp series 6 or higher, so there is a build dependecy below that version.
Fixes #10522.
commit 98456149ee0ead19fa940683be00cb344f5cf58f Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Apr 22 20:36:06 2014 +0200
libpng: Move libpng-compat package into own build file.
Fixes #10521.
commit a6e1e32de4b6b5c2d651a55cfb4d286991456f6a Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Apr 22 20:02:45 2014 +0200
sudo: Update to 1.8.10.
This is a minor update to the latest stable release.
Fixes #10518.
-----------------------------------------------------------------------
Summary of changes: libpng/libpng.nm => compat-libpng/compat-libpng.nm | 54 ++++++++-------------- mpfr/mpfr.nm => compat-mpfr/compat-mpfr.nm | 49 ++++++++------------ pcre/pcre.nm => compat-pcre/compat-pcre.nm | 43 +++++++---------- libpng/libpng.nm | 36 +-------------- mpfr/mpfr.nm | 39 ++-------------- pcre/pcre.nm | 30 +----------- sudo/sudo.nm | 2 +- 7 files changed, 59 insertions(+), 194 deletions(-) copy libpng/libpng.nm => compat-libpng/compat-libpng.nm (55%) copy mpfr/mpfr.nm => compat-mpfr/compat-mpfr.nm (65%) copy pcre/pcre.nm => compat-pcre/compat-pcre.nm (68%)
Difference in files: diff --git a/compat-libpng/compat-libpng.nm b/compat-libpng/compat-libpng.nm new file mode 100644 index 0000000..44b424b --- /dev/null +++ b/compat-libpng/compat-libpng.nm @@ -0,0 +1,61 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = compat-libpng +version = 1.5.18 +release = 1 +thisapp = libpng-%{version} + +groups = System/Libraries +url = http://www.libpng.org/pub/png/ +license = zlib +summary = A library of functions for manipulating PNG image format files. + +description + The libpng package contains a library of functions for creating and + manipulating PNG (Portable Network Graphics) image format files. + PNG is a bit-mapped graphics format similar to the GIF format. PNG + was created to replace the GIF format, since GIF uses a patented + data compression algorithm. +end + +source_dl += http://downloads.sourceforge.net/project/libpng/libpng15/%%7Bversion%7D/ +source_dl += http://downloads.sourceforge.net/project/libpng/history/libpng15/%%7Bversion... + +sources = %{thisapp}.tar.xz + +build + requires + pkg-config + zlib-devel + end + + install + # Install just the library and no headers. + mkdir -pv %{BUILDROOT}%{libdir} + install -m 755 .libs/libpng15.so.15.18.0 %{BUILDROOT}%{libdir} + ln -svf libpng15.so.15.18.0 %{BUILDROOT}%{libdir}/libpng15.so.15 + end +end + +packages + package %{name} + provides + libpng = %{thisver} + end + + obsoletes + libpng-compat + end + + conflicts + libpng <= %{thisver} + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/compat-mpfr/compat-mpfr.nm b/compat-mpfr/compat-mpfr.nm new file mode 100644 index 0000000..d9cfbb6 --- /dev/null +++ b/compat-mpfr/compat-mpfr.nm @@ -0,0 +1,69 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = compat-mpfr +version = 2.4.2 +release = 1 + +thisapp = mpfr-%{version} + +groups = System/Libraries +url = http://www.mpfr.org/ +license = LGPLv2+ and GPLv2+ and GFDL +summary = A C library for multiple-precision floating-point computations. + +description + The MPFR library is a C library for multiple-precision floating-point + computations with correct rounding. The MPFR is efficient and + also has a well-defined semantics. It copies the good ideas from the + ANSI/IEEE-754 standard for double-precision floating-point arithmetic + (53-bit mantissa). MPFR is based on the GMP multiple-precision + library. +end + +source_dl = http://ftp.gnu.org/gnu/mpfr/ + +build + requires + gmp-devel >= 4.3.2 + gmp-devel < 6.0.0 + end + + configure_options += \ + --enable-thread-safe \ + --disable-assert + + test + export LD_LIBRARY_PATH=$(pwd)/.libs + make check + end + + install + # Only install libraries. + mkdir -pv %{BUILDROOT}%{libdir} + install -m 644 .libs/libmpfr.so.1.2.2 %{BUILDROOT}%{libdir} + ln -svf libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}/libmpfr.so.1 + end +end + +packages + package %{name} + provides + mpfr = %{thisver} + end + + obsoletes + mpfr-compat + end + + conflicts + mpfr <= %{thisver} + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/compat-pcre/compat-pcre.nm b/compat-pcre/compat-pcre.nm new file mode 100644 index 0000000..5251971 --- /dev/null +++ b/compat-pcre/compat-pcre.nm @@ -0,0 +1,74 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = compat-pcre +version = 8.21 +release = 1 + +thisapp = pcre-%{version} + +groups = System/Libraries +url = http://www.pcre.org/ +license = BSD +summary = Perl-compatible regular expression library. + +description + Perl-compatible regular expression library. PCRE has its own native + API, but a set of "wrapper" functions that are based on the POSIX + API are also supplied in the library libpcreposix. +end + +source_dl = http://sourceforge.net/projects/pcre/files/pcre/%%7Bversion%7D/ + +build + requires + bzip2-devel + gcc-c++ + readline-devel + zlib-devel + end + + configure_options += \ + --disable-static \ + --docdir=/usr/share/doc/pcre-%{version} \ + --disable-jit \ + --enable-pcre8 \ + --enable-pcre16 \ + --enable-pcre32 \ + --enable-utf \ + --enable-unicode-properties \ + --enable-pcretest-libreadline + + test + make check + end + + install + # Only install libraries. + mkdir -pv %{BUILDROOT}%{libdir} + install -m 755 .libs/libpcre.so.0.0.1 %{BUILDROOT}%{libdir} + ln -svf libpcre.so.0.0.1 %{BUILDROOT}%{libdir}/libpcre.so.0 + end +end + +packages + package %{name} + provides + pcre = %{thisver} + end + + obsoletes + pcre-compat + end + + conflicts + pcre <= %{thisver} + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/libpng/libpng.nm b/libpng/libpng.nm index 688151f..50c44f2 100644 --- a/libpng/libpng.nm +++ b/libpng/libpng.nm @@ -5,9 +5,7 @@
name = libpng version = 1.6.10 -release = 1 - -compat_ver = 1.5.17 +release = 2
groups = System/Libraries url = http://www.libpng.org/pub/png/ @@ -25,35 +23,11 @@ end source_dl = http://downloads.sourceforge.net/project/libpng/libpng16/%%7Bversion%7D/ source_dl += http://downloads.sourceforge.net/project/libpng/history/libpng16/%%7Bversion...
-# Source URL for comat package. -source_dl += http://downloads.sourceforge.net/project/libpng/libpng15/%%7Bcompat_ver%7D/ -source_dl += http://downloads.sourceforge.net/project/libpng/history/libpng15/%%7Bcompat_... - -sources = %{thisapp}.tar.xz - -# File for compat package. -sources += %{name}-%{compat_ver}.tar.xz - build requires pkg-config zlib-devel end - - # Build compat package. - build_cmds - cd %{DIR_SRC}/%{name}-%{compat_ver} - ./configure %{configure_options} - - make %{PARALLELISMFLAGS} - end - - # Install compat package. - install_cmds - cd %{DIR_SRC}/%{name}-%{compat_ver} - install -m 755 .libs/libpng15.so.15.17.0 %{BUILDROOT}%{libdir} - ln -svf libpng15.so.15.17.0 %{BUILDROOT}%{libdir}/libpng15.so.15 - end end
packages @@ -65,14 +39,6 @@ packages requires = zlib-devel end
- package %{name}-compat - summary = Compat libraries of %{thisapp}. - - files - %{libdir}/%{name}15.so* - end - end - package %{name}-debuginfo template DEBUGINFO end diff --git a/mpfr/mpfr.nm b/mpfr/mpfr.nm index 0615b74..981bd8f 100644 --- a/mpfr/mpfr.nm +++ b/mpfr/mpfr.nm @@ -4,10 +4,8 @@ ###############################################################################
name = mpfr -version = 3.1.0 -release = 2 - -compat_version = 2.4.2 +version = 3.1.2 +release = 1
groups = System/Libraries url = http://www.mpfr.org/ @@ -24,41 +22,20 @@ description end
source_dl = http://mpfr.loria.fr/mpfr-%%7Bversion%7D/ -sources += %{name}-%{compat_version}.tar.bz2
build requires - gmp-devel>=4.3.2 + gmp-devel >= 4.3.2 end
configure_options += \ --enable-thread-safe \ --disable-assert
- build_cmds - - cd %{DIR_SRC}/%{name}-%{compat_version} - ./configure \ - %{configure_options} - - export LD_LIBRARY_PATH=$(pwd)/.libs - make %{PARALLELISMFLAGS} - end - test - export LD_LIBRARY_PATH=$(pwd)/.libs - make check - - cd %{DIR_SRC}/%{name}-%{compat_version} - export LD_LIBRARY_PATH=$(pwd)/.libs + export LD_LIBRARY_PATH=$(pwd)/src/.libs make check end - - install_cmds - cd %{DIR_SRC}/%{name}-%{compat_version} - install -m 644 .libs/libmpfr.so.1.2.2 %{BUILDROOT}%{libdir} - ln -svf libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}/libmpfr.so.1 - end end
packages @@ -68,14 +45,6 @@ packages template DEVEL end
- package %{name}-compat - summary = Compat libraries of %{thisapp}. - - files - %{libdir}/libmpfr.so.1* - end - end - package %{name}-debuginfo template DEBUGINFO end diff --git a/pcre/pcre.nm b/pcre/pcre.nm index a9cc86c..112df6a 100644 --- a/pcre/pcre.nm +++ b/pcre/pcre.nm @@ -5,9 +5,7 @@
name = pcre version = 8.35 -release = 2 - -compat_version = 8.21 +release = 3
groups = System/Libraries url = http://www.pcre.org/ @@ -21,7 +19,6 @@ description end
source_dl = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ -sources += %{name}-%{compat_version}.tar.gz
build requires @@ -42,25 +39,8 @@ build --enable-unicode-properties \ --enable-pcretest-libreadline
- build_cmds - cd %{DIR_SRC}/%{name}-%{compat_version} - ./configure \ - %{configure_options} - - make %{PARALLELISMFLAGS} - end - test make check - - cd %{DIR_SRC}/%{name}-%{compat_version} - make check - end - - install_cmds - cd %{DIR_SRC}/%{name}-%{compat_version} - install -m 755 .libs/libpcre.so.0.0.1 %{BUILDROOT}%{libdir} - ln -svf libpcre.so.0.0.1 %{BUILDROOT}%{libdir}/libpcre.so.0 end end
@@ -71,14 +51,6 @@ packages template DEVEL end
- package %{name}-compat - summary = Compat libraries of %{thisapp}. - - files - %{libdir}/libpcre.so.0* - end - end - package %{name}-debuginfo template DEBUGINFO end diff --git a/sudo/sudo.nm b/sudo/sudo.nm index e64071f..cef02e5 100644 --- a/sudo/sudo.nm +++ b/sudo/sudo.nm @@ -4,7 +4,7 @@ ###############################################################################
name = sudo -version = 1.8.5 +version = 1.8.10 release = 1
groups = Applications/System
hooks/post-receive -- IPFire 3.x development tree