[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. e1b31c036dc8a8dcaa22204aff72d835ccd7b616 - IPFire-SCM

3 Dec 2011

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  e1b31c036dc8a8dcaa22204aff72d835ccd7b616 (commit)
       via  ae6f32589832f85c502742a8cac247083987d6e6 (commit)
       via  143c9182c75ee18e97fdf08199fd7ac67d002ef7 (commit)
       via  cf7602973c2d374a326c9019bc6e7d8806748366 (commit)
       via  9404139349193d382fef845face84807a462d189 (commit)
       via  02f961d5ad2fea693194504955cf50f097215b83 (commit)
       via  d2a424c0a1c51bd8c6ff11f85e68494c68ea8444 (commit)
       via  1e5437ea3fdedb009aa1f0cedccbf4d76eb32253 (commit)
       via  4e8d9a7ce69ae179da20d2feb0d3c979224df521 (commit)
      from  a7b2a2e9776bdea6c57071654f47f9805a0f7f61 (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 e1b31c036dc8a8dcaa22204aff72d835ccd7b616
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Dec 3 10:09:32 2011 +0100
ncurses: Refactor package.
There is now a narrowc version of library (without wide character support)
    and some basic terminfos are kept in /lib/terminfo.
commit ae6f32589832f85c502742a8cac247083987d6e6
Merge: 143c918 1e5437e
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Dec 1 21:37:57 2011 +0100
Merge remote-tracking branch 'maniacikarus/pango'
commit 143c9182c75ee18e97fdf08199fd7ac67d002ef7
Merge: cf76029 d2a424c
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Dec 1 21:37:53 2011 +0100
Merge remote-tracking branch 'maniacikarus/grep'
commit cf7602973c2d374a326c9019bc6e7d8806748366
Merge: 9404139 4e8d9a7
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Dec 1 21:37:48 2011 +0100
Merge remote-tracking branch 'maniacikarus/glib'
commit 9404139349193d382fef845face84807a462d189
Merge: a7b2a2e 02f961d
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Dec 1 21:37:39 2011 +0100
Merge remote-tracking branch 'maniacikarus/cyrus-sasl'
commit 02f961d5ad2fea693194504955cf50f097215b83
Author: Christian Schmidt christian.schmidt@ipfire.org
Date:   Wed Nov 30 20:20:53 2011 +0000
cyrus-sasl: Updated to latest stable 2.1.25
Fixes #290
commit d2a424c0a1c51bd8c6ff11f85e68494c68ea8444
Author: Christian Schmidt christian.schmidt@ipfire.org
Date:   Wed Nov 30 20:13:09 2011 +0000
grep: Updated to latest stable 2.10
Fixes #289
commit 1e5437ea3fdedb009aa1f0cedccbf4d76eb32253
Author: Christian Schmidt christian.schmidt@ipfire.org
Date:   Wed Nov 30 20:03:58 2011 +0000
pango: Updated to latest version 1.29.5
Fixes #296
commit 4e8d9a7ce69ae179da20d2feb0d3c979224df521
Author: Christian Schmidt christian.schmidt@ipfire.org
Date:   Wed Nov 30 19:59:11 2011 +0000
glib2: Update to latest version 2.31.2
Fixes #297
-----------------------------------------------------------------------
Summary of changes:
 cyrus-sasl/cyrus-sasl.nm                           |    6 +-
 .../patches/cyrus-sasl-2.1.23-bad-elif.patch       |   21 ----
 glib2/glib2.nm                                     |    4 +-
 grep/grep.nm                                       |    4 +-
 ncurses/ncurses.nm                                 |   98 +++++++++++++++++---
 pango/pango.nm                                     |    6 +-
 6 files changed, 95 insertions(+), 44 deletions(-)
 delete mode 100644 cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch
Difference in files:

diff --git a/cyrus-sasl/cyrus-sasl.nm b/cyrus-sasl/cyrus-sasl.nm
index beab615..b28d402 100644
--- a/cyrus-sasl/cyrus-sasl.nm
+++ b/cyrus-sasl/cyrus-sasl.nm
@@ -4,8 +4,8 @@
 ###############################################################################
name       = cyrus-sasl
-version    = 2.1.23
-release    = 0
+version    = 2.1.25
+release    = 1
groups     = System/Libraries
 url        = http://asg.web.cmu.edu/sasl/sasl-library.html
@@ -18,7 +18,7 @@ description
    adding authentication support to connection-based protocols.
 end
-source_dl  =
+source_dl  = ftp://ftp.cyrusimap.org/cyrus-sasl/
build
    requires
diff --git a/cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch b/cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch
deleted file mode 100644
index 33550c4..0000000
--- a/cyrus-sasl/patches/cyrus-sasl-2.1.23-bad-elif.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up cyrus-sasl-2.1.22/plugins/digestmd5.c.elif cyrus-sasl-2.1.22/plugins/digestmd5.c
---- cyrus-sasl-2.1.22/plugins/digestmd5.c.elif	2009-01-23 09:40:31.000000000 +0100
-+++ cyrus-sasl-2.1.22/plugins/digestmd5.c	2009-02-06 15:20:15.000000000 +0100
-@@ -2743,7 +2743,7 @@ static sasl_server_plug_t digestmd5_serv
- 	"DIGEST-MD5",			/* mech_name */
- #ifdef WITH_RC4
- 	128,				/* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 	112,
- #else 
- 	1,
-@@ -4071,7 +4071,7 @@ static sasl_client_plug_t digestmd5_clie
- 	"DIGEST-MD5",
- #ifdef WITH_RC4				/* mech_name */
- 	128,				/* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 	112,
- #else
- 	1,
diff --git a/glib2/glib2.nm b/glib2/glib2.nm
index 8030409..04efcba 100644
--- a/glib2/glib2.nm
+++ b/glib2/glib2.nm
@@ -4,8 +4,8 @@
 ###############################################################################
name       = glib2
-ver_major  = 2.30
-version    = %{ver_major}.1
+ver_major  = 2.31
+version    = %{ver_major}.2
 release    = 1
 thisapp    = glib-%{version}
diff --git a/grep/grep.nm b/grep/grep.nm
index c6476b2..1a1a138 100644
--- a/grep/grep.nm
+++ b/grep/grep.nm
@@ -4,7 +4,7 @@
 ###############################################################################
name       = grep
-version    = 2.9
+version    = 2.10
 release    = 1
groups     = Base Build Applications/Text
@@ -18,7 +18,7 @@ description
    prints the matching lines. GNU's grep utilities include grep, egrep and fgrep.
 end
-source_dl  =
+source_dl  = ftp://ftp.gnu.org/gnu/grep/
 sources    = %{thisapp}.tar.xz
build
diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm
index 81d989a..e35e83b 100644
--- a/ncurses/ncurses.nm
+++ b/ncurses/ncurses.nm
@@ -5,7 +5,7 @@
name       = ncurses
 version    = 5.9
-release    = 3
+release    = 4
groups     = System/Base
 url        = http://invisible-island.net/ncurses/ncurses.html
@@ -30,23 +30,92 @@ build
    	--mandir=/usr/share/man \
    	--with-shared \
    	--without-debug \
-		--enable-widec \
-		--disable-static \
-		--enable-symlinks \
-		--disable-root-environ
+		--without-ada \
+		--with-ospeed=unsigned \
+		--with-chtype=long \
+		--enable-hard-tabs \
+		--enable-xmc-glitch \
+		--enable-colorfgbg \
+		--with-terminfo-dirs=/etc/terminfo:/usr/share/terminfo:/lib/terminfo \
+		--enable-overwrite \
+		--enable-pc-files \
+		--with-termlib=tinfo
-	install_cmds
+	export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig
+
+	build
+		mkdir -pv narrowc widec
+
+		# Build narrowc version.
+		cd narrowc
+		ln -svf ../configure .
+		./configure %{configure_options} --with-ticlib
+		make %{PARALLELISMFLAGS} libs
+		make %{PARALLELISMFLAGS} -C progs
+
+		# Build widec version.
+		cd ../widec
+		ln -svf ../configure .
+		./configure %{configure_options} --enable-widec --without-progs
+		make %{PARALLELISMFLAGS} libs
+		cd ..
+	end
+
+	install
+		make -C narrowc DESTDIR=%{BUILDROOT} install.{libs,progs,data}
+		rm -rvf %{BUILDROOT}/usr/lib/libtinfo.*
+		make -C widec DESTDIR=%{BUILDROOT} install.{libs,includes,man}
+
+		chmod -v 755 %{BUILDROOT}/usr/lib/lib*.so.*.*
+
+		# move lib{ncurses{,w},tinfo}.so.* to /lib*
    	mkdir -pv %{BUILDROOT}/lib
-		mv -v %{BUILDROOT}/usr/lib/libncursesw.so.5* %{BUILDROOT}/lib
-		ln -sfv ../../lib/libncursesw.so.5 %{BUILDROOT}/usr/lib/libncursesw.so
-		for lib in curses ncurses form panel menu; do
-			rm -vf %{BUILDROOT}/usr/lib/lib${lib}.so
-			echo "INPUT(-l${lib}w)" >%{BUILDROOT}/usr/lib/lib${lib}.so
+		mv -v %{BUILDROOT}/usr/lib/lib{ncurses{,w},tinfo}.so.* %{BUILDROOT}/lib
+		for l in %{BUILDROOT}/usr/lib/lib{ncurses{,w},tinfo}.so; do
+			ln -sf $(echo /usr/lib | \
+				sed 's,(^/|)[^/][^/]*,..,g')/lib/$(readlink $l) $l
    	done
+		mkdir -pv %{BUILDROOT}/{etc,lib}/terminfo
+
+		# move few basic terminfo entries to /lib
+		baseterms=
+		for termname in \
+				ansi dumb linux vt100 vt100-nav vt102 vt220 vt52; do
+			for t in $(find %{BUILDROOT}/usr/share/terminfo \
+					-samefile %{BUILDROOT}/usr/share/terminfo/${termname::1}/$termname); do
+				baseterms="$baseterms $(basename $t)"
+			done
+		done
+		for termname in ${baseterms}; do
+			termpath=terminfo/${termname::1}/${termname}
+			mkdir -pv %{BUILDROOT}/lib/terminfo/${termname::1}
+			mv -v %{BUILDROOT}/usr/share/${termpath} %{BUILDROOT}/lib/${termpath}
+			ln -svf $(dirname /usr/share/${termpath} | \
+					sed 's,(^/|)[^/][^/]*,..,g')/lib/${termpath} \
+				%{BUILDROOT}/usr/share//${termpath}
+		done
+
+		# can't replace directory with symlink, symlink all headers
+		#mkdir %{BUILDROOT}/usr/include/ncurses{,w}
+		#for l in %{BUILDROOT}/usr/include/*.h; do
+		#	ln -s ../$(basename $l) %{BUILDROOT}/usr/include/ncurses
+		#	ln -s ../$(basename $l) %{BUILDROOT}/usr/include/ncursesw
+		#done
+
+		# don't require -ltinfo when linking with --no-add-needed
+		for l in %{BUILDROOT}/usr/lib/libncurses{,w}.so; do
+			soname=$(basename $(readlink $l))
+			rm -f $l
+			echo "INPUT($soname -ltinfo)" > $l
+		done
+
+		rm -f %{BUILDROOT}/usr/lib/libcurses{,w}.so
+		echo "INPUT(-lncurses)" > %{BUILDROOT}/usr/lib/libcurses.so
+		echo "INPUT(-lncursesw)" > %{BUILDROOT}/usr/lib/libcursesw.so
+		echo "INPUT(-ltinfo)" > %{BUILDROOT}/usr/lib/libtermcap.so
-		rm -vf %{BUILDROOT}/usr/lib/libcursesw.so
-		echo "INPUT(-lncursesw)" >%{BUILDROOT}/usr/lib/libcursesw.so
-		ln -sfv libncurses.so %{BUILDROOT}/usr/lib/libcurses.so
+		rm -vf %{BUILDROOT}/usr/lib/terminfo
+		rm -vf %{BUILDROOT}/usr/lib/pkgconfig/{*_g,ncurses++*}.pc
    end
 end
@@ -89,6 +158,7 @@ packages
    	conflicts = ncurses<=5.9-1
files
+			/lib/terminfo
    		/usr/share/terminfo/*/Eterm*
    		/usr/share/terminfo/*/aterm
    		/usr/share/terminfo/*/bterm
diff --git a/pango/pango.nm b/pango/pango.nm
index d189ce1..71c99eb 100644
--- a/pango/pango.nm
+++ b/pango/pango.nm
@@ -4,7 +4,8 @@
 ###############################################################################
name       = pango
-version    = 1.29.3
+major	   = 1.29
+version    = %{major}.5
 release    = 1
groups     = System/Libraries
@@ -17,7 +18,7 @@ description
    emphasis on internationalization.
 end
-source_dl  =
+source_dl  = http://ftp.gnome.org/pub/GNOME/sources/pango/%%7Bmajor%7D/
 sources    = %{thisapp}.tar.xz
build
@@ -27,6 +28,7 @@ build
    	freetype-devel
    	gcc-c++
    	glib2-devel
+		glibc-devel
    	perl
    	pkg-config
    end
hooks/post-receive
--
IPFire 3.x development tree

    