Date: Sat, 5 Oct 2013 20:44:51 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329502 - in head/security/oath-toolkit: . files Message-ID: <201310052044.r95KipP4031913@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Sat Oct 5 20:44:50 2013 New Revision: 329502 URL: http://svnweb.freebsd.org/changeset/ports/329502 Log: Update to 2.4.0 release and stagify. Added: head/security/oath-toolkit/files/ head/security/oath-toolkit/files/patch-liboath_man_Makefile.in (contents, props changed) head/security/oath-toolkit/files/patch-libpskc_man_Makefile.in (contents, props changed) Modified: head/security/oath-toolkit/Makefile head/security/oath-toolkit/distinfo head/security/oath-toolkit/pkg-plist Modified: head/security/oath-toolkit/Makefile ============================================================================== --- head/security/oath-toolkit/Makefile Sat Oct 5 20:34:59 2013 (r329501) +++ head/security/oath-toolkit/Makefile Sat Oct 5 20:44:50 2013 (r329502) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= oath-toolkit -PORTVERSION= 2.0.2 +PORTVERSION= 2.4.0 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -10,110 +10,36 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ale@FreeBSD.org COMMENT= Library, tools, and PAM module for OATH authentication -USE_GMAKE= yes -USES= pathfix pkgconfig +USES= gmake pathfix pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes -OPTIONS_DEFINE= PSKC +OPTIONS_DEFINE= PSKC DOCS OPTIONS_DEFAULT=PSKC +OPTIONS_SUB= yes PSKC_DESC= Portable Symmetric Key Container (RFC 6030) support -MAN1= oathtool.1 -MAN3= oath_authenticate_usersfile.3 oath_base32_decode.3 \ - oath_base32_encode.3 oath_bin2hex.3 oath_check_version.3 \ - oath_done.3 oath_hex2bin.3 oath_hotp_generate.3 \ - oath_hotp_validate.3 oath_hotp_validate_callback.3 \ - oath_init.3 oath_strerror.3 oath_strerror_name.3 \ - oath_totp_generate.3 oath_totp_validate.3 \ - oath_totp_validate2.3 oath_totp_validate2_callback.3 \ - oath_totp_validate_callback.3 +PSKC_CONFIGURE_ENABLE= pskc +PSKC_CONFIGURE_ON= --with-xml-prefix=${LOCALBASE} +PSKC_LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 \ + libxmlsec1.so:${PORTSDIR}/security/xmlsec1 DOCS= AUTHORS ChangeLog NEWS README PORTDOCS= * -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MPSKC} -LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2 \ - xmlsec1:${PORTSDIR}/security/xmlsec1 - -CONFIGURE_ARG+=--with-xml-prefix=${LOCALBASE} - -MAN1+= pskctool.1 -MAN3+= pskc_build_xml.3 pskc_check_version.3 pskc_done.3 \ - pskc_free.3 pskc_get_cryptomodule_id.3 \ - pskc_get_device_devicebinding.3 \ - pskc_get_device_expirydate.3 pskc_get_device_issueno.3 \ - pskc_get_device_manufacturer.3 pskc_get_device_model.3 \ - pskc_get_device_serialno.3 pskc_get_device_startdate.3 \ - pskc_get_device_userid.3 pskc_get_id.3 \ - pskc_get_key_algorithm.3 \ - pskc_get_key_algparm_chall_checkdigits.3 \ - pskc_get_key_algparm_chall_encoding.3 \ - pskc_get_key_algparm_chall_max.3 \ - pskc_get_key_algparm_chall_min.3 \ - pskc_get_key_algparm_resp_checkdigits.3 \ - pskc_get_key_algparm_resp_encoding.3 \ - pskc_get_key_algparm_resp_length.3 \ - pskc_get_key_algparm_suite.3 \ - pskc_get_key_data_b64secret.3 \ - pskc_get_key_data_counter.3 \ - pskc_get_key_data_secret.3 pskc_get_key_data_time.3 \ - pskc_get_key_data_timedrift.3 \ - pskc_get_key_data_timeinterval.3 \ - pskc_get_key_friendlyname.3 pskc_get_key_id.3 \ - pskc_get_key_issuer.3 \ - pskc_get_key_policy_expirydate.3 \ - pskc_get_key_policy_keyusages.3 \ - pskc_get_key_policy_numberoftransactions.3 \ - pskc_get_key_policy_pinencoding.3 \ - pskc_get_key_policy_pinkeyid.3 \ - pskc_get_key_policy_pinmaxfailedattempts.3 \ - pskc_get_key_policy_pinmaxlength.3 \ - pskc_get_key_policy_pinminlength.3 \ - pskc_get_key_policy_pinusagemode.3 \ - pskc_get_key_policy_startdate.3 \ - pskc_get_key_profileid.3 pskc_get_key_reference.3 \ - pskc_get_key_userid.3 pskc_get_keypackage.3 \ - pskc_get_signed_p.3 \ - pskc_get_version.3 pskc_global_done.3 \ - pskc_global_init.3 pskc_global_log.3 \ - pskc_init.3 pskc_keyusage2str.3 pskc_output.3 \ - pskc_parse_from_memory.3 pskc_pinusagemode2str.3 \ - pskc_sign_x509.3 \ - pskc_str2keyusage.3 pskc_str2pinusagemode.3 \ - pskc_str2valueformat.3 pskc_strerror.3 \ - pskc_strerror_name.3 pskc_validate.3 \ - pskc_valueformat2str.3 pskc_verify_x509crt.3 - -PLIST_SUB+= PSKC="" -.else -CONFIGURE_ARGS+=--disable-pskc -PLIST_SUB+= PSKC="@comment " -.endif - post-patch: -.if ! ${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} 's|install-data-am: install-data-local|install-data-am:|' \ - ${WRKSRC}/liboath/gtk-doc/Makefile.in \ - ${WRKSRC}/libpskc/gtk-doc/Makefile.in -.else @${REINPLACE_CMD} 's|@HTML_DIR@|${DOCSDIR}|' \ ${WRKSRC}/liboath/gtk-doc/Makefile.in \ ${WRKSRC}/libpskc/gtk-doc/Makefile.in -.endif -.if ${PORT_OPTIONS:MDOCS} post-install: .for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR}/ .endfor - ${MKDIR} ${DOCSDIR}/pam_oath - ${INSTALL_DATA} ${WRKSRC}/pam_oath/README ${DOCSDIR}/pam_oath/ -.endif + ${MKDIR} ${STAGEDIR}/${DOCSDIR}/pam_oath + ${INSTALL_DATA} ${WRKSRC}/pam_oath/README \ + ${STAGEDIR}/${DOCSDIR}/pam_oath/ .include <bsd.port.mk> Modified: head/security/oath-toolkit/distinfo ============================================================================== --- head/security/oath-toolkit/distinfo Sat Oct 5 20:34:59 2013 (r329501) +++ head/security/oath-toolkit/distinfo Sat Oct 5 20:44:50 2013 (r329502) @@ -1,2 +1,2 @@ -SHA256 (oath-toolkit-2.0.2.tar.gz) = 2951ebc2a3e9a03333618ceda7fe2c00e16f880255d3d4f48068cd8164715944 -SIZE (oath-toolkit-2.0.2.tar.gz) = 3946021 +SHA256 (oath-toolkit-2.4.0.tar.gz) = 66ebf924304409356b35a3423e4b7255996c5a42503c3188bf08c6446f436ddc +SIZE (oath-toolkit-2.4.0.tar.gz) = 4137994 Added: head/security/oath-toolkit/files/patch-liboath_man_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/oath-toolkit/files/patch-liboath_man_Makefile.in Sat Oct 5 20:44:50 2013 (r329502) @@ -0,0 +1,43 @@ +--- liboath/man/Makefile.in.orig 2013-10-05 13:22:16.000000000 +0000 ++++ liboath/man/Makefile.in 2013-10-05 13:37:05.265332575 +0000 +@@ -1127,31 +1127,7 @@ + oath_totp_validate2_callback.3 oath_totp_validate3.3 \ + oath_totp_validate3_callback.3 oath_strerror.3 \ + oath_strerror_name.3 +-all: $(BUILT_SOURCES) +- $(MAKE) $(AM_MAKEFLAGS) all-am + +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/gdoc.mk $(srcdir)/Makefile.gdoc $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --foreign man/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; + $(srcdir)/gdoc.mk $(srcdir)/Makefile.gdoc: + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +@@ -1256,7 +1232,7 @@ + for dir in "$(DESTDIR)$(man3dir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +-install: $(BUILT_SOURCES) ++install: + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am + install-data: install-data-am Added: head/security/oath-toolkit/files/patch-libpskc_man_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/oath-toolkit/files/patch-libpskc_man_Makefile.in Sat Oct 5 20:44:50 2013 (r329502) @@ -0,0 +1,43 @@ +--- libpskc/man/Makefile.in.orig 2013-10-05 13:22:16.000000000 +0000 ++++ libpskc/man/Makefile.in 2013-10-05 13:36:51.611332967 +0000 +@@ -1243,31 +1243,7 @@ + pskc_done.3 pskc_parse_from_memory.3 pskc_validate.3 \ + pskc_build_xml.3 pskc_sign_x509.3 pskc_verify_x509crt.3 \ + pskc_output.3 +-all: $(BUILT_SOURCES) +- $(MAKE) $(AM_MAKEFLAGS) all-am + +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/gdoc.mk $(srcdir)/Makefile.gdoc $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --foreign man/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; + $(srcdir)/gdoc.mk $(srcdir)/Makefile.gdoc: + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +@@ -1372,7 +1348,7 @@ + for dir in "$(DESTDIR)$(man3dir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +-install: $(BUILT_SOURCES) ++install: + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am + install-data: install-data-am Modified: head/security/oath-toolkit/pkg-plist ============================================================================== --- head/security/oath-toolkit/pkg-plist Sat Oct 5 20:34:59 2013 (r329501) +++ head/security/oath-toolkit/pkg-plist Sat Oct 5 20:44:50 2013 (r329502) @@ -21,6 +21,136 @@ lib/security/pam_oath.la lib/security/pam_oath.so libdata/pkgconfig/liboath.pc %%PSKC%%libdata/pkgconfig/libpskc.pc +man/man1/oathtool.1.gz +%%PSKC%%man/man1/pskctool.1.gz +man/man3/oath_authenticate_usersfile.3.gz +man/man3/oath_base32_decode.3.gz +man/man3/oath_base32_encode.3.gz +man/man3/oath_bin2hex.3.gz +man/man3/oath_check_version.3.gz +man/man3/oath_done.3.gz +man/man3/oath_hex2bin.3.gz +man/man3/oath_hotp_generate.3.gz +man/man3/oath_hotp_validate.3.gz +man/man3/oath_hotp_validate_callback.3.gz +man/man3/oath_init.3.gz +man/man3/oath_strerror.3.gz +man/man3/oath_strerror_name.3.gz +man/man3/oath_totp_generate.3.gz +man/man3/oath_totp_validate.3.gz +man/man3/oath_totp_validate2.3.gz +man/man3/oath_totp_validate2_callback.3.gz +man/man3/oath_totp_validate3.3.gz +man/man3/oath_totp_validate3_callback.3.gz +man/man3/oath_totp_validate_callback.3.gz +%%PSKC%%man/man3/pskc_add_keypackage.3.gz +%%PSKC%%man/man3/pskc_build_xml.3.gz +%%PSKC%%man/man3/pskc_check_version.3.gz +%%PSKC%%man/man3/pskc_done.3.gz +%%PSKC%%man/man3/pskc_free.3.gz +%%PSKC%%man/man3/pskc_get_cryptomodule_id.3.gz +%%PSKC%%man/man3/pskc_get_device_devicebinding.3.gz +%%PSKC%%man/man3/pskc_get_device_expirydate.3.gz +%%PSKC%%man/man3/pskc_get_device_issueno.3.gz +%%PSKC%%man/man3/pskc_get_device_manufacturer.3.gz +%%PSKC%%man/man3/pskc_get_device_model.3.gz +%%PSKC%%man/man3/pskc_get_device_serialno.3.gz +%%PSKC%%man/man3/pskc_get_device_startdate.3.gz +%%PSKC%%man/man3/pskc_get_device_userid.3.gz +%%PSKC%%man/man3/pskc_get_id.3.gz +%%PSKC%%man/man3/pskc_get_key_algorithm.3.gz +%%PSKC%%man/man3/pskc_get_key_algparm_chall_checkdigits.3.gz +%%PSKC%%man/man3/pskc_get_key_algparm_chall_encoding.3.gz +%%PSKC%%man/man3/pskc_get_key_algparm_chall_max.3.gz +%%PSKC%%man/man3/pskc_get_key_algparm_chall_min.3.gz +%%PSKC%%man/man3/pskc_get_key_algparm_resp_checkdigits.3.gz +%%PSKC%%man/man3/pskc_get_key_algparm_resp_encoding.3.gz +%%PSKC%%man/man3/pskc_get_key_algparm_resp_length.3.gz +%%PSKC%%man/man3/pskc_get_key_algparm_suite.3.gz +%%PSKC%%man/man3/pskc_get_key_data_b64secret.3.gz +%%PSKC%%man/man3/pskc_get_key_data_counter.3.gz +%%PSKC%%man/man3/pskc_get_key_data_secret.3.gz +%%PSKC%%man/man3/pskc_get_key_data_time.3.gz +%%PSKC%%man/man3/pskc_get_key_data_timedrift.3.gz +%%PSKC%%man/man3/pskc_get_key_data_timeinterval.3.gz +%%PSKC%%man/man3/pskc_get_key_friendlyname.3.gz +%%PSKC%%man/man3/pskc_get_key_id.3.gz +%%PSKC%%man/man3/pskc_get_key_issuer.3.gz +%%PSKC%%man/man3/pskc_get_key_policy_expirydate.3.gz +%%PSKC%%man/man3/pskc_get_key_policy_keyusages.3.gz +%%PSKC%%man/man3/pskc_get_key_policy_numberoftransactions.3.gz +%%PSKC%%man/man3/pskc_get_key_policy_pinencoding.3.gz +%%PSKC%%man/man3/pskc_get_key_policy_pinkeyid.3.gz +%%PSKC%%man/man3/pskc_get_key_policy_pinmaxfailedattempts.3.gz +%%PSKC%%man/man3/pskc_get_key_policy_pinmaxlength.3.gz +%%PSKC%%man/man3/pskc_get_key_policy_pinminlength.3.gz +%%PSKC%%man/man3/pskc_get_key_policy_pinusagemode.3.gz +%%PSKC%%man/man3/pskc_get_key_policy_startdate.3.gz +%%PSKC%%man/man3/pskc_get_key_profileid.3.gz +%%PSKC%%man/man3/pskc_get_key_reference.3.gz +%%PSKC%%man/man3/pskc_get_key_userid.3.gz +%%PSKC%%man/man3/pskc_get_keypackage.3.gz +%%PSKC%%man/man3/pskc_get_signed_p.3.gz +%%PSKC%%man/man3/pskc_get_version.3.gz +%%PSKC%%man/man3/pskc_global_done.3.gz +%%PSKC%%man/man3/pskc_global_init.3.gz +%%PSKC%%man/man3/pskc_global_log.3.gz +%%PSKC%%man/man3/pskc_init.3.gz +%%PSKC%%man/man3/pskc_keyusage2str.3.gz +%%PSKC%%man/man3/pskc_output.3.gz +%%PSKC%%man/man3/pskc_parse_from_memory.3.gz +%%PSKC%%man/man3/pskc_pinusagemode2str.3.gz +%%PSKC%%man/man3/pskc_set_cryptomodule_id.3.gz +%%PSKC%%man/man3/pskc_set_device_devicebinding.3.gz +%%PSKC%%man/man3/pskc_set_device_expirydate.3.gz +%%PSKC%%man/man3/pskc_set_device_issueno.3.gz +%%PSKC%%man/man3/pskc_set_device_manufacturer.3.gz +%%PSKC%%man/man3/pskc_set_device_model.3.gz +%%PSKC%%man/man3/pskc_set_device_serialno.3.gz +%%PSKC%%man/man3/pskc_set_device_startdate.3.gz +%%PSKC%%man/man3/pskc_set_device_userid.3.gz +%%PSKC%%man/man3/pskc_set_id.3.gz +%%PSKC%%man/man3/pskc_set_key_algorithm.3.gz +%%PSKC%%man/man3/pskc_set_key_algparm_chall_checkdigits.3.gz +%%PSKC%%man/man3/pskc_set_key_algparm_chall_encoding.3.gz +%%PSKC%%man/man3/pskc_set_key_algparm_chall_max.3.gz +%%PSKC%%man/man3/pskc_set_key_algparm_chall_min.3.gz +%%PSKC%%man/man3/pskc_set_key_algparm_resp_checkdigits.3.gz +%%PSKC%%man/man3/pskc_set_key_algparm_resp_encoding.3.gz +%%PSKC%%man/man3/pskc_set_key_algparm_resp_length.3.gz +%%PSKC%%man/man3/pskc_set_key_algparm_suite.3.gz +%%PSKC%%man/man3/pskc_set_key_data_b64secret.3.gz +%%PSKC%%man/man3/pskc_set_key_data_counter.3.gz +%%PSKC%%man/man3/pskc_set_key_data_secret.3.gz +%%PSKC%%man/man3/pskc_set_key_data_time.3.gz +%%PSKC%%man/man3/pskc_set_key_data_timedrift.3.gz +%%PSKC%%man/man3/pskc_set_key_data_timeinterval.3.gz +%%PSKC%%man/man3/pskc_set_key_friendlyname.3.gz +%%PSKC%%man/man3/pskc_set_key_id.3.gz +%%PSKC%%man/man3/pskc_set_key_issuer.3.gz +%%PSKC%%man/man3/pskc_set_key_policy_expirydate.3.gz +%%PSKC%%man/man3/pskc_set_key_policy_keyusages.3.gz +%%PSKC%%man/man3/pskc_set_key_policy_numberoftransactions.3.gz +%%PSKC%%man/man3/pskc_set_key_policy_pinencoding.3.gz +%%PSKC%%man/man3/pskc_set_key_policy_pinkeyid.3.gz +%%PSKC%%man/man3/pskc_set_key_policy_pinmaxfailedattempts.3.gz +%%PSKC%%man/man3/pskc_set_key_policy_pinmaxlength.3.gz +%%PSKC%%man/man3/pskc_set_key_policy_pinminlength.3.gz +%%PSKC%%man/man3/pskc_set_key_policy_pinusagemode.3.gz +%%PSKC%%man/man3/pskc_set_key_policy_startdate.3.gz +%%PSKC%%man/man3/pskc_set_key_profileid.3.gz +%%PSKC%%man/man3/pskc_set_key_reference.3.gz +%%PSKC%%man/man3/pskc_set_key_userid.3.gz +%%PSKC%%man/man3/pskc_set_version.3.gz +%%PSKC%%man/man3/pskc_sign_x509.3.gz +%%PSKC%%man/man3/pskc_str2keyusage.3.gz +%%PSKC%%man/man3/pskc_str2pinusagemode.3.gz +%%PSKC%%man/man3/pskc_str2valueformat.3.gz +%%PSKC%%man/man3/pskc_strerror.3.gz +%%PSKC%%man/man3/pskc_strerror_name.3.gz +%%PSKC%%man/man3/pskc_validate.3.gz +%%PSKC%%man/man3/pskc_valueformat2str.3.gz +%%PSKC%%man/man3/pskc_verify_x509crt.3.gz %%PSKC%%share/xml/pskc/catalog-pskc.xml %%PSKC%%share/xml/pskc/pskc-schema.xsd %%PSKC%%share/xml/pskc/xenc-schema.xsd
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310052044.r95KipP4031913>