[csw-devel] SF.net SVN: gar:[22150] csw/mgar/pkg/krb5-lib

lblume at users.sourceforge.net lblume at users.sourceforge.net
Sun Oct 6 23:45:27 CEST 2013


Revision: 22150
          http://gar.svn.sourceforge.net/gar/?rev=22150&view=rev
Author:   lblume
Date:     2013-10-06 21:45:27 +0000 (Sun, 06 Oct 2013)
Log Message:
-----------
krb5-lib/trunk: Bump version to 1.11.3

Modified Paths:
--------------
    csw/mgar/pkg/krb5-lib/trunk/Makefile
    csw/mgar/pkg/krb5-lib/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/krb5-lib/branches/krb5-1.9/
    csw/mgar/pkg/krb5-lib/branches/krb5-1.9/Makefile
    csw/mgar/pkg/krb5-lib/branches/krb5-1.9/checksums

Removed Paths:
-------------
    csw/mgar/pkg/krb5-lib/branches/krb5-1.9/Makefile
    csw/mgar/pkg/krb5-lib/branches/krb5-1.9/checksums

Deleted: csw/mgar/pkg/krb5-lib/branches/krb5-1.9/Makefile
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/Makefile	2013-09-25 07:49:50 UTC (rev 21995)
+++ csw/mgar/pkg/krb5-lib/branches/krb5-1.9/Makefile	2013-10-06 21:45:27 UTC (rev 22150)
@@ -1,178 +0,0 @@
-# $Id$
-#
-# ! The build links against the version of libkdb5 installed in the system,
-# instead of the one built.
-#
-
-NAME = krb5
-VERSION = 1.9.2
-GARTYPE = v2
-
-DESCRIPTION = MIT Kerberos 5 core libraries
-define BLURB
-  Kerberos is a network authentication protocol. It is designed to
-  provide strong authentication for client/server applications by
-  using secret-key cryptography. A free implementation of this protocol
-  is available from the Massachusetts Institute of Technology.
-  Kerberos is available in many commercial products as well.
-endef
-
-MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/$(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}')/
-DISTFILES  = $(NAME)-$(VERSION)-signed.tar
-
-PATCHFILES  = patch-man2html-perl.patch
-PATCHFILES += 0002-libintl-for-kproplog.patch
-# PATCHFILES += 0003-local-libraries-first-when-linking.patch
-PATCHFILES += 0004-libkdb_ldap-isblank-define.patch
-PATCHFILES += 0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch
-# PATCHFILES += krb5-1.9.2-krb5_set_password_using_ccache.patch
-PATCHFILES += 0005-krb5_set_password_using_ccache.patch
-
-# PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-
-BUILD_DEP_PKGS = CSWtcl
-
-# Uncomment for a better view of file-package allocations.
-# PACKAGES = CSWdo-not-use
-# SPKG_DESC_CSWdo-not-use = Do not use this catch all package
-
-# These packages are not part of the krb5libs build, but only the main server
-#PACKAGES += CSWkrb5doc
-PKGFILES_CSWkrb5doc = NOFILES
-SPKG_DESC_CSWkrb5doc = Unused package 1
-#PACKAGES += CSWkrb5user
-PKGFILES_CSWkrb5user = NOFILES
-SPKG_DESC_CSWkrb5user = Unused package 2
-#PACKAGES += CSWkrb5kdc
-PKGFILES_CSWkrb5kdc = NOFILES
-SPKG_DESC_CSWkrb5kdc = Unused package 3
-#PACKAGES += CSWkrb5adminserver
-PKGFILES_CSWkrb5adminserver = NOFILES
-SPKG_DESC_CSWkrb5adminserver = Unused package 4
-
-PACKAGES += CSWlibkrb5-dev
-SPKG_DESC_CSWlibkrb5-dev      = MIT Kerberos 5 developer libraries
-RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibgssapi-krb5-2
-RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5support0
-RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-priv
-PKGFILES_CSWlibkrb5-dev  = $(mandir)/man8/sserver.8
-PKGFILES_CSWlibkrb5-dev += $(mandir)/man1/(sclient|krb5-config|compile_et)\.1
-PKGFILES_CSWlibkrb5-dev += $(sbindir)/(uuserver|sserver|sim_server|gss-server)
-PKGFILES_CSWlibkrb5-dev += $(PKGFILES_DEVEL)
-PKGFILES_CSWlibkrb5-dev += $(bindir)/(uuclient|sim_client|sclient|krb5-config|gss-client|compile_et)
-OBSOLETED_BY_CSWlibkrb5-dev = CSWkrb5libdev
-CATALOGNAME_CSWkrb5libdev = krb5_lib_dev_stub
-
-PACKAGES += CSWlibcom-err3
-CATALOGNAME_CSWlibcom-err3 = libcom_err3
-PKGFILES_CSWlibcom-err3 +=  $(call baseisadirs,$(libdir),libcom_err\.so\.3(\.\d+)*)
-SPKG_DESC_CSWlibcom-err3 += MIT Kerberos 5 core libraries, libcom_err.so.3
-OBSOLETED_BY_CSWlibcom-err3 = CSWkrb5lib
-RUNTIME_DEP_PKGS_CSWlibcom-err3 += CSWlibkrb5support0
-
-PACKAGES += CSWlibgssapi-krb5-2
-CATALOGNAME_CSWlibgssapi-krb5-2 = libgssapi_krb5_2
-PKGFILES_CSWlibgssapi-krb5-2 +=  $(call baseisadirs,$(libdir),libgssapi_krb5\.so\.2(\.\d+)*)
-SPKG_DESC_CSWlibgssapi-krb5-2 += MIT Kerberos 5 core libraries, libgssapi_krb5.so.2
-OBSOLETED_BY_CSWlibgssapi-krb5-2 = CSWkrb5lib
-RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5support0
-
-PACKAGES += CSWlibk5crypto3
-CATALOGNAME_CSWlibk5crypto3 = libk5crypto3
-PKGFILES_CSWlibk5crypto3 += $(call baseisadirs,$(libdir),libk5crypto\.so\.3(\.\d+)*)
-SPKG_DESC_CSWlibk5crypto3 += MIT Kerberos 5 core libraries, libk5crypto.so.3
-RUNTIME_DEP_PKGS_CSWlibk5crypto3 += CSWlibkrb5support0
-OBSOLETED_BY_CSWlibk5crypto3 = CSWkrb5lib
-
-PACKAGES += CSWlibkrb5-priv
-SPKG_DESC_CSWlibkrb5-priv = Kerberos private shared libraries, do not link against this package
-PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libgssrpc\.so\.\d+(\.\d+)*)
-PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5clnt_mit\.so\.\d+(\.\d+)*)
-PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5srv_mit\.so\.\d+(\.\d+)*)
-PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkdb5\.so\.\d+(\.\d+)*)
-# Private libraries in one common package.
-CHECKPKG_OVERRIDES_CSWlibkrb5-priv += shared-lib-pkgname-mismatch
-RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibgssapi-krb5-2
-RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5support0
-RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibk5crypto3
-
-PACKAGES += CSWlibkrb5-3
-CATALOGNAME_CSWlibkrb5-3 = libkrb5_3
-PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libkrb5\.so\.3(\.\d+)*)
-SPKG_DESC_CSWlibkrb5-3 += MIT Kerberos 5 core libraries, libkrb5.so.3
-OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib
-RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibkrb5support0
-RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibk5crypto3
-
-PACKAGES += CSWlibkrb5support0
-CATALOGNAME_CSWlibkrb5support0 = libkrb5support0
-PKGFILES_CSWlibkrb5support0 += $(call baseisadirs,$(libdir),libkrb5support\.so\.0(\.\d+)*)
-SPKG_DESC_CSWlibkrb5support0 += MIT Kerberos 5 core libraries, libkrb5support.so.0
-OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib
-
-LICENSE = doc/copyright.texinfo
-
-EXTRA_LD_OPTIONS += -M $(abspath mapfile)
-
-EXTRA_CPPFLAGS += -D__EXTENSIONS__
-
-CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure
-
-BUILD64_LIBS_ONLY = 1
-
-# We turn off almost everything as we are just interested in the library.
-NODIRPATHS = --docdir
-CONFIGURE_ARGS  = $(DIRPATHS)
-# --enable-ipv6 is deprecated and autodetected
-#CONFIGURE_ARGS += --enable-ipv6
-CONFIGURE_ARGS += --enable-kdc-replay-cache --enable-dns-for-realm
-#CONFIGURE_ARGS += --disable-thread-support
-CONFIGURE_ARGS += --enable-thread-support
-CONFIGURE_ARGS += --disable-static --disable-profiled
-CONFIGURE_ARGS += --without-ldap
-
-CONFIGURE_ARGS-32 += --with-tcl=$(prefix)
-CONFIGURE_ARGS-64 += --without-tcl
-CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
-
-BUILD_SCRIPTS  = $(WORKSRC)/src/Makefile
-
-TEST_SCRIPTS = $(WORKSRC)/src/Makefile
-
-# Some tests are failing:
-# TOP=/home/maciej/src/opencsw/pkg/krb5-lib/trunk/work/solaris9-sparc/build-isa-sparcv8/krb5-1.9.1/src/kadmin
-# Running pass `tcp' ...
-# server didn't start in 30 secondscan't read "expect_out(buffer)": no such
-# variable
-#     while executing
-#     "verbose $expect_out(buffer) 1"
-SKIPTEST ?= 1
-
-INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile
-
-# pkgname=CSWkrb5lib|catalogname=krb5_lib|expected-catalogname=krb5lib
-CHECKPKG_OVERRIDES_CSWkrb5lib += catalogname-does-not-match-pkgname
-CATALOGNAME_CSWkrb5lib = krb5_lib_stub
-
-include gar/category.mk
-
-post-extract-modulated:
-	@# TODO: Check signature
-	cd $(WORKDIR) && (gzip -c -d $(NAME)-$(VERSION).tar.gz | tar xf -)
-	@# libcrypto.so is part of openssl and expected to be linkable without setting a linker search path
-	perl -pi -e 's,-lcrypto,-L$(libdir) -lcrypto,' \
-		$(WORKSRC)/src/plugins/preauth/pkinit/Makefile.in
-	@$(MAKECOOKIE)
-
-# Remove Studio-specific arch references
-post-install-modulated:
-	gsed -i -e '/^[^#]/s/-xarch=[^ ]* //' -e '/^[^#]/s/-xchip=[^ ]* //' $(DESTDIR)$(bindir)/krb5-config

