Date: Wed, 31 Jan 2024 09:58:13 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3561225871a1 - main - security/courier-authlib: Update to 0.72.1 Message-ID: <202401310958.40V9wDjE089473@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=3561225871a1dcfc60626a25c2b6d23909b541bc commit 3561225871a1dcfc60626a25c2b6d23909b541bc Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2024-01-31 09:57:25 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2024-01-31 09:58:08 +0000 security/courier-authlib: Update to 0.72.1 - Add new depndencies - Regenerate patches - Reset PORTREVISION on slave ports While here move man pages to share/man. --- databases/courier-authlib-mysql/Makefile | 1 - databases/courier-authlib-pgsql/Makefile | 1 - databases/courier-authlib-sqlite/Makefile | 1 - databases/courier-authlib-userdb/Makefile | 1 - databases/courier-authlib-usergdbm/Makefile | 1 - mail/courier-authlib-vchkpw/Makefile | 1 - net/courier-authlib-ldap/Makefile | 1 - security/courier-authlib-base/Makefile | 1 - security/courier-authlib/Makefile | 9 ++-- security/courier-authlib/distinfo | 6 +-- security/courier-authlib/files/patch-Makefile.in | 48 +++++++++--------- security/courier-authlib/files/patch-authvchkpw | 34 ++++++------- security/courier-authlib/files/patch-configure | 16 +++--- .../files/patch-libs_liblock_locktest.c | 8 +-- .../files/patch-userdb__pw2userdb.in | 58 +++++++++++----------- security/courier-authlib/pkg-plist-base | 32 ++++++------ security/courier-authlib/pkg-plist-userdb | 8 +-- 17 files changed, 109 insertions(+), 118 deletions(-) diff --git a/databases/courier-authlib-mysql/Makefile b/databases/courier-authlib-mysql/Makefile index 89deab0ae110..496f19319021 100644 --- a/databases/courier-authlib-mysql/Makefile +++ b/databases/courier-authlib-mysql/Makefile @@ -1,4 +1,3 @@ -PORTREVISION= 1 PKGNAMESUFFIX= -mysql COMMENT= MySQL support for the Courier authentication library diff --git a/databases/courier-authlib-pgsql/Makefile b/databases/courier-authlib-pgsql/Makefile index a50cbe4eee87..58c6f3042856 100644 --- a/databases/courier-authlib-pgsql/Makefile +++ b/databases/courier-authlib-pgsql/Makefile @@ -1,4 +1,3 @@ -PORTREVISION= 1 PKGNAMESUFFIX= -pgsql COMMENT= PostgreSQL support for the Courier authentication library diff --git a/databases/courier-authlib-sqlite/Makefile b/databases/courier-authlib-sqlite/Makefile index 576eb2bf1782..43ab74a98a31 100644 --- a/databases/courier-authlib-sqlite/Makefile +++ b/databases/courier-authlib-sqlite/Makefile @@ -1,4 +1,3 @@ -PORTREVISION= 1 PKGNAMESUFFIX= -sqlite COMMENT= SQLite support for the Courier authentication library diff --git a/databases/courier-authlib-userdb/Makefile b/databases/courier-authlib-userdb/Makefile index ede6ad4f7787..fa4afcaed494 100644 --- a/databases/courier-authlib-userdb/Makefile +++ b/databases/courier-authlib-userdb/Makefile @@ -1,4 +1,3 @@ -PORTREVISION= 1 PKGNAMESUFFIX= -userdb COMMENT= Userdb support for the Courier authentication library diff --git a/databases/courier-authlib-usergdbm/Makefile b/databases/courier-authlib-usergdbm/Makefile index aac9214a1067..36e101a00423 100644 --- a/databases/courier-authlib-usergdbm/Makefile +++ b/databases/courier-authlib-usergdbm/Makefile @@ -1,4 +1,3 @@ -PORTREVISION= 1 PKGNAMESUFFIX= -usergdbm COMMENT= Userdb support for the Courier authentication library diff --git a/mail/courier-authlib-vchkpw/Makefile b/mail/courier-authlib-vchkpw/Makefile index 5e0d1307a2f1..e8d5b44277e2 100644 --- a/mail/courier-authlib-vchkpw/Makefile +++ b/mail/courier-authlib-vchkpw/Makefile @@ -1,4 +1,3 @@ -PORTREVISION= 1 PKGNAMESUFFIX= -vchkpw COMMENT= Vpopmail/vchkpw support for the Courier authentication library diff --git a/net/courier-authlib-ldap/Makefile b/net/courier-authlib-ldap/Makefile index c862bf5a5eb3..722d609d7849 100644 --- a/net/courier-authlib-ldap/Makefile +++ b/net/courier-authlib-ldap/Makefile @@ -1,4 +1,3 @@ -PORTREVISION= 1 PKGNAMESUFFIX= -ldap COMMENT= LDAP support for the Courier authentication library diff --git a/security/courier-authlib-base/Makefile b/security/courier-authlib-base/Makefile index 7d728962dada..84e64c4cd3eb 100644 --- a/security/courier-authlib-base/Makefile +++ b/security/courier-authlib-base/Makefile @@ -1,4 +1,3 @@ -PORTREVISION= 1 PKGNAMESUFFIX= -base COMMENT= Courier authentication library base diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index edf1edc65ff9..aebdbab5d262 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -1,6 +1,5 @@ PORTNAME= courier-authlib -PORTVERSION= 0.72.0 -PORTREVISION= 1 +PORTVERSION= 0.72.1 CATEGORIES?= security mail .if defined(PKGNAMESUFFIX) MASTER_SITES= SF/courier/authlib/${PORTVERSION} @@ -29,10 +28,11 @@ OPTIONS_DEFINE+= GDBM .else # !defined(PKGNAMESUFFIX) -LIB_DEPENDS+= libltdl.so:devel/libltdl \ +LIB_DEPENDS+= libidn2.so:dns/libidn2 \ + libltdl.so:devel/libltdl \ libcourier-unicode.so:devel/courier-unicode -USES= iconv gmake libtool localbase perl5 tar:bzip2 +USES= iconv gmake libtool localbase perl5 pkgconfig tar:bzip2 GNU_CONFIGURE= yes USE_SUBMAKE= yes @@ -44,6 +44,7 @@ AUTHDAEMONVAR= ${LOCALSTATEDIR}/run/authdaemond VPOPMAILDIR?= ${LOCALBASE}/vpopmail USERDB?= ${PREFIX}/etc/userdb +GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --enable-unicode \ --disable-static \ --without-authcustom \ diff --git a/security/courier-authlib/distinfo b/security/courier-authlib/distinfo index a8d664d0583e..35c59fb68201 100644 --- a/security/courier-authlib/distinfo +++ b/security/courier-authlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670179404 -SHA256 (courier-authlib-0.72.0.tar.bz2) = 5cc7a2ca16cf43af0c667cb365d455abde52559a89d2197a9b87448fff137ee3 -SIZE (courier-authlib-0.72.0.tar.bz2) = 2274507 +TIMESTAMP = 1706686463 +SHA256 (courier-authlib-0.72.1.tar.bz2) = 1ca3cca191a7f1a973312f4b68da4d45986f006ac1323a71bf10193891c44585 +SIZE (courier-authlib-0.72.1.tar.bz2) = 2288448 diff --git a/security/courier-authlib/files/patch-Makefile.in b/security/courier-authlib/files/patch-Makefile.in index ed57a270e1fb..30b24b2f1beb 100644 --- a/security/courier-authlib/files/patch-Makefile.in +++ b/security/courier-authlib/files/patch-Makefile.in @@ -1,4 +1,4 @@ ---- Makefile.in.orig 2022-05-27 01:32:50 UTC +--- Makefile.in.orig 2024-01-28 13:22:04 UTC +++ Makefile.in @@ -95,11 +95,10 @@ host_triplet = @host@ POST_UNINSTALL = : @@ -123,7 +123,7 @@ $(libcourierauth_la_SOURCES) \ $(libcourierauthcommon_la_SOURCES) \ $(libcourierauthsasl_la_SOURCES) \ -@@ -568,6 +578,7 @@ LIBAUTHUSERDB = @LIBAUTHUSERDB@ +@@ -569,6 +579,7 @@ LIBAUTHUSERDB = @LIBAUTHUSERDB@ LIBAUTHSHADOW = @LIBAUTHSHADOW@ LIBAUTHSQLITE = @LIBAUTHSQLITE@ LIBAUTHUSERDB = @LIBAUTHUSERDB@ @@ -131,7 +131,7 @@ LIBDB = @LIBDB@ LIBDL = @LIBDL@ LIBGDBM = @LIBGDBM@ -@@ -701,7 +712,10 @@ AUTOMAKE_OPTIONS = dist-bzip2 +@@ -702,7 +713,10 @@ AUTOMAKE_OPTIONS = dist-bzip2 userdb = @userdb@ using_systemd = @using_systemd@ AUTOMAKE_OPTIONS = dist-bzip2 @@ -143,7 +143,7 @@ AM_CPPFLAGS = -I liblock $(LTDLINCL) BUILT_SOURCES = authdaemonrc.h $(BUILT1) $(GITFILES) \ $(man3:%.3=%.html) $(man1:%.1=%.html) authsqliterc.h \ -@@ -709,16 +723,18 @@ modules = @LIBAUTHUSERDB@ \ +@@ -710,16 +724,18 @@ modules = @LIBAUTHUSERDB@ \ modules = @LIBAUTHUSERDB@ \ @LIBAUTHPAM@ @LIBAUTHPWD@ @LIBAUTHSHADOW@ \ @LIBAUTHPGSQL@ @LIBAUTHLDAP@ @LIBAUTHMYSQL@ @LIBAUTHSQLITE@ \ @@ -166,7 +166,7 @@ libauthpgsql.la \ libauthldap.la \ libauthmysql.la \ -@@ -791,6 +807,13 @@ libauthshadow_la_LDFLAGS = $(commonldflags) +@@ -792,6 +808,13 @@ libauthshadow_la_LDFLAGS = $(commonldflags) libauthshadow_la_LIBADD = $(commonlibadd) $(libauthshadow_t) libauthshadow_la_LDFLAGS = $(commonldflags) @@ -180,7 +180,7 @@ # The authpgsql module libauthpgsql_t = @PGSQL_LIBS@ @LIBM@ @NETLIBS@ libauthpgsql_la_SOURCES = authpgsql.c authpgsqllib.cpp authpgsql.h -@@ -878,8 +901,8 @@ libcourierauthsaslclient_la_LDFLAGS = -export-symbols- +@@ -880,8 +903,8 @@ libcourierauthsaslclient_la_LDFLAGS = -export-symbols- libcourierauthsaslclient_la_LIBADD = libcourierauth.la libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -version-info @LIBVERSION_INFO@ @@ -191,7 +191,7 @@ courierauthconfig_SOURCES = authinfo.c authpasswd_SOURCES = authpasswd.c -@@ -896,7 +919,7 @@ authenumerate_LDADD = libcourierauth.la \ +@@ -898,7 +921,7 @@ authenumerate_LDADD = libcourierauth.la \ authenumerate_LDADD = libcourierauth.la \ libs/numlib/libnumlib.la @@ -200,7 +200,7 @@ # # The main daemon. -@@ -927,7 +950,7 @@ extraman3 = auth_generic_meta.3 auth_login_meta.3 auth +@@ -929,7 +952,7 @@ extraman3 = auth_generic_meta.3 auth_login_meta.3 auth extraman3 = auth_generic_meta.3 auth_login_meta.3 auth_getuserinfo_meta.3 \ auth_sasl_ex.3 @@ -209,7 +209,7 @@ man_MANS = $(man1) $(man3) $(extraman3) BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \ authdaemonrc.h packageversion.h \ -@@ -986,7 +1009,7 @@ stamp-h1: $(srcdir)/courier_auth_config.h.in $(top_bui +@@ -988,7 +1011,7 @@ stamp-h1: $(srcdir)/courier_auth_config.h.in $(top_bui stamp-h1: $(srcdir)/courier_auth_config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status courier_auth_config.h @@ -218,7 +218,7 @@ ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ -@@ -1158,73 +1181,76 @@ clean-pkglibLTLIBRARIES: +@@ -1160,73 +1183,76 @@ clean-pkglibLTLIBRARIES: rm -f $${locs}; \ } @@ -316,7 +316,7 @@ @rm -f courierauthconfig$(EXEEXT) $(AM_V_CCLD)$(LINK) $(courierauthconfig_OBJECTS) $(courierauthconfig_LDADD) $(LIBS) install-pkglibexecSCRIPTS: $(pkglibexec_SCRIPTS) -@@ -1351,6 +1377,8 @@ distclean-compile: +@@ -1353,6 +1379,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authtest.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdb.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdbpwd.Plo@am__quote@ # am--include-marker @@ -325,7 +325,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpassword.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordmd5.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordsha1.Plo@am__quote@ # am--include-marker -@@ -1366,6 +1394,7 @@ distclean-compile: +@@ -1368,6 +1396,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthshadow.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdb.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdbcommon.Plo@am__quote@ # am--include-marker @@ -333,7 +333,7 @@ $(am__depfiles_remade): @$(MKDIR_P) $(@D) -@@ -1935,6 +1964,8 @@ distclean: distclean-recursive +@@ -1937,6 +1966,8 @@ distclean: distclean-recursive -rm -f ./$(DEPDIR)/authtest.Po -rm -f ./$(DEPDIR)/authuserdb.Plo -rm -f ./$(DEPDIR)/authuserdbpwd.Plo @@ -342,7 +342,7 @@ -rm -f ./$(DEPDIR)/checkpassword.Plo -rm -f ./$(DEPDIR)/checkpasswordmd5.Plo -rm -f ./$(DEPDIR)/checkpasswordsha1.Plo -@@ -1950,6 +1981,7 @@ distclean: distclean-recursive +@@ -1952,6 +1983,7 @@ distclean: distclean-recursive -rm -f ./$(DEPDIR)/preauthshadow.Plo -rm -f ./$(DEPDIR)/preauthuserdb.Plo -rm -f ./$(DEPDIR)/preauthuserdbcommon.Plo @@ -350,7 +350,7 @@ -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags -@@ -1966,18 +1998,26 @@ info-am: +@@ -1968,18 +2000,26 @@ info-am: info-am: @@ -385,7 +385,7 @@ install-html: install-html-recursive install-html-am: -@@ -2120,13 +2160,16 @@ uninstall-man: uninstall-man1 uninstall-man3 +@@ -2122,13 +2162,16 @@ uninstall-man: uninstall-man1 uninstall-man3 .PRECIOUS: Makefile @@ -404,7 +404,7 @@ @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc: @HAVE_AUTHPGSQL_TRUE@ rm -f $(DESTDIR)@authpgsqlrc@.dist -@@ -2144,8 +2187,6 @@ authpgsqlrc.h: +@@ -2146,8 +2189,6 @@ authpgsqlrc.h: @HAVE_LDAP_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || : @HAVE_LDAP_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \ @HAVE_LDAP_TRUE@ $(DESTDIR)@authldaprc@.dist @@ -413,7 +413,7 @@ @HAVE_LDAP_TRUE@uninstall-authldaprc: @HAVE_LDAP_TRUE@ rm -f $(DESTDIR)@authldaprc@.dist -@@ -2156,6 +2197,18 @@ authpgsqlrc.h: +@@ -2158,6 +2199,18 @@ authpgsqlrc.h: @HAVE_LDAP_FALSE@uninstall-authldaprc: @HAVE_LDAP_FALSE@ @: @@ -432,7 +432,7 @@ authldaprc.h: echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h -@@ -2163,8 +2216,6 @@ authldaprc.h: +@@ -2165,8 +2218,6 @@ authldaprc.h: @HAVE_AUTHMYSQL_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || : @HAVE_AUTHMYSQL_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \ @HAVE_AUTHMYSQL_TRUE@ $(DESTDIR)@authmysqlrc@.dist @@ -441,7 +441,7 @@ @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc: @HAVE_AUTHMYSQL_TRUE@ rm -f $(DESTDIR)@authmysqlrc@.dist -@@ -2182,8 +2233,6 @@ authmysqlrc.h: +@@ -2184,8 +2235,6 @@ authmysqlrc.h: @HAVE_AUTHSQLITE_TRUE@ $(mkinstalldirs) $(DESTDIR)`dirname @authsqliterc@` || : @HAVE_AUTHSQLITE_TRUE@ $(INSTALL_DATA) -m 660 $(srcdir)/authsqliterc \ @HAVE_AUTHSQLITE_TRUE@ $(DESTDIR)@authsqliterc@.dist @@ -450,7 +450,7 @@ @HAVE_AUTHSQLITE_TRUE@uninstall-authsqliterc: @HAVE_AUTHSQLITE_TRUE@ rm -f $(DESTDIR)@authsqliterc@.dist -@@ -2202,17 +2251,21 @@ authpiperc.h: +@@ -2204,17 +2253,21 @@ authpiperc.h: authpiperc.h: echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h @@ -481,7 +481,7 @@ authdaemonrc.h: echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h -@@ -2268,24 +2321,24 @@ install-data-hook: install-authdaemonrc install-authpg +@@ -2270,24 +2323,24 @@ install-data-hook: install-authdaemonrc install-authpg # automake still a bit stupid... install-data-hook: install-authdaemonrc install-authpgsqlrc \ @@ -518,7 +518,7 @@ $(INSTALL_SCRIPT) userdb/pw2userdb \ $(DESTDIR)$(sbindir)/pw2userdb ; \ $(INSTALL_SCRIPT) userdb/makeuserdb \ -@@ -2296,9 +2349,10 @@ uninstall-hook: uninstall-authldaprc uninstall-authdae +@@ -2298,9 +2351,10 @@ uninstall-hook: uninstall-authldaprc uninstall-authdae $(DESTDIR)$(sbindir)/userdbpw uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc uninstall-authsqliterc @@ -530,7 +530,7 @@ $(DESTDIR)$(sbindir)/pw2userdb \ $(DESTDIR)$(sbindir)/makeuserdb \ $(DESTDIR)$(sbindir)/userdb \ -@@ -2308,7 +2362,7 @@ authlib.3: authlib.3.in +@@ -2310,7 +2364,7 @@ authlib.3: authlib.3.in $(SHELL) ./config.status --file=authlib.html authlib.3: authlib.3.in diff --git a/security/courier-authlib/files/patch-authvchkpw b/security/courier-authlib/files/patch-authvchkpw index 486075609c89..9f898a5b6441 100644 --- a/security/courier-authlib/files/patch-authvchkpw +++ b/security/courier-authlib/files/patch-authvchkpw @@ -1,4 +1,4 @@ ---- authvchkpw.c.orig 2017-07-03 08:38:16 UTC +--- authvchkpw.c.orig 2024-01-31 08:30:47 UTC +++ authvchkpw.c @@ -0,0 +1,242 @@ +/* @@ -243,7 +243,7 @@ +{ + return &authvchkpw_info; +} ---- authvchkpwlib.c.orig 2017-07-03 08:38:16 UTC +--- authvchkpwlib.c.orig 2024-01-31 08:30:47 UTC +++ authvchkpwlib.c @@ -0,0 +1,33 @@ +/* @@ -279,9 +279,9 @@ + if ((p=strchr(c, ':')) != 0) return (p); + return (0); +} ---- courier_auth_config.h.in.orig 2017-07-02 14:41:47 UTC +--- courier_auth_config.h.in.orig 2024-01-28 13:22:18 UTC +++ courier_auth_config.h.in -@@ -124,6 +124,9 @@ +@@ -121,6 +121,9 @@ /* Define to 1 if you have the `opendir' function. */ #undef HAVE_OPENDIR @@ -291,7 +291,7 @@ /* Define to 1 if you have the <Pam/pam_appl.h> header file. */ #undef HAVE_PAM_PAM_APPL_H -@@ -226,6 +229,9 @@ +@@ -223,6 +226,9 @@ /* Define to the shared archive member specification, say "(shr.o)". */ #undef LT_SHARED_LIB_MEMBER @@ -301,7 +301,7 @@ /* Whether we must a prototype for crypt() */ #undef NEED_CRYPT_PROTOTYPE ---- preauthvchkpw.c.orig 2017-07-03 08:38:16 UTC +--- preauthvchkpw.c.orig 2024-01-31 08:30:47 UTC +++ preauthvchkpw.c @@ -0,0 +1,159 @@ +/* @@ -463,18 +463,18 @@ + + return ((*callback)(&auth, arg)); +} ---- userdb/Makefile.in.orig 2016-06-23 12:29:59 UTC +--- userdb/Makefile.in.orig 2023-11-18 22:04:05 UTC +++ userdb/Makefile.in -@@ -107,7 +107,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cach +@@ -107,7 +107,7 @@ CONFIG_HEADER = config.h configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = userdb.pl makeuserdb pw2userdb +CONFIG_CLEAN_FILES = userdb.pl makeuserdb pw2userdb vchkpw2userdb CONFIG_CLEAN_VPATH_FILES = + PROGRAMS = $(noinst_PROGRAMS) LTLIBRARIES = $(noinst_LTLIBRARIES) - libuserdb_la_LIBADD = -@@ -222,6 +222,7 @@ CSCOPE = cscope +@@ -221,6 +221,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/conf AM_RECURSIVE_TARGETS = cscope am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/makeuserdb.in $(srcdir)/pw2userdb.in \ @@ -482,7 +482,7 @@ $(srcdir)/userdb.pl.in $(top_srcdir)/../compile \ $(top_srcdir)/../config.guess $(top_srcdir)/../config.sub \ $(top_srcdir)/../depcomp $(top_srcdir)/../install-sh \ -@@ -377,7 +378,7 @@ BUILT_SOURCES = makeuserdb.html.in makeuserdb.8.in \ +@@ -383,7 +384,7 @@ BUILT_SOURCES = makeuserdb.html.in makeuserdb.8.in \ userdb.html.in userdb.8.in \ userdbpw.html.in userdbpw.8.in @@ -491,7 +491,7 @@ noinst_DATA = makeuserdb.html userdb.html userdbpw.html userdbpw_SOURCES = userdbpw.c userdbpw_LDADD = libuserdb.la @HMACLIB@ @MD5LIB@ @SHA1LIB@ @CRYPTLIBS@ -@@ -444,6 +445,8 @@ userdb.pl: $(top_builddir)/config.status $(srcdir)/use +@@ -450,6 +451,8 @@ pw2userdb: $(top_builddir)/config.status $(srcdir)/pw2 makeuserdb: $(top_builddir)/config.status $(srcdir)/makeuserdb.in cd $(top_builddir) && $(SHELL) ./config.status $@ pw2userdb: $(top_builddir)/config.status $(srcdir)/pw2userdb.in @@ -499,10 +499,10 @@ +vchkpw2userdb: $(top_builddir)/config.status $(srcdir)/vchkpw2userdb.in cd $(top_builddir) && $(SHELL) ./config.status $@ - clean-noinstLTLIBRARIES: ---- userdb/configure.orig 2016-06-23 12:29:59 UTC + clean-noinstPROGRAMS: +--- userdb/configure.orig 2023-11-18 22:04:06 UTC +++ userdb/configure -@@ -12873,7 +12873,7 @@ else +@@ -13559,7 +13559,7 @@ fi fi @@ -511,7 +511,7 @@ cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure -@@ -13894,6 +13894,7 @@ do +@@ -14577,6 +14577,7 @@ do "userdb.pl") CONFIG_FILES="$CONFIG_FILES userdb.pl" ;; "makeuserdb") CONFIG_FILES="$CONFIG_FILES makeuserdb" ;; "pw2userdb") CONFIG_FILES="$CONFIG_FILES pw2userdb" ;; @@ -519,7 +519,7 @@ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac ---- userdb/vchkpw2userdb.in.orig 2017-07-03 08:38:16 UTC +--- userdb/vchkpw2userdb.in.orig 2024-01-31 08:30:47 UTC +++ userdb/vchkpw2userdb.in @@ -0,0 +1,80 @@ +#! @PERL@ diff --git a/security/courier-authlib/files/patch-configure b/security/courier-authlib/files/patch-configure index f0a7712d21c0..81a6cb164337 100644 --- a/security/courier-authlib/files/patch-configure +++ b/security/courier-authlib/files/patch-configure @@ -1,4 +1,4 @@ ---- configure.orig 2022-05-27 01:32:50 UTC +--- configure.orig 2024-01-28 13:22:04 UTC +++ configure @@ -669,6 +669,10 @@ LTLIBOBJS am__EXEEXT_FALSE @@ -21,7 +21,7 @@ LIBAUTHPWD LIBAUTHSHADOW SHADOWLIBS -@@ -1609,6 +1616,7 @@ Optional Packages: +@@ -1610,6 +1617,7 @@ Optional Packages: --with-authldaprc=filename Expect to find authldaprc here --without-authpwd Do not include the authpwd module --without-authshadow Do not include the authshadow module @@ -29,7 +29,7 @@ --with-authpgsqlrc=filename Expect to find authpgsql here --without-authpgsql Do not include the authpgsql module --with-pgsql-libs=DIR Look for pgsql libs in this dir -@@ -3492,7 +3500,7 @@ fi +@@ -3493,7 +3501,7 @@ fi fi fi @@ -38,7 +38,7 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 -@@ -19167,8 +19175,12 @@ then +@@ -19387,8 +19395,12 @@ then if test "$doauthuserdb" = "no" then @@ -51,7 +51,7 @@ AUTHUSERDB="authuserdb" LIBAUTHUSERDB="libauthuserdb.la" -@@ -19612,7 +19624,21 @@ fi +@@ -19832,7 +19844,21 @@ fi fi @@ -73,7 +73,7 @@ if test "$HAVE_LDAP" = 1; then HAVE_LDAP_TRUE= HAVE_LDAP_FALSE='#' -@@ -19817,6 +19843,256 @@ fi +@@ -20037,6 +20063,256 @@ fi @@ -330,7 +330,7 @@ # Check whether --with-authpgsqlrc was given. if test ${with_authpgsqlrc+y} then : -@@ -20170,8 +20446,8 @@ then +@@ -20390,8 +20666,8 @@ then SQLITE_LIBS="`pkg-config --libs sqlite3 2>/dev/null`" saveLIBS="$LIBS" LIBS="$SQLITE_LIBS $LIBS" @@ -341,7 +341,7 @@ then : doauthsqlite="yes" -@@ -20189,14 +20465,14 @@ else +@@ -20409,14 +20685,14 @@ else else saveLIBS="$LIBS" LIBS="$SQLITE_LIBS $LIBS" diff --git a/security/courier-authlib/files/patch-libs_liblock_locktest.c b/security/courier-authlib/files/patch-libs_liblock_locktest.c index a55b4bcfac39..987dc298bd6a 100644 --- a/security/courier-authlib/files/patch-libs_liblock_locktest.c +++ b/security/courier-authlib/files/patch-libs_liblock_locktest.c @@ -1,4 +1,4 @@ ---- libs/liblock/locktest.c.orig 2014-07-13 13:58:08 UTC +--- libs/liblock/locktest.c.orig 2022-11-25 10:00:03 UTC +++ libs/liblock/locktest.c @@ -3,6 +3,7 @@ ** distribution information. @@ -8,7 +8,7 @@ #include "liblock.h" #if USE_FCNTL #include "lockfcntl.c" -@@ -20,7 +21,7 @@ +@@ -27,7 +28,7 @@ int main() int main() { @@ -17,7 +17,7 @@ int fd[2]; pid_t p; int s; -@@ -29,7 +30,7 @@ int f; +@@ -36,7 +37,7 @@ int f; char *name; const char *tmpdir; if ((tmpdir = (char *)getenv("TMPDIR")) == NULL || !*tmpdir) @@ -26,7 +26,7 @@ if ((name=malloc(strlen(tmpdir)+sizeof(FILENAME)+1)) == NULL) { -@@ -37,7 +38,8 @@ int f; +@@ -44,7 +45,8 @@ int f; exit(1); } diff --git a/security/courier-authlib/files/patch-userdb__pw2userdb.in b/security/courier-authlib/files/patch-userdb__pw2userdb.in index 7cb79aa49b02..4f80616efa26 100644 --- a/security/courier-authlib/files/patch-userdb__pw2userdb.in +++ b/security/courier-authlib/files/patch-userdb__pw2userdb.in @@ -1,6 +1,6 @@ ---- userdb/pw2userdb.in.orig Wed Jul 19 13:55:15 2000 -+++ userdb/pw2userdb.in Tue Mar 1 21:58:51 2005 -@@ -7,6 +7,8 @@ +--- userdb/pw2userdb.in.orig 2013-08-25 18:57:38 UTC ++++ userdb/pw2userdb.in +@@ -6,6 +6,8 @@ # Copyright 1998 - 1999 Double Precision, Inc. See COPYING for # distribution information. @@ -9,7 +9,7 @@ use Getopt::Long; # -@@ -22,42 +24,66 @@ +@@ -21,42 +23,66 @@ $passwd="/etc/passwd" unless $passwd =~ /./; if $vpopuid; $passwd="/etc/passwd" unless $passwd =~ /./; @@ -27,36 +27,28 @@ - chop if /\n$/; - next if /^#/; - ($acct,$passwd,$uid,$gid,$name,$home,$shell)=split( /:/ ); -- ++ open(PASSWD, $shadow) || die "$!\n"; + - ($uid,$gid)=($fixed_uid,$fixed_gid) if $vpopuid; -- ++ while (<PASSWD>) ++ { ++ chop if /\n$/; ++ next if /^#/; ++ ($acct,$passwd,$uid,$gid,$class,$change,$expire,$name,$home,$shell)=split( /:/ ); + - $PASSWORD{$acct}=$passwd if $passwd ne "x"; - $UID{$acct}=$uid; - $GID{$acct}=$gid; - $HOME{$acct}=$home; - $SHELL{$acct}=$shell; -- ++ ($uid,$gid)=($fixed_uid,$fixed_gid) if $vpopuid; ++ $name =~ s/\|/./g; # Just in case + - $name =~ s/\|/./g; # Just in case - $GECOS{$acct}=$name; -} -close (PASSWD); -+ open(PASSWD, $shadow) || die "$!\n"; - --if ( -f $shadow && ! $noshadow) --{ -- open (SHADOW, $shadow) || die "$!\n"; -- while (<SHADOW>) -+ while (<PASSWD>) - { -+ chop if /\n$/; - next if /^#/; -- ($acct,$passwd,$dummy)=split(/:/); -+ ($acct,$passwd,$uid,$gid,$class,$change,$expire,$name,$home,$shell)=split( /:/ ); -+ -+ ($uid,$gid)=($fixed_uid,$fixed_gid) if $vpopuid; -+ $name =~ s/\|/./g; # Just in case -+ - $PASSWORD{$acct}=$passwd; ++ $PASSWORD{$acct}=$passwd; + $UID{$acct}=$uid; + $GID{$acct}=$gid; + $HOME{$acct}=$home; @@ -66,11 +58,17 @@ + close (PASSWD); +} else { + open(PASSWD, $passwd) || die "$!\n"; -+ + +-if ( -f $shadow && ! $noshadow) +-{ +- open (SHADOW, $shadow) || die "$!\n"; +- while (<SHADOW>) + while (<PASSWD>) -+ { + { + chop if /\n$/; -+ next if /^#/; + next if /^#/; +- ($acct,$passwd,$dummy)=split(/:/); +- $PASSWORD{$acct}=$passwd; + ($acct,$passwd,$uid,$gid,$name,$home,$shell)=split( /:/ ); + + ($uid,$gid)=($fixed_uid,$fixed_gid) if $vpopuid; @@ -83,7 +81,8 @@ + + $name =~ s/\|/./g; # Just in case + $GECOS{$acct}=$name; -+ } + } +- close (SHADOW); + close (PASSWD); + + if ( -f $shadow && ! $noshadow) @@ -97,8 +96,7 @@ + $PASSWORD{$acct}=$passwd; + } + close (SHADOW); - } -- close (SHADOW); ++ } } while ( defined ($key=each %UID)) diff --git a/security/courier-authlib/pkg-plist-base b/security/courier-authlib/pkg-plist-base index c1ff854632e2..f0d6ff73aa60 100644 --- a/security/courier-authlib/pkg-plist-base +++ b/security/courier-authlib/pkg-plist-base @@ -27,26 +27,26 @@ lib/courier-authlib/libauthpipe.so.0 lib/courier-authlib/libauthpipe.so.0.0.0 libexec/courier-authlib/authdaemond libexec/courier-authlib/authsystem.passwd -man/man1/authtest.1.gz -man/man1/courierlogger.1.gz -man/man3/auth_enumerate.3.gz -man/man3/auth_generic.3.gz -man/man3/auth_generic_meta.3.gz -man/man3/auth_getoption.3.gz -man/man3/auth_getuserinfo.3.gz -man/man3/auth_getuserinfo_meta.3.gz -man/man3/auth_login.3.gz -man/man3/auth_login_meta.3.gz -man/man3/auth_meta.3.gz -man/man3/auth_mkhomedir.3.gz -man/man3/auth_passwd.3.gz -man/man3/auth_sasl.3.gz -man/man3/auth_sasl_ex.3.gz -man/man3/authlib.3.gz sbin/authdaemond sbin/authenumerate sbin/authtest sbin/courierlogger +share/man/man1/authtest.1.gz +share/man/man1/courierlogger.1.gz +share/man/man3/auth_enumerate.3.gz +share/man/man3/auth_generic.3.gz +share/man/man3/auth_generic_meta.3.gz +share/man/man3/auth_getoption.3.gz +share/man/man3/auth_getuserinfo.3.gz +share/man/man3/auth_getuserinfo_meta.3.gz +share/man/man3/auth_login.3.gz +share/man/man3/auth_login_meta.3.gz +share/man/man3/auth_meta.3.gz +share/man/man3/auth_mkhomedir.3.gz +share/man/man3/auth_passwd.3.gz +share/man/man3/auth_sasl.3.gz +share/man/man3/auth_sasl_ex.3.gz +share/man/man3/authlib.3.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog diff --git a/security/courier-authlib/pkg-plist-userdb b/security/courier-authlib/pkg-plist-userdb index 052eee9eb728..51225d01d3e2 100644 --- a/security/courier-authlib/pkg-plist-userdb +++ b/security/courier-authlib/pkg-plist-userdb @@ -2,12 +2,12 @@ lib/courier-authlib/libauthuserdb.so lib/courier-authlib/libauthuserdb.so.0 lib/courier-authlib/libauthuserdb.so.0.0.0 libexec/courier-authlib/makedatprog -man/man8/makeuserdb.8.gz -man/man8/pw2userdb.8.gz -man/man8/userdb.8.gz -man/man8/userdbpw.8.gz sbin/makeuserdb sbin/pw2userdb sbin/userdb sbin/userdbpw sbin/vchkpw2userdb +share/man/man8/makeuserdb.8.gz +share/man/man8/pw2userdb.8.gz +share/man/man8/userdb.8.gz +share/man/man8/userdbpw.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401310958.40V9wDjE089473>