[csw-devel] SF.net SVN: gar:[12997] csw/mgar/pkg/gnutls/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Tue Jan 18 14:23:16 CET 2011


Revision: 12997
          http://gar.svn.sourceforge.net/gar/?rev=12997&view=rev
Author:   dmichelsen
Date:     2011-01-18 13:23:16 +0000 (Tue, 18 Jan 2011)

Log Message:
-----------
gnutls: Update to 2.10.4, remove legacy .so.13 provided by another branch and split package

Modified Paths:
--------------
    csw/mgar/pkg/gnutls/trunk/Makefile
    csw/mgar/pkg/gnutls/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/gnutls/trunk/files/0001-Do-not-strip-norunpath.patch

Removed Paths:
-------------
    csw/mgar/pkg/gnutls/trunk/files/libgnutls-openssl.so.13.i
    csw/mgar/pkg/gnutls/trunk/files/libgnutls-openssl.so.13.s
    csw/mgar/pkg/gnutls/trunk/files/libgnutls.so.13.i
    csw/mgar/pkg/gnutls/trunk/files/libgnutls.so.13.s

Modified: csw/mgar/pkg/gnutls/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnutls/trunk/Makefile	2011-01-18 12:49:25 UTC (rev 12996)
+++ csw/mgar/pkg/gnutls/trunk/Makefile	2011-01-18 13:23:16 UTC (rev 12997)
@@ -1,5 +1,5 @@
 NAME = gnutls
-VERSION = 2.8.6
+VERSION = 2.10.4
 CATEGORIES = lib
 
 DESCRIPTION = GNU Transport Layer Security libraries and tools
@@ -9,25 +9,56 @@
   library implements the proposed standards by the IETF's TLS working group.
 endef
 
-PACKAGES = CSWgnutls CSWgnutlsdevel
-CATALOGNAME_CSWgnutls = gnutls
-CATALOGNAME_CSWgnutlsdevel = gnutls_devel
-SPKG_DESC_CSWgnutls = GNU Transport Layer Security libraries and tools
-SPKG_DESC_CSWgnutlsdevel = GNU Transport Layer Security development headers and tools
-
 MASTER_SITES = $(GNU_MIRROR)
 MASTER_SITES += http://alpha.gnu.org/gnu/gnutls/
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
-DISTFILES += libgnutls-openssl.so.13.i
-DISTFILES += libgnutls-openssl.so.13.s
-DISTFILES += libgnutls.so.13.i
-DISTFILES += libgnutls.so.13.s
+PATCHFILES += 0001-Do-not-strip-norunpath.patch
 
-SPKG_SOURCEURL = http://www.gnu.org/software/gnutls/
-
-# We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
+VENDOR_URL = http://www.gnu.org/software/gnutls/
+
+PACKAGES += CSWgnutls
+CATALOGNAME_gnutls = gnutls
+SPKG_DESC_CSWgnutls = GNU Transport Layer Security Utility Programs
+RUNTIME_DEP_PKGS_CSWgnutls += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWgnutls += CSWgpgerr
+RUNTIME_DEP_PKGS_CSWgnutls += CSWreadline
+RUNTIME_DEP_PKGS_CSWgnutls += CSWzlib
+RUNTIME_DEP_PKGS_CSWgnutls += CSWlibtasn1-3
+RUNTIME_DEP_PKGS_CSWgnutls += CSWgcrypt
+RUNTIME_DEP_PKGS_CSWgnutls += CSWggettextrt
+# This is a dependency for legacy packages expecting to find libgnutls*.so.13 in CSWgnutls.
+# CSWlibgnutls13 is built from a branch
+RUNTIME_DEP_PKGS_CSWgnutls += CSWlibgnutls13
+
+PACKAGES += CSWlibgnutls26
+CATALOGNAME_CSWlibgnutls = libgnutls26
+SPKG_DESC_CSWlibgnutls26 = GNU Transport Layer Security libraries and tools providing libgnutls*.so.26
+PKGFILES_CSWlibgnutls26 = $(call baseisadirs,$(libdir),libgnutls.*\.so\.26(\.\d+)*)
+RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWgcrypt
+RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWgpgerr
+RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibtasn1-3
+RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWzlib
+
+PACKAGES += CSWlibgnutls-dev
+CATALOGNAME_CSWlibgnutls-dev = libgnutls_dev
+SPKG_DESC_CSWlibgnutls-dev = Development Files for GNU TLS
+PKGFILES_CSWlibgnutls-dev = $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibgnutls-dev += CSWlibgnutls26
+
+PACKAGES += CSWgnutlsdevel
+CATALOGNAME_CSWgnutlsdevel = gnutls_devel
+SPKG_DESC_CSWgnutlsdevel = Legacy development package for GNU TLS now provided by CSWlibgnutls-dev
+PKGFILES_CSWgnutlsdevel = NOFILES
+RUNTIME_DEP_PKGS_CSWgnutlsdevel = CSWlibgnutls-dev
+
+BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWgnutls)
+BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibgnutls26)
+BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibgnutls-dev)
+BUILD_DEP_PKGS += CSWlibtasn1devel 
+
 # We don't need it and if defined the test breaks
 LD_OPTIONS =
 
