 @@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.31 2024/02/12 21:36:08 hans Exp $
+$NetBSD: distinfo,v 1.32 2024/03/16 14:23:15 tm Exp $
 BLAKE2s (courier-imap-5.2.6.tar.bz2) = 6cb868eaca36847cde3a8e5f0e3f763bb211570f0f7d7ddcad5adb285b24ceb3
 SHA512 (courier-imap-5.2.6.tar.bz2) = ee48ea5a5e043c3ce13027af2815ca07a1cba7d0ca328f8120ccc7f6134d18c610db202b2820c1dd589a427c1a3d096283c2f3fe9f9bd4815c9586dbe779d904
 Size (courier-imap-5.2.6.tar.bz2) = 3411210 bytes
-SHA1 (patch-aa) = 9a4a8dccb6a741fd3c31d81cc85856792d1e8c59
+SHA1 (patch-aa) = 8ac387e27517c0cc558a44e5ea3fd246fb3d3282
 SHA1 (patch-ad) = 1091c9a5991c746855db7fc4d3e2e744142b2e3c
 SHA1 (patch-ae) = 9d925f4639086af9f6faecd6a2fab2a9ecab670c
 SHA1 (patch-af) = 0fa0e0bd2f1908404f866de9358c74403615967f
 SHA1 (patch-ag) = 6ddd8b3f6a2cfbab4d814b51552dbf364384cf57
 SHA1 (patch-ah) = e81da45833698ff6da23de640efc322ce34cec0d
 SHA1 (patch-ak) = 3e40d53569b08e63bd7ca3876d0772544cd1d202
 SHA1 (patch-ao) = 8797dcc86822d3ef0bcd52ad4f1ea2c8ed23341d
 SHA1 (patch-makeimapaccess) = d04fce2070cf9cc8db34794846e4b61dec5d3779

 @@ -1,107 +1,108 @@
-$NetBSD: patch-aa,v 1.16 2024/02/12 21:36:09 hans Exp $
+$NetBSD: patch-aa,v 1.17 2024/03/16 14:23:16 tm Exp $
---- Makefile.in.orig	2023-04-25 02:26:35.000000000 +0000
+--- Makefile.in.orig	2023-11-23 21:11:57.000000000 +0000
 +++ Makefile.in
 @@ -416,19 +416,18 @@ SUBDIRS = libs/numlib libs/bdbobj libs/g
  	libs/maildir libs/makedat libs/libhmac \
  	libs/waitlib libs/tcpd libs/rootcerts libs/imap
 -sbin_SCRIPTS = sharedindexinstall sharedindexsplit
 +sbin_SCRIPTS =
  CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS)
  databindir = $(datadir)
 -databin_SCRIPTS = mkimapdcert mkpop3dcert mkdhparams
 -binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw \
 -	makeimapaccess makedat
+-
 -sbinPROGRAMS = imaplogin pop3login
 -libexecPROGRAMS = makedatprog couriertcpd
 +databin_SCRIPTS = makedat makeimapaccess mkimapdcert mkpop3dcert mkdhparams \
 +	imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
 +binPROGRAMS = imapd
 +sbinPROGRAMS =
 +libexecPROGRAMS = imaplogin courierpop3login courierpop3d makedatprog
  bin_PROGRAMS = @binPROGRAMS_exec@
  sbin_PROGRAMS = @sbinPROGRAMS_exec@
  libexec_PROGRAMS = @libexecPROGRAMS_exec@
 -man_MANS = couriertcpd.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkdhparams.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1 makeimapaccess.8
 +man_MANS = courierimapd.8 courierpop3d.8 mkimapdcert.8 mkpop3dcert.8
  # Copyright 2000 Double Precision, Inc.  See COPYING for
  # distribution information.
 @@ -443,9 +442,9 @@ EXTRA_DIST = README README.cygwin COPYIN
  	packaging/debian/rules packaging/debian/source/format \
  	sysconftool
  sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
 -	imapd.cnf pop3d.cnf quotawarnmsg.example
 +	imapd.cnf pop3d.cnf
 -libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
 +libexec_SCRIPTS =
  HTML2TXT = elinks -dump -no-numbering -no-references
