Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 23 Feb 2020 08:12:23 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r526901 - in head/security: . libgsasl libgsasl/files
Message-ID:  <202002230812.01N8CNOt052374@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sun Feb 23 08:12:22 2020
New Revision: 526901
URL: https://svnweb.freebsd.org/changeset/ports/526901

Log:
  Add libgsasl 1.8.1 (split from gsasl)
  
  - Add LICENSE
  - Add GSSAPI_BASE, GSSAPI_HEIMDAL, GSSAPI_MIT and GSSAPI_NONE options
  
  GNU SASL has been split into 2 ports:
  - security/gsasl: the command-line utility
  - security/libgsasl: the library

Added:
  head/security/libgsasl/
     - copied from r526891, head/security/gsasl/
  head/security/libgsasl/files/
  head/security/libgsasl/files/patch-Makefile.in   (contents, props changed)
  head/security/libgsasl/files/patch-configure   (contents, props changed)
  head/security/libgsasl/files/patch-doc-Makefile.in   (contents, props changed)
Modified:
  head/security/Makefile
  head/security/libgsasl/Makefile
  head/security/libgsasl/pkg-descr
  head/security/libgsasl/pkg-plist

Modified: head/security/Makefile
==============================================================================
--- head/security/Makefile	Sun Feb 23 08:08:30 2020	(r526900)
+++ head/security/Makefile	Sun Feb 23 08:12:22 2020	(r526901)
@@ -288,6 +288,7 @@
     SUBDIR += libgnome-keyring
     SUBDIR += libgpg-error
     SUBDIR += libgringotts
+    SUBDIR += libgsasl
     SUBDIR += libhijack
     SUBDIR += libident
     SUBDIR += libkleo

Modified: head/security/libgsasl/Makefile
==============================================================================
--- head/security/gsasl/Makefile	Sun Feb 23 08:04:54 2020	(r526891)
+++ head/security/libgsasl/Makefile	Sun Feb 23 08:12:22 2020	(r526901)
@@ -5,38 +5,45 @@ PORTNAME=	gsasl
 PORTVERSION=	1.8.1
 CATEGORIES=	security
 MASTER_SITES=	GNU
+PKGNAMEPREFIX=	lib
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	GNU SASL Library
+COMMENT=	GNU SASL library
 
-LIB_DEPENDS=	libidn.so:dns/libidn \
-		libgcrypt.so:security/libgcrypt \
+LICENSE=	LGPL21
+
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libgnutls.so:security/gnutls \
+		libidn.so:dns/libidn \
 		libntlm.so:security/libntlm
 
-USES=		charsetfix libtool localbase:ldflags pathfix perl5 pkgconfig
-USE_PERL5=	build
+USES=		charsetfix libtool pathfix pkgconfig ssl
 
-CPPFLAGS+=	-nostdinc -I/usr/include
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-LDFLAGS+=	-L/usr/lib
 USE_LDCONFIG=	yes
 
-INFO=		gsasl
-
 OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_DEFAULT=GSSAPI_BASE
+OPTIONS_SINGLE=	GSSAPI
+OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_SUB=	yes
 
-NLS_USES=	gettext
+GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi-impl=heimdal ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_BASE_USES=	gssapi
+GSSAPI_HEIMDAL_CONFIGURE_WITH=	--with-gssapi-impl=heimdal ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_HEIMDAL_USES=	gssapi:heimdal
+GSSAPI_MIT_CONFIGURE_ON=--with-gssapi-impl=mit ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_MIT_USES=	gssapi:mit
+GSSAPI_NONE_CONFIGURE_ON=	--disable-gssapi
 NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^en@/d' ${WRKSRC}/lib/po/LINGUAS ${WRKSRC}/po/LINGUAS