@@ -37,24 +68,7 @@
 
 TEST_TARGET = check
 
-RUNTIME_DEP_PKGS_CSWgnutls  = CSWgcrypt CSWggettextrt
-RUNTIME_DEP_PKGS_CSWgnutls += CSWgpgerr CSWlibtasn1 CSWreadline CSWzlib CSWiconv
-RUNTIME_DEP_PKGS_CSWgnutlsdevel = CSWgnutls
+# We put all libs in one package as they are .so.26 and are all bumped together
+CHECKPKG_OVERRIDES_CSWlibgnutls26 += shared-lib-pkgname-mismatch
 
-PKGFILES_CSWgnutlsdevel = $(PKGFILES_DEVEL)
-
 include gar/category.mk
-
-# This is needed as tests/rfc2253-escape-test calls 'grep' instead of $GREP
-# and uses option '-q'
-PATH := /opt/csw/gnu:$(PATH)
-
-post-install-isa-sparcv8:
-	@cp $(FILEDIR)/libgnutls.so.13.s $(INSTALLISADIR)/opt/csw/lib/libgnutls.so.13
-	@cp $(FILEDIR)/libgnutls-openssl.so.13.s $(INSTALLISADIR)/opt/csw/lib/libgnutls-openssl.so.13
-	$(DONADA)
-
-post-install-isa-i386:
-	@cp $(FILEDIR)/libgnutls.so.13.i $(INSTALLISADIR)/opt/csw/lib/libgnutls.so.13
-	@cp $(FILEDIR)/libgnutls-openssl.so.13.i $(INSTALLISADIR)/opt/csw/lib/libgnutls-openssl.so.13
-	$(DONADA)

Modified: csw/mgar/pkg/gnutls/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnutls/trunk/checksums	2011-01-18 12:49:25 UTC (rev 12996)
+++ csw/mgar/pkg/gnutls/trunk/checksums	2011-01-18 13:23:16 UTC (rev 12997)
@@ -1,5 +1 @@
-eb0a6d7d3cb9ac684d971c14f9f6d3ba  gnutls-2.8.6.tar.bz2
-073c509902375c40b885f5adc9f7dba9  libgnutls-openssl.so.13.i
-02e4011d400d262b8d4b5c7311d8a5b0  libgnutls-openssl.so.13.s
-b0eee0d29e3d260a146e626c6ca75b16  libgnutls.so.13.i
-76f0d841ec6c4a3612ca2410c793e104  libgnutls.so.13.s
+4e1517084018a8b1fdc96daabea40528  gnutls-2.10.4.tar.bz2

Added: csw/mgar/pkg/gnutls/trunk/files/0001-Do-not-strip-norunpath.patch
===================================================================
--- csw/mgar/pkg/gnutls/trunk/files/0001-Do-not-strip-norunpath.patch	                        (rev 0)
+++ csw/mgar/pkg/gnutls/trunk/files/0001-Do-not-strip-norunpath.patch	2011-01-18 13:23:16 UTC (rev 12997)
@@ -0,0 +1,53 @@
+From 6b93f2a520b4a71f23c65272b26af2dbb697cdbb Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 18 Jan 2011 12:30:06 +0100
+Subject: [PATCH] Do not strip -norunpath
+
+---
+ build-aux/ltmain.sh          |    2 +-
+ lib/build-aux/ltmain.sh      |    2 +-
+ libextra/build-aux/ltmain.sh |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
+index 04eaea4..fd4ac68 100755
+--- a/build-aux/ltmain.sh
++++ b/build-aux/ltmain.sh
+@@ -5091,7 +5091,7 @@ func_mode_link ()
+       # @file                GCC response files
+       # -tp=*                Portland pgcc target processor selection
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-norunpath)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
+diff --git a/lib/build-aux/ltmain.sh b/lib/build-aux/ltmain.sh
+index 04eaea4..fd4ac68 100755
+--- a/lib/build-aux/ltmain.sh
++++ b/lib/build-aux/ltmain.sh
+@@ -5091,7 +5091,7 @@ func_mode_link ()
+       # @file                GCC response files
+       # -tp=*                Portland pgcc target processor selection
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-norunpath)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
+diff --git a/libextra/build-aux/ltmain.sh b/libextra/build-aux/ltmain.sh
+index 04eaea4..fd4ac68 100755
+--- a/libextra/build-aux/ltmain.sh
++++ b/libextra/build-aux/ltmain.sh
+@@ -5091,7 +5091,7 @@ func_mode_link ()
+       # @file                GCC response files
+       # -tp=*                Portland pgcc target processor selection
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-norunpath)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
+-- 
+1.7.3.2
+

Deleted: csw/mgar/pkg/gnutls/trunk/files/libgnutls-openssl.so.13.i
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/gnutls/trunk/files/libgnutls-openssl.so.13.s
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/gnutls/trunk/files/libgnutls.so.13.i
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/gnutls/trunk/files/libgnutls.so.13.s
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list