Copied: csw/mgar/pkg/krb5-lib/branches/krb5-1.9/Makefile (from rev 22132, csw/mgar/pkg/krb5-lib/trunk/Makefile)
===================================================================
--- csw/mgar/pkg/krb5-lib/branches/krb5-1.9/Makefile	                        (rev 0)
+++ csw/mgar/pkg/krb5-lib/branches/krb5-1.9/Makefile	2013-10-06 21:45:27 UTC (rev 22150)
@@ -0,0 +1,182 @@
+# $Id$
+#
+# ! The build links against the version of libkdb5 installed in the system,
+# instead of the one built.
+#
+
+NAME = krb5
+VERSION = 1.9.5
+GARTYPE = v2
+
+DESCRIPTION = MIT Kerberos 5 core libraries
+define BLURB
+  Kerberos is a network authentication protocol. It is designed to
+  provide strong authentication for client/server applications by
+  using secret-key cryptography. A free implementation of this protocol
+  is available from the Massachusetts Institute of Technology.
+  Kerberos is available in many commercial products as well.
+endef
+
+MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/$(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}')/
+DISTFILES  = $(NAME)-$(VERSION)-signed.tar
+
+PATCHFILES  = patch-man2html-perl.patch
+PATCHFILES += 0002-libintl-for-kproplog.patch
+# PATCHFILES += 0003-local-libraries-first-when-linking.patch
+#PATCHFILES += 0004-libkdb_ldap-isblank-define.patch
+#PATCHFILES += 0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch
+# PATCHFILES += krb5-1.9.2-krb5_set_password_using_ccache.patch
+#PATCHFILES += 0005-krb5_set_password_using_ccache.patch
+
+# PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
+BUILD_DEP_PKGS = CSWtcl
+
+# Uncomment for a better view of file-package allocations.
+# PACKAGES = CSWdo-not-use
+# SPKG_DESC_CSWdo-not-use = Do not use this catch all package
+
+# These packages are not part of the krb5libs build, but only the main server
+#PACKAGES += CSWkrb5doc
+PKGFILES_CSWkrb5doc = NOFILES
+SPKG_DESC_CSWkrb5doc = Unused package 1
+#PACKAGES += CSWkrb5user
+PKGFILES_CSWkrb5user = NOFILES
+SPKG_DESC_CSWkrb5user = Unused package 2
+#PACKAGES += CSWkrb5kdc
+PKGFILES_CSWkrb5kdc = NOFILES
+SPKG_DESC_CSWkrb5kdc = Unused package 3
+#PACKAGES += CSWkrb5adminserver
+PKGFILES_CSWkrb5adminserver = NOFILES
+SPKG_DESC_CSWkrb5adminserver = Unused package 4
+
+PACKAGES += CSWlibkrb5-dev
+SPKG_DESC_CSWlibkrb5-dev      = MIT Kerberos 5 developer libraries
+RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5support0
+RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-priv
+PKGFILES_CSWlibkrb5-dev  = $(mandir)/man8/sserver.8
+PKGFILES_CSWlibkrb5-dev += $(mandir)/man1/(sclient|krb5-config|compile_et)\.1
+PKGFILES_CSWlibkrb5-dev += $(sbindir)/(uuserver|sserver|sim_server|gss-server)
+PKGFILES_CSWlibkrb5-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWlibkrb5-dev += $(bindir)/(uuclient|sim_client|sclient|krb5-config|gss-client|compile_et)
+OBSOLETED_BY_CSWlibkrb5-dev = CSWkrb5libdev
+CATALOGNAME_CSWkrb5libdev = krb5_lib_dev_stub
+
+PACKAGES += CSWlibcom-err3
+CATALOGNAME_CSWlibcom-err3 = libcom_err3
+PKGFILES_CSWlibcom-err3 +=  $(call baseisadirs,$(libdir),libcom_err\.so\.3(\.\d+)*)
+SPKG_DESC_CSWlibcom-err3 += MIT Kerberos 5 core libraries, libcom_err.so.3
+OBSOLETED_BY_CSWlibcom-err3 = CSWkrb5lib
+RUNTIME_DEP_PKGS_CSWlibcom-err3 += CSWlibkrb5support0
+
+PACKAGES += CSWlibgssapi-krb5-2
+CATALOGNAME_CSWlibgssapi-krb5-2 = libgssapi_krb5_2
+PKGFILES_CSWlibgssapi-krb5-2 +=  $(call baseisadirs,$(libdir),libgssapi_krb5\.so\.2(\.\d+)*)
+SPKG_DESC_CSWlibgssapi-krb5-2 += MIT Kerberos 5 core libraries, libgssapi_krb5.so.2
+OBSOLETED_BY_CSWlibgssapi-krb5-2 = CSWkrb5lib
+RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5support0
+
+PACKAGES += CSWlibk5crypto3
+CATALOGNAME_CSWlibk5crypto3 = libk5crypto3
+PKGFILES_CSWlibk5crypto3 += $(call baseisadirs,$(libdir),libk5crypto\.so\.3(\.\d+)*)
+SPKG_DESC_CSWlibk5crypto3 += MIT Kerberos 5 core libraries, libk5crypto.so.3
+RUNTIME_DEP_PKGS_CSWlibk5crypto3 += CSWlibkrb5support0
+OBSOLETED_BY_CSWlibk5crypto3 = CSWkrb5lib
+
+PACKAGES += CSWlibkrb5-priv
+SPKG_DESC_CSWlibkrb5-priv = Kerberos private shared libraries, do not link against this package
+PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libgssrpc\.so\.\d+(\.\d+)*)
+PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5clnt_mit\.so\.\d+(\.\d+)*)
+PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkadm5srv_mit\.so\.\d+(\.\d+)*)
+PKGFILES_CSWlibkrb5-priv += $(call baseisadirs,$(libdir),libkdb5\.so\.\d+(\.\d+)*)
+# Private libraries in one common package.
+CHECKPKG_OVERRIDES_CSWlibkrb5-priv += shared-lib-pkgname-mismatch
+RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibkrb5support0
+RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWlibkrb5-priv += CSWlibk5crypto3
+
+PACKAGES += CSWlibkrb5-3
+CATALOGNAME_CSWlibkrb5-3 = libkrb5_3
+PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libkrb5\.so\.3(\.\d+)*)
+PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(sysconfdir),krb5.conf)
+SPKG_DESC_CSWlibkrb5-3 += MIT Kerberos 5 core libraries, libkrb5.so.3
+OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib
+RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibkrb5support0
+RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibk5crypto3
+OBSOLETED_BY_CSWlibkrb5-3 = CSWkrb5lib
+
+PACKAGES += CSWlibkrb5support0
+CATALOGNAME_CSWlibkrb5support0 = libkrb5support0
+PKGFILES_CSWlibkrb5support0 += $(call baseisadirs,$(libdir),libkrb5support\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibkrb5support0 += MIT Kerberos 5 core libraries, libkrb5support.so.0
+
+LICENSE = doc/copyright.texinfo
+
+EXTRA_LD_OPTIONS += -M $(abspath mapfile)
+
+EXTRA_CPPFLAGS += -D__EXTENSIONS__
+
+CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure
+
+BUILD64_LIBS_ONLY = 1
+
+# We turn off almost everything as we are just interested in the library.
+NODIRPATHS = --docdir
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS +=  --enable-dns-for-realm
+CONFIGURE_ARGS += --enable-thread-support
+CONFIGURE_ARGS += --disable-static --disable-profiled
+CONFIGURE_ARGS += --without-ldap
+
+CONFIGURE_ARGS-32 += --with-tcl=$(prefix)
+CONFIGURE_ARGS-64 += --without-tcl
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
+
+BUILD_SCRIPTS  = $(WORKSRC)/src/Makefile
+
+TEST_SCRIPTS = $(WORKSRC)/src/Makefile
+
+# Some tests are failing:
+# TOP=/home/maciej/src/opencsw/pkg/krb5-lib/trunk/work/solaris9-sparc/build-isa-sparcv8/krb5-1.9.1/src/kadmin
+# Running pass `tcp' ...
+# server didn't start in 30 secondscan't read "expect_out(buffer)": no such
+# variable
+#     while executing
+#     "verbose $expect_out(buffer) 1"
+SKIPTEST ?= 1
+
+INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile
+
+# pkgname=CSWkrb5lib|catalogname=krb5_lib|expected-catalogname=krb5lib
+CHECKPKG_OVERRIDES_CSWkrb5lib += catalogname-does-not-match-pkgname
+CATALOGNAME_CSWkrb5lib = krb5_lib_stub
+
+include gar/category.mk
+
+post-extract-modulated:
+	@# TODO: Check signature
+	cd $(WORKDIR) && (gzip -c -d $(NAME)-$(VERSION).tar.gz | tar xf -)
+	@# libcrypto.so is part of openssl and expected to be linkable without setting a linker search path
+	perl -pi -e 's,-lcrypto,-L$(libdir) -lcrypto,' \
+		$(WORKSRC)/src/plugins/preauth/pkinit/Makefile.in
+	@$(MAKECOOKIE)
+
+post-install-modulated:
+	# Remove Studio-specific arch references
+	gsed -i \
+		-e '/^[^#]/s/-xarch=[^ ]* //' \
+		-e '/^[^#]/s/-xchip=[^ ]* //' \
+		$(DESTDIR)$(bindir)/krb5-config
+	# Add a link to the system's Kerberos configuration
+	ginstall -m 755 -d $(DESTDIR)$(sysconfdir)
+	gln -s ../../krb5/krb5.conf $(DESTDIR)$(sysconfdir)/krb5.conf

Deleted: csw/mgar/pkg/krb5-lib/branches/krb5-1.9/checksums
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/checksums	2013-09-25 07:49:50 UTC (rev 21995)
+++ csw/mgar/pkg/krb5-lib/branches/krb5-1.9/checksums	2013-10-06 21:45:27 UTC (rev 22150)
@@ -1 +0,0 @@
-8de1e9111612f0af0b0560789ae11cb9  krb5-1.9.2-signed.tar

Copied: csw/mgar/pkg/krb5-lib/branches/krb5-1.9/checksums (from rev 22132, csw/mgar/pkg/krb5-lib/trunk/checksums)
===================================================================
--- csw/mgar/pkg/krb5-lib/branches/krb5-1.9/checksums	                        (rev 0)
+++ csw/mgar/pkg/krb5-lib/branches/krb5-1.9/checksums	2013-10-06 21:45:27 UTC (rev 22150)
@@ -0,0 +1 @@
+74de3495dd3c0ccfd46401f95b1b4b1d  krb5-1.9.5-signed.tar

Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/Makefile	2013-10-06 21:42:56 UTC (rev 22149)
+++ csw/mgar/pkg/krb5-lib/trunk/Makefile	2013-10-06 21:45:27 UTC (rev 22150)
@@ -4,8 +4,8 @@
 # instead of the one built.
 #
 
-NAME = krb5
-VERSION = 1.9.5
+NAME    = krb5
+VERSION = 1.11.3
 GARTYPE = v2
 
 DESCRIPTION = MIT Kerberos 5 core libraries
@@ -20,36 +20,10 @@
 MASTER_SITES = http://web.mit.edu/kerberos/dist/krb5/$(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}')/
 DISTFILES  = $(NAME)-$(VERSION)-signed.tar
 
-PATCHFILES  = patch-man2html-perl.patch
-PATCHFILES += 0002-libintl-for-kproplog.patch
-# PATCHFILES += 0003-local-libraries-first-when-linking.patch
-#PATCHFILES += 0004-libkdb_ldap-isblank-define.patch
-#PATCHFILES += 0005-Add-strings.h-to-setenv.c-for-strlen-and-other-stuff.patch
-# PATCHFILES += krb5-1.9.2-krb5_set_password_using_ccache.patch
-#PATCHFILES += 0005-krb5_set_password_using_ccache.patch
+GARCOMPILER = GCC4
 
-# PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-
 BUILD_DEP_PKGS = CSWtcl
 
-# Uncomment for a better view of file-package allocations.
-# PACKAGES = CSWdo-not-use
-# SPKG_DESC_CSWdo-not-use = Do not use this catch all package
-
-# These packages are not part of the krb5libs build, but only the main server
-#PACKAGES += CSWkrb5doc
-PKGFILES_CSWkrb5doc = NOFILES
-SPKG_DESC_CSWkrb5doc = Unused package 1
-#PACKAGES += CSWkrb5user
-PKGFILES_CSWkrb5user = NOFILES
-SPKG_DESC_CSWkrb5user = Unused package 2
-#PACKAGES += CSWkrb5kdc
-PKGFILES_CSWkrb5kdc = NOFILES
-SPKG_DESC_CSWkrb5kdc = Unused package 3
-#PACKAGES += CSWkrb5adminserver
-PKGFILES_CSWkrb5adminserver = NOFILES
-SPKG_DESC_CSWkrb5adminserver = Unused package 4
-
 PACKAGES += CSWlibkrb5-dev
 SPKG_DESC_CSWlibkrb5-dev      = MIT Kerberos 5 developer libraries
 RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-3
@@ -124,6 +98,7 @@
 EXTRA_LD_OPTIONS += -M $(abspath mapfile)
 
 EXTRA_CPPFLAGS += -D__EXTENSIONS__
+EXTRA_LDFLAGS += -L$(libdir) -lintl 
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure
 
@@ -132,34 +107,20 @@
 # We turn off almost everything as we are just interested in the library.
 NODIRPATHS = --docdir
 CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS +=  --enable-dns-for-realm
+CONFIGURE_ARGS += --enable-dns-for-realm
 CONFIGURE_ARGS += --enable-thread-support
 CONFIGURE_ARGS += --disable-static --disable-profiled
 CONFIGURE_ARGS += --without-ldap
+CONFIGURE_ARGS += --with-readline
+# To pick the right tclConfig.sh
+CONFIGURE_ARGS += --with-tcl=$(libdir)
 
-CONFIGURE_ARGS-32 += --with-tcl=$(prefix)
-CONFIGURE_ARGS-64 += --without-tcl
-CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
+BUILD_SCRIPTS = $(WORKSRC)/src/Makefile
 
-BUILD_SCRIPTS  = $(WORKSRC)/src/Makefile
-
 TEST_SCRIPTS = $(WORKSRC)/src/Makefile
 
-# Some tests are failing:
-# TOP=/home/maciej/src/opencsw/pkg/krb5-lib/trunk/work/solaris9-sparc/build-isa-sparcv8/krb5-1.9.1/src/kadmin
-# Running pass `tcp' ...
-# server didn't start in 30 secondscan't read "expect_out(buffer)": no such
-# variable
-#     while executing
-#     "verbose $expect_out(buffer) 1"
-SKIPTEST ?= 1
-
 INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile
 
-# pkgname=CSWkrb5lib|catalogname=krb5_lib|expected-catalogname=krb5lib
-CHECKPKG_OVERRIDES_CSWkrb5lib += catalogname-does-not-match-pkgname
-CATALOGNAME_CSWkrb5lib = krb5_lib_stub
-
 include gar/category.mk
 
 post-extract-modulated:

Modified: csw/mgar/pkg/krb5-lib/trunk/checksums
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/checksums	2013-10-06 21:42:56 UTC (rev 22149)
+++ csw/mgar/pkg/krb5-lib/trunk/checksums	2013-10-06 21:45:27 UTC (rev 22150)
@@ -1 +1 @@
-74de3495dd3c0ccfd46401f95b1b4b1d  krb5-1.9.5-signed.tar
+56f0ae274b285320b8a597cb89442449  krb5-1.11.3-signed.tar

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