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 32dd65d0dce5328f91cc87ec3620151af91b4061 (commit) via fdc6f71fcf017e43ffae2ce581060eaf47190035 (commit) via 2a0d0c295507a78c50d5757cdd22dd8c6cf791af (commit) via 348705648d1a346abcdf7ee805d099ad41dc29e8 (commit) via ac09410072acde7194125e021d7e7a23dd1480a5 (commit) via 8cfd997ff1251b6429896eae4d956a7430cff544 (commit) via 24c66e44e7568e887f61b4f2473507eb7b943ec1 (commit) via c712511efea0180c60b7b1735e17d34cddfe2cdd (commit) from bb10029704219063a42ef4119bf72e11a127c401 (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 32dd65d0dce5328f91cc87ec3620151af91b4061 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 12 22:08:29 2013 +0100
curl: Update to 7.29.0.
Major update to latest version. Fixes CVE-2013-0249.
commit fdc6f71fcf017e43ffae2ce581060eaf47190035 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 12 21:44:10 2013 +0100
pango: Update to 1.32.5.
Update to the latest stable version. Enable introspection support.
commit 2a0d0c295507a78c50d5757cdd22dd8c6cf791af Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 12 21:22:27 2013 +0100
harfbuzz: Update to 0.9.12.
This is an update to the latest stable version of harfbuzz. Activate support for icu.
commit 348705648d1a346abcdf7ee805d099ad41dc29e8 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Feb 12 21:20:28 2013 +0100
icu: New package.
This is a build dependency of harfbuzz with icu support and webkitgtk3.
commit ac09410072acde7194125e021d7e7a23dd1480a5 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Feb 3 20:10:18 2013 +0100
gobject-intospection: Update to 1.35.4.
Update to the latest version.
commit 8cfd997ff1251b6429896eae4d956a7430cff544 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Feb 3 20:09:32 2013 +0100
glib2: Update to 2.35.4.
Update to the latest stable version.
commit 24c66e44e7568e887f61b4f2473507eb7b943ec1 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Feb 3 20:08:50 2013 +0100
gdk-pixbuf2: Update to 2.27.1.
Major update to latest stable.
commit c712511efea0180c60b7b1735e17d34cddfe2cdd Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Feb 3 20:07:17 2013 +0100
cairo: Update to 1.12.12.
This is a major update to the latest stable version.
* Enable introspection support. * Ship introspection with own packages.
-----------------------------------------------------------------------
Summary of changes: cairo/cairo.nm | 41 +++++++++++- curl/curl.nm | 4 +- curl/patches/0101-curl-7.21.1-multilib.patch | 64 ------------------- curl/patches/0101-curl-7.29.0-multilib.patch | 72 ++++++++++++++++++++++ ....2-debug.patch => 0102-curl-7.29.0-debug.patch} | 33 ++++++---- gdk-pixbuf2/gdk-pixbuf2.nm | 7 ++- glib2/glib2.nm | 2 +- gobject-introspection/gobject-introspection.nm | 16 +++-- harfbuzz/harfbuzz.nm | 6 +- icu/icu.nm | 68 ++++++++++++++++++++ pango/pango.nm | 19 +++--- 11 files changed, 231 insertions(+), 101 deletions(-) delete mode 100644 curl/patches/0101-curl-7.21.1-multilib.patch create mode 100644 curl/patches/0101-curl-7.29.0-multilib.patch rename curl/patches/{curl-7.21.2-debug.patch => 0102-curl-7.29.0-debug.patch} (72%) create mode 100644 icu/icu.nm
Difference in files: diff --git a/cairo/cairo.nm b/cairo/cairo.nm index 5b05833..55b92f8 100644 --- a/cairo/cairo.nm +++ b/cairo/cairo.nm @@ -4,7 +4,7 @@ ###############################################################################
name = cairo -version = 1.12.4 +version = 1.12.12 release = 1
groups = System/Graphics @@ -25,6 +25,7 @@ build binutils>=2.21.51.0.8-2 fontconfig-devel freetype-devel + gobject-introspection-devel libX11-devel libXext-devel>=1.3.1 libxml2-devel @@ -37,12 +38,30 @@ build configure_options += \ --enable-xlib \ --enable-xml \ + --enable-gobject \ + --disable-gtk-doc \ --disable-static end
packages package %{name}
+ package %{name}-gobject + summary = GObject bindings for cairo. + description + This package contains functionality to make cairo + graphics library integrate well with the GObject object system. + end + + requires + cairo = %{thisver} + end + + files + %{libdir}/*gobject.so.* + end + end + package %{name}-devel template DEVEL
@@ -55,6 +74,26 @@ packages end end
+ package %{name}-gobject-devel + summary = Development files for cairo-gobject. + description + This package contains libraries, header files and developer + documentation needed for developing software which uses the + cairo Gobject library. + end + + requires + %{name}-gobject = %{thisver} + %{name}-devel = %{thisver} + end + + files + %{libdir}/*gobject.so + %{libdir}/pkgconfig/*gobject.pc + %{includedir}/cairo/*gobject.h + end + end + package %{name}-debuginfo template DEBUGINFO end diff --git a/curl/curl.nm b/curl/curl.nm index 4581431..6cfa7b5 100644 --- a/curl/curl.nm +++ b/curl/curl.nm @@ -4,8 +4,8 @@ ###############################################################################
name = curl -version = 7.24.0 -release = 4 +version = 7.29.0 +release = 1
groups = Application/Internet url = http://www.curl.haxx.se/ diff --git a/curl/patches/0101-curl-7.21.1-multilib.patch b/curl/patches/0101-curl-7.21.1-multilib.patch deleted file mode 100644 index 83c1cd8..0000000 --- a/curl/patches/0101-curl-7.21.1-multilib.patch +++ /dev/null @@ -1,64 +0,0 @@ - curl-config.in | 22 ++++------------------ - libcurl.pc.in | 1 + - 2 files changed, 5 insertions(+), 18 deletions(-) - -diff --git a/curl-config.in b/curl-config.in -index ebda129..b404827 100644 ---- a/curl-config.in -+++ b/curl-config.in -@@ -43,7 +43,6 @@ Available values for OPTION include: - --libs library linking information - --prefix curl install prefix - --protocols newline separated list of enabled protocols -- --static-libs static libcurl library linking information - --version output version information - --vernum output the version information as a number (hexadecimal) - EOF -@@ -74,7 +73,7 @@ while test $# -gt 0; do - ;; - - --cc) -- echo "@CC@" -+ echo "gcc" - ;; - - --prefix) -@@ -136,25 +135,12 @@ while test $# -gt 0; do - ;; - - --libs) -- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then -- CURLLIBDIR="-L@libdir@ " -- else -- CURLLIBDIR="" -- fi -- if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then -- echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ -- else -- echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@ -- fi -- ;; -- -- --static-libs) -- echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ -+ pkg-config libcurl --libs - ;; - - --configure) -- echo @CONFIGURE_OPTIONS@ -- ;; -+ pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//' -+ ;; - - *) - echo "unknown option: $1" ---- a/libcurl.pc.in -+++ b/libcurl.pc.in -@@ -29,6 +29,7 @@ libdir=@libdir@ - includedir=@includedir@ - supported_protocols="@SUPPORT_PROTOCOLS@" - supported_features="@SUPPORT_FEATURES@" -+configure_options=@CONFIGURE_OPTIONS@ - - Name: libcurl - URL: http://curl.haxx.se/ diff --git a/curl/patches/0101-curl-7.29.0-multilib.patch b/curl/patches/0101-curl-7.29.0-multilib.patch new file mode 100644 index 0000000..38aa86c --- /dev/null +++ b/curl/patches/0101-curl-7.29.0-multilib.patch @@ -0,0 +1,72 @@ + curl-config.in | 16 +++------------- + docs/curl-config.1 | 4 +++- + libcurl.pc.in | 1 + + 3 files changed, 7 insertions(+), 14 deletions(-) + +diff --git a/curl-config.in b/curl-config.in +index 150004d..95d0759 100644 +--- a/curl-config.in ++++ b/curl-config.in +@@ -75,7 +75,7 @@ while test $# -gt 0; do + ;; + + --cc) +- echo "@CC@" ++ echo "gcc" + ;; + + --prefix) +@@ -142,24 +142,14 @@ while test $# -gt 0; do + ;; + + --libs) +- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then +- CURLLIBDIR="-L@libdir@ " +- else +- CURLLIBDIR="" +- fi +- if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then +- echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ +- else +- echo ${CURLLIBDIR}-lcurl +- fi ++ pkg-config libcurl --libs + ;; + + --static-libs) +- echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ + ;; + + --configure) +- echo @CONFIGURE_OPTIONS@ ++ pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//' + ;; + + *) +diff --git a/docs/curl-config.1 b/docs/curl-config.1 +index c4f4e2b..3e0ea60 100644 +--- a/docs/curl-config.1 ++++ b/docs/curl-config.1 +@@ -65,7 +65,9 @@ be listed using uppercase and are separa + one, or several protocols in the list. (Added in 7.13.0) + .IP "--static-libs" + Shows the complete set of libs and other linker options you will need in order +-to link your application with libcurl statically. (Added in 7.17.1) ++to link your application with libcurl statically. Note that Fedora/RHEL libcurl ++packages do not provide any static libraries, thus cannot be linked statically. ++(Added in 7.17.1) + .IP "--version" + Outputs version information about the installed libcurl. + .IP "--vernum" +diff --git a/libcurl.pc.in b/libcurl.pc.in +index 2ba9c39..f8f8b00 100644 +--- a/libcurl.pc.in ++++ b/libcurl.pc.in +@@ -29,6 +29,7 @@ libdir=@libdir@ + includedir=@includedir@ + supported_protocols="@SUPPORT_PROTOCOLS@" + supported_features="@SUPPORT_FEATURES@" ++configure_options=@CONFIGURE_OPTIONS@ + + Name: libcurl + URL: http://curl.haxx.se/ diff --git a/curl/patches/0102-curl-7.29.0-debug.patch b/curl/patches/0102-curl-7.29.0-debug.patch new file mode 100644 index 0000000..7f70530 --- /dev/null +++ b/curl/patches/0102-curl-7.29.0-debug.patch @@ -0,0 +1,65 @@ +From 6710648c2b270c9ce68a7d9f1bba1222c7be8b58 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka kdudka@redhat.com +Date: Wed, 31 Oct 2012 11:38:30 +0100 +Subject: [PATCH] prevent configure script from discarding -g in CFLAGS (#496778) + +--- + configure | 13 +++---------- + m4/curl-compilers.m4 | 13 +++---------- + 2 files changed, 6 insertions(+), 20 deletions(-) + +diff --git a/configure b/configure +index 8f079a3..53b4774 100755 +--- a/configure ++++ b/configure +@@ -15759,18 +15759,11 @@ $as_echo "yes" >&6; } + gccvhi=`echo $gccver | cut -d . -f1` + gccvlo=`echo $gccver | cut -d . -f2` + compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` +- flags_dbg_all="-g -g0 -g1 -g2 -g3" +- flags_dbg_all="$flags_dbg_all -ggdb" +- flags_dbg_all="$flags_dbg_all -gstabs" +- flags_dbg_all="$flags_dbg_all -gstabs+" +- flags_dbg_all="$flags_dbg_all -gcoff" +- flags_dbg_all="$flags_dbg_all -gxcoff" +- flags_dbg_all="$flags_dbg_all -gdwarf-2" +- flags_dbg_all="$flags_dbg_all -gvms" ++ flags_dbg_all="" + flags_dbg_yes="-g" + flags_dbg_off="" +- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" +- flags_opt_yes="-O2" ++ flags_opt_all="" ++ flags_opt_yes="" + flags_opt_off="-O0" + + if test -z "$SED"; then +diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4 +index 0cbba7a..9175b5b 100644 +--- a/m4/curl-compilers.m4 ++++ b/m4/curl-compilers.m4 +@@ -148,18 +148,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [ + gccvhi=`echo $gccver | cut -d . -f1` + gccvlo=`echo $gccver | cut -d . -f2` + compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` +- flags_dbg_all="-g -g0 -g1 -g2 -g3" +- flags_dbg_all="$flags_dbg_all -ggdb" +- flags_dbg_all="$flags_dbg_all -gstabs" +- flags_dbg_all="$flags_dbg_all -gstabs+" +- flags_dbg_all="$flags_dbg_all -gcoff" +- flags_dbg_all="$flags_dbg_all -gxcoff" +- flags_dbg_all="$flags_dbg_all -gdwarf-2" +- flags_dbg_all="$flags_dbg_all -gvms" ++ flags_dbg_all="" + flags_dbg_yes="-g" + flags_dbg_off="" +- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" +- flags_opt_yes="-O2" ++ flags_opt_all="" ++ flags_opt_yes="" + flags_opt_off="-O0" + CURL_CHECK_DEF([_WIN32], [], [silent]) + else +-- +1.7.1 + diff --git a/curl/patches/curl-7.21.2-debug.patch b/curl/patches/curl-7.21.2-debug.patch deleted file mode 100644 index 7691826..0000000 --- a/curl/patches/curl-7.21.2-debug.patch +++ /dev/null @@ -1,58 +0,0 @@ - configure | 15 ++++----------- - m4/curl-compilers.m4 | 15 ++++----------- - 2 files changed, 8 insertions(+), 22 deletions(-) - -diff --git a/configure b/configure -index d3ecf69..6d8f085 100755 ---- a/configure -+++ b/configure -@@ -15040,18 +15040,11 @@ $as_echo "yes" >&6; } - gccvhi=`echo $gccver | cut -d . -f1` - gccvlo=`echo $gccver | cut -d . -f2` - compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` -- flags_dbg_all="-g -g0 -g1 -g2 -g3" -- flags_dbg_all="$flags_dbg_all -ggdb" -- flags_dbg_all="$flags_dbg_all -gstabs" -- flags_dbg_all="$flags_dbg_all -gstabs+" -- flags_dbg_all="$flags_dbg_all -gcoff" -- flags_dbg_all="$flags_dbg_all -gxcoff" -- flags_dbg_all="$flags_dbg_all -gdwarf-2" -- flags_dbg_all="$flags_dbg_all -gvms" -+ flags_dbg_all="" - flags_dbg_yes="-g" -- flags_dbg_off="-g0" -- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" -- flags_opt_yes="-O2" -+ flags_dbg_off="" -+ flags_opt_all="" -+ flags_opt_yes="" - flags_opt_off="-O0" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4 -index 1ea4d17..868d65a 100644 ---- a/m4/curl-compilers.m4 -+++ b/m4/curl-compilers.m4 -@@ -148,18 +148,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [ - gccvhi=`echo $gccver | cut -d . -f1` - gccvlo=`echo $gccver | cut -d . -f2` - compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` -- flags_dbg_all="-g -g0 -g1 -g2 -g3" -- flags_dbg_all="$flags_dbg_all -ggdb" -- flags_dbg_all="$flags_dbg_all -gstabs" -- flags_dbg_all="$flags_dbg_all -gstabs+" -- flags_dbg_all="$flags_dbg_all -gcoff" -- flags_dbg_all="$flags_dbg_all -gxcoff" -- flags_dbg_all="$flags_dbg_all -gdwarf-2" -- flags_dbg_all="$flags_dbg_all -gvms" -+ flags_dbg_all="" - flags_dbg_yes="-g" -- flags_dbg_off="-g0" -- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" -- flags_opt_yes="-O2" -+ flags_dbg_off="" -+ flags_opt_all="" -+ flags_opt_yes="" - flags_opt_off="-O0" - else - AC_MSG_RESULT([no]) diff --git a/gdk-pixbuf2/gdk-pixbuf2.nm b/gdk-pixbuf2/gdk-pixbuf2.nm index 3d0da3d..d13409d 100644 --- a/gdk-pixbuf2/gdk-pixbuf2.nm +++ b/gdk-pixbuf2/gdk-pixbuf2.nm @@ -4,8 +4,9 @@ ###############################################################################
name = gdk-pixbuf2 -version = %{major_ver}.5 -major_ver = 2.26 +version = %{ver_major}.%{ver_minor} +ver_major = 2.27 +ver_minor = 1 release = 1
groups = System/Libraries @@ -20,7 +21,7 @@ end
thisapp = gdk-pixbuf-%{version}
-source_dl = http://download.gnome.org/sources/gdk-pixbuf/%%7Bmajor_ver%7D/ +source_dl = http://download.gnome.org/sources/gdk-pixbuf/%%7Bver_major%7D/ sources = %{thisapp}.tar.xz
build diff --git a/glib2/glib2.nm b/glib2/glib2.nm index d08a1b5..be45b4c 100644 --- a/glib2/glib2.nm +++ b/glib2/glib2.nm @@ -5,7 +5,7 @@
name = glib2 ver_major = 2.35 -ver_minor = 1 +ver_minor = 4 version = %{ver_major}.%{ver_minor} release = 1 thisapp = glib-%{version} diff --git a/gobject-introspection/gobject-introspection.nm b/gobject-introspection/gobject-introspection.nm index 30add8b..1f6bc03 100644 --- a/gobject-introspection/gobject-introspection.nm +++ b/gobject-introspection/gobject-introspection.nm @@ -7,8 +7,8 @@ name = gobject-introspection version = %{major_ver}.%{minor_ver} release = 1
-major_ver = 1.31 -minor_ver = 22 +major_ver = 1.35 +minor_ver = 4
groups = Development/Libraries url = http://live.gnome.org/GObjectIntrospection @@ -16,9 +16,9 @@ license = GPLv2+, LGPLv2+, MIT summary = Introspection system for GObject-based libraries.
description - GObject Introspection can scan C header and source files in order \ - to generate introspection "typelib" files. It also provides an API to \ - examine typelib files, useful for creating language bindings among \ + GObject Introspection can scan C header and source files in order + to generate introspection "typelib" files. It also provides an API to + examine typelib files, useful for creating language bindings among other things. end
@@ -38,10 +38,6 @@ build
configure_options += \ --disable-static - - test - make check - end end
packages @@ -55,6 +51,8 @@ packages template DEVEL
requires = %{name}=%{thisver} + + files += %{datadir}/gir* end
package %{name}-debuginfo diff --git a/harfbuzz/harfbuzz.nm b/harfbuzz/harfbuzz.nm index 7ab7e1e..c899b8d 100644 --- a/harfbuzz/harfbuzz.nm +++ b/harfbuzz/harfbuzz.nm @@ -4,7 +4,7 @@ ###############################################################################
name = harfbuzz -version = 0.9.4 +version = 0.9.12 release = 1
groups = System/Libraries @@ -24,8 +24,12 @@ build cairo-devel freetype-devel glib2-devel + icu-devel end
+ configure_options += \ + --disable-static + test make check end diff --git a/icu/icu.nm b/icu/icu.nm new file mode 100644 index 0000000..9693bb1 --- /dev/null +++ b/icu/icu.nm @@ -0,0 +1,68 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = icu +version = %{ver_major}.%{ver_minor}.%{ver_plevel} +ver_major = 50 +ver_minor = 1 +ver_plevel = 2 +release = 1 + +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/%%7Bversion%7D/ +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 + + 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 +end + +packages + package %{name} + + package lib%{name} + template LIBS + end + + package lib%{name}-devel + template DEVEL + + files += \ + %{bindir}/*config* \ + %{bindir}/icuinfo \ + %{libidir}/%{name} \ + %{datadir}/%{name} + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/pango/pango.nm b/pango/pango.nm index be1409d..7b7b5c7 100644 --- a/pango/pango.nm +++ b/pango/pango.nm @@ -4,8 +4,9 @@ ###############################################################################
name = pango -major = 1.31 -version = %{major}.0 +version = %{ver_major}.%{ver_minor} +ver_major = 1.32 +ver_minor = 5 release = 1
groups = System/Libraries @@ -18,25 +19,26 @@ description emphasis on internationalization. end
-source_dl = http://ftp.gnome.org/pub/GNOME/sources/pango/%%7Bmajor%7D/ +source_dl = http://ftp.gnome.org/pub/GNOME/sources/%%7Bname%7D/%%7Bver_major%7D/ sources = %{thisapp}.tar.xz
build requires - cairo-devel + cairo-gobject-devel fontconfig-devel freetype-devel gcc-c++ glib2-devel - glibc-devel - harfbuzz-devel + gobject-introspection-devel + harfbuzz-devel >= 0.9.9 libXft-devel perl pkg-config end
configure_options += \ - --sysconfdir=/etc + --enable-introspection=yes + end
packages @@ -47,7 +49,10 @@ packages
requires glib2-devel + harfbuzz-devel end + + files += %{datadir}/gir* end
package %{name}-debuginfo
hooks/post-receive -- IPFire 3.x development tree