+	@${REINPLACE_CMD} -e '/^en@/d' ${WRKSRC}/lib/po/LINGUAS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/reference
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/reference/html/* ${STAGEDIR}${DOCSDIR}/reference
 
 .include <bsd.port.mk>

Added: head/security/libgsasl/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/libgsasl/files/patch-Makefile.in	Sun Feb 23 08:12:22 2020	(r526901)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2019-08-02 11:28:31 UTC
++++ Makefile.in
+@@ -1474,7 +1474,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = lib po gl src examples tests doc gltests
++SUBDIRS = lib gl examples tests doc gltests # po src
+ EXTRA_DIST = cfg.mk maint.mk .clcopying
+ ACLOCAL_AMFLAGS = -I m4
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-obsolete --with-gssapi-impl=no

Added: head/security/libgsasl/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/libgsasl/files/patch-configure	Sun Feb 23 08:12:22 2020	(r526901)
@@ -0,0 +1,20 @@
+--- configure.orig	2019-08-02 11:28:29 UTC
++++ configure
+@@ -46537,7 +46537,7 @@ export WARN_CFLAGS
+ subdirs="$subdirs lib"
+ 
+ 
+-ac_config_files="$ac_config_files Makefile doc/Makefile doc/cyclo/Makefile doc/doxygen/Doxyfile doc/reference/Makefile doc/reference/version.xml examples/Makefile examples/openid20/Makefile examples/saml20/Makefile gl/Makefile gltests/Makefile po/Makefile.in src/Makefile tests/Makefile"
++ac_config_files="$ac_config_files Makefile doc/Makefile doc/cyclo/Makefile doc/doxygen/Doxyfile doc/reference/Makefile doc/reference/version.xml examples/Makefile examples/openid20/Makefile examples/saml20/Makefile gl/Makefile gltests/Makefile tests/Makefile"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -47720,8 +47720,6 @@ do
+     "examples/saml20/Makefile") CONFIG_FILES="$CONFIG_FILES examples/saml20/Makefile" ;;
+     "gl/Makefile") CONFIG_FILES="$CONFIG_FILES gl/Makefile" ;;
+     "gltests/Makefile") CONFIG_FILES="$CONFIG_FILES gltests/Makefile" ;;
+-    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+ 
+   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

Added: head/security/libgsasl/files/patch-doc-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/libgsasl/files/patch-doc-Makefile.in	Sun Feb 23 08:12:22 2020	(r526901)
@@ -0,0 +1,36 @@
+--- doc/Makefile.in.orig	2020-01-17 05:17:36 UTC
++++ doc/Makefile.in
+@@ -288,13 +288,13 @@ AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
+ am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
+ am__v_texidevnull_0 = > /dev/null
+ am__v_texidevnull_1 = 
+-INFO_DEPS = $(srcdir)/gsasl.info
++INFO_DEPS = 
+ TEXINFO_TEX = $(top_srcdir)/lib/build-aux/texinfo.tex
+ am__TEXINFO_TEX_DIR = $(top_srcdir)/lib/build-aux
+ DVIS = gsasl.dvi
+ PDFS = gsasl.pdf
+ PSS = gsasl.ps
+-HTMLS = gsasl.html
++HTMLS = 
+ TEXINFOS = gsasl.texi
+ TEXI2PDF = $(TEXI2DVI) --pdf --batch
+ MAKEINFOHTML = $(MAKEINFO) --html
+@@ -1552,7 +1552,7 @@ top_srcdir = @top_srcdir@
+ SUBDIRS = cyclo $(am__append_1)
+ EXTRA_DIST = gdoc \
+ 	controlflow.dia controlflow2.dia abstraction.dia \
+-	gsasl.html gsasl.ps gsasl.pdf texinfo.css \
++	texinfo.css \
+ 	doxygen/Doxyfile.in doxygen/gdoc2doxygen
+ 
+ info_TEXINFOS = gsasl.texi
+@@ -1577,7 +1577,7 @@ TEXI2DVI = texi2dvi $(AM_MAKEINFOFLAGS)
+ AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) \
+ 	--no-split --number-sections --css-include=texinfo.css
+ 
+-dist_man_MANS = gsasl.1 $(gdoc_MANS)
++dist_man_MANS = $(gdoc_MANS)
+ MAINTAINERCLEANFILES = $(dist_man_MANS)
+ gdoc_MANS = man/gsasl_base64_to.3 man/gsasl_base64_from.3 \
+ 	man/gsasl_callback_set.3 man/gsasl_callback.3 \

Modified: head/security/libgsasl/pkg-descr
==============================================================================
--- head/security/gsasl/pkg-descr	Sun Feb 23 08:04:54 2020	(r526891)
+++ head/security/libgsasl/pkg-descr	Sun Feb 23 08:12:22 2020	(r526901)
@@ -1,7 +1,7 @@
 GNU SASL is an implementation of the Simple Authentication and Security Layer
 framework and a few common SASL mechanisms.
 
-GNU SASL consists of a library (libgsasl), a command line utility (gsasl) to
+GNU SASL consists of a library (libgsasl), a command-line utility (gsasl) to
 access the library from the shell, and a manual. The library includes support
 for the framework (with authentication functions and application data privacy
 and integrity functions) and at least partial support for the ANONYMOUS,
@@ -12,5 +12,9 @@ The library is easily ported because it does not do ne
 itself, but rather leaves it up to the calling application. The library is
 flexible with regards to the authorization infrastructure used, as it utilizes a
 callback into the application to decide whether a user is authorized or not.
+
+GNU SASL has been split into 2 ports:
+- security/gsasl: the command-line utility
+- security/libgsasl: the library
 
 WWW: https://www.gnu.org/software/gsasl/

Modified: head/security/libgsasl/pkg-plist
==============================================================================
--- head/security/gsasl/pkg-plist	Sun Feb 23 08:04:54 2020	(r526891)
+++ head/security/libgsasl/pkg-plist	Sun Feb 23 08:12:22 2020	(r526901)
@@ -1,4 +1,3 @@
-bin/gsasl
 include/gsasl-compat.h
 include/gsasl-mech.h
 include/gsasl.h
@@ -7,7 +6,6 @@ lib/libgsasl.so
 lib/libgsasl.so.7
 lib/libgsasl.so.7.9.7
 libdata/pkgconfig/libgsasl.pc
-man/man1/gsasl.1.gz
 man/man3/gsasl_appinfo_get.3.gz
 man/man3/gsasl_appinfo_set.3.gz
 man/man3/gsasl_application_data_get.3.gz
@@ -123,7 +121,6 @@ man/man3/gsasl_strerror_name.3.gz
 man/man3/gsasl_stringprep_nfkc.3.gz
 man/man3/gsasl_stringprep_saslprep.3.gz
 man/man3/gsasl_stringprep_trace.3.gz
-%%PORTDOCS%%%%DOCSDIR%%/gsasl.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/abstraction.png
 %%PORTDOCS%%%%DOCSDIR%%/reference/api-index-full.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/controlflow.png
@@ -149,47 +146,23 @@ man/man3/gsasl_stringprep_trace.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/reference/style.css
 %%PORTDOCS%%%%DOCSDIR%%/reference/up-insensitive.png
 %%PORTDOCS%%%%DOCSDIR%%/reference/up.png
-%%NLS%%share/locale/da/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/da/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/de/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/de/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/es/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/es/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/gsasl.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/gsasl.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/id/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/id/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/it/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/it/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/gsasl.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/libgsasl.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/gsasl.mo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002230812.01N8CNOt052374>