+ #
 @@ -1384,11 +1383,11 @@ sharedindexinstall: libs/maildir/sharedi
  sharedindexsplit: libs/maildir/sharedindexsplit
  	cp libs/maildir/sharedindexsplit .
 -pop3login: libs/imap/pop3login
 -	cp libs/imap/pop3login .
 +courierpop3login: libs/imap/pop3login
 +	cp libs/imap/pop3login ./$@
 -pop3d: libs/imap/pop3d
 -	cp libs/imap/pop3d .
 +courierpop3d: libs/imap/pop3d
 +	cp libs/imap/pop3d ./$@
  makedat: libs/makedat/makedat
  	cp libs/makedat/makedat .
 @@ -1435,8 +1434,11 @@ maildiracl.1: libs/maildir/maildiracl.1
  maildirkw.1: libs/maildir/maildirkw.1
  	cp $(srcdir)/libs/maildir/maildirkw.1 .
 -imapd.8: libs/imap/imapd.8
 -	cp libs/imap/imapd.8 .
 +courierimapd.8: libs/imap/imapd.8
 +	cp libs/imap/imapd.8 ./$@
++
 +courierpop3d.8: libs/imap/courierpop3d.8
 +	cp libs/imap/courierpop3d.8 .
  mkdhparams: libs/imap/mkdhparams
  	cp libs/imap/mkdhparams .
 @@ -1471,22 +1473,16 @@ quotawarnmsg.example: libs/maildir/quota
  install-exec-local:
  	$(mkinstalldirs) $(DESTDIR)$(databindir)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
 -	test ! -x libs/tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
 -		libs/tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
  	$(mkinstalldirs) $(DESTDIR)$(sbindir)
  	for f in mkimapdcert mkpop3dcert mkdhparams; \
  		do rm -f $(DESTDIR)$(sbindir)/$$f ; \
- 		$(LN_S) `realpath --relative-to $(sbindir) -m $(databindir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
+-		$(LN_S) `realpath --relative-to $(sbindir) -m $(databindir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
 +		$(LN_S) `realpath $(DESTDIR)$(databindir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
 +	for f in imapd-ssl imapd pop3d pop3d-ssl; \
 +		do rm -f $(DESTDIR)$(sbindir)/$$f ; \
-+		$(LN_S) `realpath --relative-to $(sbindir) -m $(databindir)/$$f.rc` $(DESTDIR)$(sbindir)/$$f ; done
++		$(LN_S) `realpath $(DESTDIR)$(databindir)/$$f.rc` $(DESTDIR)$(sbindir)/$$f ; done
  	$(mkinstalldirs) $(DESTDIR)$(localstatedir)
  install-exec-hook:
 -	chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
 -	mkdir -p $(DESTDIR)$(sysconfdir)/shared
 -	chmod 755 $(DESTDIR)$(sysconfdir)/shared
 -	mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
 -	chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
 -	mkdir -p $(DESTDIR)$(sysconfdir)/imapaccess
 -	chmod 755 $(DESTDIR)$(sysconfdir)/imapaccess
  install-data-local: install-man
  	for f in $(man_MANS); do chmod a+r $(DESTDIR)$(mandir)/*/$$f; done
 @@ -1495,7 +1491,6 @@ install-data-local: install-man
  uninstall-local:
  	for f in mkimapdcert mkpop3dcert mkdhparams; \
  		do rm -f $(DESTDIR)$(sbindir)/$$f ; done
 -	rm -f $(DESTDIR)$(bindir)/couriertls
  dist-hook: courier-imap.spec
  	test -f $(srcdir)/rpm.release && cp $(srcdir)/rpm.release $(distdir) \