From nobody Tue Jul 11 10:04:02 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R0c0M0hXNzZQLs; Tue, 11 Jul 2023 10:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0c0L5klLz3hLk; Tue, 11 Jul 2023 10:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689069842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C926IFcQZ/Fu+h9iQzU8xXIl+nYDa1+XlmJ+DRJ4nF4=; b=q1o84wWx4fTHHtnYzX3YYsNjkK19InXUULfT1vh/JY4HQXX2c2ATvygXywd4OYt+kBeFax 5SXwoC1VUzqNXCviUm5kbsfY5WlmHuvN+HLxlKUj2x+fRNKlzfI8kg/Rl678S7EC7N+Sf/ 1/VnDj+Z2yf3FaELzq+bTgYMj+tSeyLb0KOtC2Tdl3ozUkzLlOfAhrXq8cXrKOj8hD7iX/ AI+ycyGa1PwUSirNrlpS9gWIwLfZTrhXdQXvX+cDnfpcBvhTvYXxYtNX6hHCAxQof7Pz23 9pa/rJEFt/2qs0GfuhTVQizmpqJE+cldzu4fWc+bWI3fG0nCwURV02CX0XTtHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689069842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C926IFcQZ/Fu+h9iQzU8xXIl+nYDa1+XlmJ+DRJ4nF4=; b=s7gIEgL8LB+B0IuVfEPfeBNvExQQD174sUlY3HyjcENzmv9JTvOP48X3vAiUdpO+Jyzy+P bfQ6VaCHSosGP5QDcM2Wl88khIiL5PcVq06Oy5Zi+fKRJ13f15wwiFSkRi5we7CiiiMMIn W2YDhCrX38BiSe4UcdeuSifl19WRKVA2aMKXC5v/Cr7YrbRvrkLlfEZEWxk3RsBjqixYRX BIc3NBY8QX17v3gt6H2q/EAopcdCwzV/o3TA5SMT+RAdDUyyUync2GzV1MwpWSNnpm1Jjk fMtLUoGyMwp9d241mAF4/3rGW8U3PN8kNUs54KysMAYwEzOvrT7BRB9XzUhYSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689069842; a=rsa-sha256; cv=none; b=Wpgp7PYiOXFQ1rQ/NG9HLgwQECKiv3NAyKHm3PABIost8ZnK1IxXwfSvrVO4GaTPjGFwvH Yd9NF3EGZPVcodVapuzuMfX+0xtc8mb7KM4pcxz6knioPv6gIJWth/aaO8Wa0XPQeRyKem 9//k95jeErAx/S7sfjyIrONZUsRav7WMsxuoPFQw6L8XrApvOQ9znZK5ud5AntmqpoJz/2 QsL9lbZAy0e0RykNH5jQiTvcoaWZeTQKYMcwK9JdgNYmiLzjT964phdVdGpJMdZXjYJrXq yEhsZ1ndQclZiCvaa9nsbHSd3iFzrW4JDTURJJ7VJenaZApzLQvZq7q6vmExQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0c0L4pcvzMRl; Tue, 11 Jul 2023 10:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BA42ED009323; Tue, 11 Jul 2023 10:04:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BA421h009322; Tue, 11 Jul 2023 10:04:02 GMT (envelope-from git) Date: Tue, 11 Jul 2023 10:04:02 GMT Message-Id: <202307111004.36BA421h009322@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alex Dupre Subject: git: e9199fc8af24 - main - security/oath-toolkit: update to 2.6.9 release. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9199fc8af244e393adbf79b782c80c27be8f14b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ale: URL: https://cgit.FreeBSD.org/ports/commit/?id=e9199fc8af244e393adbf79b782c80c27be8f14b commit e9199fc8af244e393adbf79b782c80c27be8f14b Author: Alex Dupre AuthorDate: 2023-07-11 10:03:25 +0000 Commit: Alex Dupre CommitDate: 2023-07-11 10:03:59 +0000 security/oath-toolkit: update to 2.6.9 release. --- security/oath-toolkit/Makefile | 6 +- security/oath-toolkit/distinfo | 6 +- .../oath-toolkit/files/patch-pam__oath_Makefile.in | 58 --------------- .../oath-toolkit/files/patch-pam__oath_configure | 11 --- .../files/patch-pam__oath_pam__modutil.c | 85 ---------------------- .../files/patch-pam__oath_pam__modutil.h | 20 ----- .../oath-toolkit/files/patch-pam__oath_pam__oath.c | 20 ----- .../files/patch-pam__oath_tests_Makefile.in | 11 --- 8 files changed, 6 insertions(+), 211 deletions(-) diff --git a/security/oath-toolkit/Makefile b/security/oath-toolkit/Makefile index 337420fc285b..1d9cefe55cbf 100644 --- a/security/oath-toolkit/Makefile +++ b/security/oath-toolkit/Makefile @@ -1,6 +1,5 @@ PORTNAME= oath-toolkit -PORTVERSION= 2.6.7 -PORTREVISION= 3 +PORTVERSION= 2.6.9 CATEGORIES= security MASTER_SITES= SAVANNAH @@ -14,7 +13,8 @@ LICENSE_COMB= multi LIB_DEPENDS= libltdl.so:devel/libltdl GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} +CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ + --disable-pam-tests USES= gmake libtool pathfix pkgconfig USE_GNOME= libxslt USE_LDCONFIG= yes diff --git a/security/oath-toolkit/distinfo b/security/oath-toolkit/distinfo index dc985d05f962..bd627e1dce41 100644 --- a/security/oath-toolkit/distinfo +++ b/security/oath-toolkit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643620380 -SHA256 (oath-toolkit-2.6.7.tar.gz) = 36eddfce8f2f36347fb257dbf878ba0303a2eaafe24eaa071d5cd302261046a9 -SIZE (oath-toolkit-2.6.7.tar.gz) = 5625279 +TIMESTAMP = 1689066348 +SHA256 (oath-toolkit-2.6.9.tar.gz) = 333ac831c8f1a6dbd7feb897339bba453ff34d3b0f4cfaa6b5a20dba55c8e985 +SIZE (oath-toolkit-2.6.9.tar.gz) = 4693524 diff --git a/security/oath-toolkit/files/patch-pam__oath_Makefile.in b/security/oath-toolkit/files/patch-pam__oath_Makefile.in deleted file mode 100644 index 354c0a7078f9..000000000000 --- a/security/oath-toolkit/files/patch-pam__oath_Makefile.in +++ /dev/null @@ -1,58 +0,0 @@ ---- pam_oath/Makefile.in.orig 2022-02-01 11:49:49 UTC -+++ pam_oath/Makefile.in -@@ -149,7 +149,7 @@ am__uninstall_files_from_dir = { \ - am__installdirs = "$(DESTDIR)$(pammoddir)" - LTLIBRARIES = $(pammod_LTLIBRARIES) - pam_oath_la_DEPENDENCIES = ../liboath/liboath.la --am_pam_oath_la_OBJECTS = pam_oath.lo -+am_pam_oath_la_OBJECTS = pam_oath.lo pam_modutil.lo - pam_oath_la_OBJECTS = $(am_pam_oath_la_OBJECTS) - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -@@ -173,7 +173,8 @@ am__v_at_1 = - DEFAULT_INCLUDES = -I.@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp - am__maybe_remake_depfiles = depfiles --am__depfiles_remade = ./$(DEPDIR)/pam_oath.Plo -+am__depfiles_remade = ./$(DEPDIR)/pam_modutil.Plo \ -+ ./$(DEPDIR)/pam_oath.Plo - am__mv = mv -f - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -414,7 +416,7 @@ AM_CPPFLAGS = -I$(builddir)/../liboath - EXTRA_DIST = README - pammoddir = $(PAMDIR) - pammod_LTLIBRARIES = pam_oath.la --pam_oath_la_SOURCES = pam_oath.c -+pam_oath_la_SOURCES = pam_oath.c pam_modutil.c pam_modutil.h - # XXX add -Wl,-x too? PAM documentation suggests it. - pam_oath_la_LIBADD = ../liboath/liboath.la - pam_oath_la_LDFLAGS = -module -avoid-version -@@ -516,6 +518,7 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_modutil.Plo@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_oath.Plo@am__quote@ # am--include-marker - - $(am__depfiles_remade): -@@ -896,7 +904,8 @@ clean-am: clean-generic clean-libtool clean-pammodLTLI - - distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) -- -rm -f ./$(DEPDIR)/pam_oath.Plo -+ -rm -f ./$(DEPDIR)/pam_modutil.Plo -+ -rm -f ./$(DEPDIR)/pam_oath.Plo - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags -@@ -944,7 +953,8 @@ installcheck-am: - maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache -- -rm -f ./$(DEPDIR)/pam_oath.Plo -+ -rm -f ./$(DEPDIR)/pam_modutil.Plo -+ -rm -f ./$(DEPDIR)/pam_oath.Plo - -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-generic - diff --git a/security/oath-toolkit/files/patch-pam__oath_configure b/security/oath-toolkit/files/patch-pam__oath_configure deleted file mode 100644 index 154fc0917915..000000000000 --- a/security/oath-toolkit/files/patch-pam__oath_configure +++ /dev/null @@ -1,11 +0,0 @@ ---- pam_oath/configure.orig 2022-01-31 11:20:05 UTC -+++ pam_oath/configure -@@ -12156,8 +12156,6 @@ if test "x$ac_cv_header_security_pam_modutil_h" = xyes - #define HAVE_SECURITY_PAM_MODUTIL_H 1 - _ACEOF - --else -- as_fn_error $? "PAM header files not found, install libpam-dev." "$LINENO" 5 - fi - - done diff --git a/security/oath-toolkit/files/patch-pam__oath_pam__modutil.c b/security/oath-toolkit/files/patch-pam__oath_pam__modutil.c deleted file mode 100644 index aabd50957e26..000000000000 --- a/security/oath-toolkit/files/patch-pam__oath_pam__modutil.c +++ /dev/null @@ -1,85 +0,0 @@ ---- pam_oath/pam_modutil.c.orig 2022-01-31 11:03:40 UTC -+++ pam_oath/pam_modutil.c -@@ -0,0 +1,82 @@ -+#include -+ -+#ifndef HAVE_SECURITY_PAM_MODUTIL_H -+ -+#include "pam_modutil.h" -+ -+#ifdef HAVE_SECURITY_PAM_APPL_H -+#include -+#endif -+#ifdef HAVE_SECURITY_PAM_MODULES_H -+#include -+#endif -+ -+#include -+#include -+#include -+#include -+#include -+ -+#define PWD_INITIAL_LENGTH 0x400 -+#define PWD_ABSURD_PWD_LENGTH 0x4000 -+ -+void _pam_modutil_cleanup(pam_handle_t *pamh, void *data, int error_status) { -+ if (data) { -+ (void) free(data); -+ } -+} -+ -+struct passwd *pam_modutil_getpwnam(pam_handle_t *pamh, const char *user) { -+ void *buffer = NULL; -+ size_t length = PWD_INITIAL_LENGTH; -+ long sc_init_length = sysconf(_SC_GETPW_R_SIZE_MAX); -+ -+ if (sc_init_length != -1 && sc_init_length < PWD_ABSURD_PWD_LENGTH) { -+ length = (size_t) sc_init_length; -+ } -+ -+ do { -+ int status; -+ void *new_buffer; -+ struct passwd *result = NULL; -+ -+ new_buffer = realloc(buffer, sizeof(struct passwd) + length); -+ if (new_buffer == NULL) { -+ // out of memory -+ if (buffer) { -+ free(buffer); -+ } -+ return NULL; -+ } -+ buffer = new_buffer; -+ -+ status = getpwnam_r(user, buffer, -+ sizeof(struct passwd) + (char *) buffer, -+ length, &result); -+ if (!status && result) { -+ status = pam_set_data(pamh, "_pammodutil_getpwnam", result, -+ _pam_modutil_cleanup); -+ if (status == PAM_SUCCESS) { -+ return result; -+ } -+ // unable to set data item -+ free(buffer); -+ return NULL; -+ } -+ if (status != ERANGE) { -+ // no matching record found (if status == 0) -+ // or getpwnam_r encountered an error -+ free(buffer); -+ return NULL; -+ } -+ -+ length <<= 1; -+ } while (length < PWD_ABSURD_PWD_LENGTH); -+ -+ // exceeded maximum buffer size -+ free(buffer); -+ return NULL; -+} -+#else -+typedef int make_iso_compilers_happy; -+#endif /* HAVE_SECURITY_PAM_MODUTIL_H */ diff --git a/security/oath-toolkit/files/patch-pam__oath_pam__modutil.h b/security/oath-toolkit/files/patch-pam__oath_pam__modutil.h deleted file mode 100644 index 929a3951d5c4..000000000000 --- a/security/oath-toolkit/files/patch-pam__oath_pam__modutil.h +++ /dev/null @@ -1,20 +0,0 @@ ---- pam_oath/pam_modutil.h.orig 2022-01-31 11:03:40 UTC -+++ pam_oath/pam_modutil.h -@@ -0,0 +1,17 @@ -+#ifndef PAM_MODUTIL_H -+#define PAM_MODUTIL_H -+ -+#ifdef HAVE_SECURITY_PAM_MODUTIL_H -+#include -+#else -+ -+#ifdef HAVE_SECURITY_PAM_MODULES_H -+#include -+#endif -+ -+#include -+ -+struct passwd *pam_modutil_getpwnam(pam_handle_t *pamh, const char *user); -+ -+#endif -+#endif diff --git a/security/oath-toolkit/files/patch-pam__oath_pam__oath.c b/security/oath-toolkit/files/patch-pam__oath_pam__oath.c deleted file mode 100644 index 29aad9f52fa9..000000000000 --- a/security/oath-toolkit/files/patch-pam__oath_pam__oath.c +++ /dev/null @@ -1,20 +0,0 @@ ---- pam_oath/pam_oath.c.orig 2021-05-01 17:10:32 UTC -+++ pam_oath/pam_oath.c -@@ -21,6 +21,7 @@ - #include - - #include "oath.h" -+#include "pam_modutil.h" - - #include - #include -@@ -42,9 +43,6 @@ - - #ifdef HAVE_SECURITY_PAM_APPL_H - #include --#endif --#ifdef HAVE_SECURITY_PAM_MODUTIL_H --#include - #endif - #ifdef HAVE_SECURITY_PAM_MODULES_H - #include diff --git a/security/oath-toolkit/files/patch-pam__oath_tests_Makefile.in b/security/oath-toolkit/files/patch-pam__oath_tests_Makefile.in deleted file mode 100644 index 4912d58fdaf6..000000000000 --- a/security/oath-toolkit/files/patch-pam__oath_tests_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- pam_oath/tests/Makefile.in.orig 2022-01-31 12:02:54 UTC -+++ pam_oath/tests/Makefile.in -@@ -102,7 +102,7 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --TESTS = test-pam_oath$(EXEEXT) $(am__append_1) -+TESTS = $(am__append_1) - @ROOT_TESTS_TRUE@am__append_1 = run-root-tests.sh - subdir = tests - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4