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 f31f79566099b958c745af8fa584da897c24ec5b (commit) via 1b04fe02141c5dc2eb5f88febca737bcd08a9f3d (commit) via c7eb78df09889e49e45f4659f0df27fd628a17f3 (commit) via 2b694eae9613fc930665a8a81c48dc76e54bb1be (commit) via bc2ce527c60676bb4412d621e9e14d95df4d60c5 (commit) via 02ae8415436374b7857614eda7d1a08593c3deb7 (commit) via fae487d3953fa05286cacbb380cf37bf2d22a8a9 (commit) via 2997fa1356d297705bbee0cebef2de476d814ae7 (commit) via 75579550ad6075e5dc5f2138a6737d53785af8e6 (commit) from a0466ef3c30fd3f09c76400d1268e66079855800 (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 f31f79566099b958c745af8fa584da897c24ec5b Merge: 2997fa1356d297705bbee0cebef2de476d814ae7 1b04fe02141c5dc2eb5f88febca737bcd08a9f3d Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jul 2 21:05:48 2010 +0200
Merge remote branch 'stevee/updates' into next
Conflicts: pkgs/core/pcre/pcre.nm
commit 1b04fe02141c5dc2eb5f88febca737bcd08a9f3d Author: Schantl Stefan Stevee@ipfire.org Date: Thu Jul 1 18:27:12 2010 +0200
pcre: Clean up Naoki-Makefile.
commit c7eb78df09889e49e45f4659f0df27fd628a17f3 Author: Schantl Stefan Stevee@ipfire.org Date: Thu Jul 1 18:25:33 2010 +0200
pcre: Update to version 8.10.
commit 2b694eae9613fc930665a8a81c48dc76e54bb1be Author: Schantl Stefan Stevee@ipfire.org Date: Thu Jul 1 18:23:00 2010 +0200
cups: Update to version 1.4.4.
commit bc2ce527c60676bb4412d621e9e14d95df4d60c5 Author: Schantl Stefan Stevee@ipfire.org Date: Thu Jul 1 15:44:41 2010 +0200
glib2: Update to version 2.25.10.
commit 02ae8415436374b7857614eda7d1a08593c3deb7 Author: Schantl Stefan Stevee@ipfire.org Date: Thu Jul 1 15:38:31 2010 +0200
libpng: Also create a development package.
commit fae487d3953fa05286cacbb380cf37bf2d22a8a9 Author: Schantl Stefan Stevee@ipfire.org Date: Thu Jul 1 15:36:07 2010 +0200
libpng: Update to version 1.4.3.
commit 2997fa1356d297705bbee0cebef2de476d814ae7 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 29 23:09:01 2010 +0200
pcre: Update to 8.10.
commit 75579550ad6075e5dc5f2138a6737d53785af8e6 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 29 23:08:34 2010 +0200
libpng: Update to 1.4.3.
Fixes a security vulnerability.
-----------------------------------------------------------------------
Summary of changes: pkgs/core/cups/cups.nm | 2 +- pkgs/core/glib2/glib2.nm | 2 +- pkgs/core/libpng/libpng.nm | 6 ++++-- pkgs/core/pcre/pcre.nm | 13 ++++--------- 4 files changed, 10 insertions(+), 13 deletions(-)
Difference in files: diff --git a/pkgs/core/cups/cups.nm b/pkgs/core/cups/cups.nm index 54c0b93..bc09112 100644 --- a/pkgs/core/cups/cups.nm +++ b/pkgs/core/cups/cups.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = cups -PKG_VER = 1.4.2 +PKG_VER = 1.4.4 PKG_REL = 0
PKG_MAINTAINER = diff --git a/pkgs/core/glib2/glib2.nm b/pkgs/core/glib2/glib2.nm index aa16d0a..c2ec625 100644 --- a/pkgs/core/glib2/glib2.nm +++ b/pkgs/core/glib2/glib2.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = glib -PKG_VER = 2.25.6 +PKG_VER = 2.25.10 PKG_REL = 0
PKG_MAINTAINER = diff --git a/pkgs/core/libpng/libpng.nm b/pkgs/core/libpng/libpng.nm index 42b17e2..4074318 100644 --- a/pkgs/core/libpng/libpng.nm +++ b/pkgs/core/libpng/libpng.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = libpng -PKG_VER = 1.4.2 +PKG_VER = 1.4.3 PKG_REL = 0
PKG_MAINTAINER = @@ -37,6 +37,8 @@ PKG_SUMMARY = A library of functions for manipulating PNG image format files. PKG_BUILD_DEPS+= pkg-config PKG_DEPS += zlib
+PKG_PACKAGES += $(PKG_NAME_REAL)-devel + define PKG_DESCRIPTION The libpng package contains a library of functions for creating and \ manipulating PNG (Portable Network Graphics) image format files. \ @@ -45,4 +47,4 @@ define PKG_DESCRIPTION data compression algorithm. endef
-PKG_TARBALL = $(THISAPP).tar.bz2 +PKG_TARBALL = $(THISAPP).tar.gz diff --git a/pkgs/core/pcre/pcre.nm b/pkgs/core/pcre/pcre.nm index 4edc01d..416c73a 100644 --- a/pkgs/core/pcre/pcre.nm +++ b/pkgs/core/pcre/pcre.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = pcre -PKG_VER = 7.9 +PKG_VER = 8.10 PKG_REL = 0
PKG_MAINTAINER = @@ -44,19 +44,14 @@ endef
PKG_TARBALL = $(THISAPP).tar.bz2
-CONFIGURE_OPTIONS += --docdir=/usr/share/doc/pcre-$(PKG_VER) \ +CONFIGURE_OPTIONS += \ + --docdir=/usr/share/doc/pcre-$(PKG_VER) \ --enable-utf8 \ --enable-pcregrep-libz \ --enable-pcregrep-libbz2 \ --enable-unicode-properties
-############################################################################### -# Installation Details -############################################################################### - -define STAGE_INSTALL - cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) - +define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/{,usr/}lib mv -v $(BUILDROOT)/usr/lib/libpcre.so.* $(BUILDROOT)/lib/ ln -v -sf ../../lib/libpcre.so.0 $(BUILDROOT)/usr/lib/libpcre.so
hooks/post-receive -- IPFire 3.x development tree