security/kc: update to 2.5.1

kc24 was a transient port to easy the migration of the database. Later on, the
original kc port was obsoleted. Rename kc24 to kc to match upstream again and
update to latest version.

PR:		268842
Reported by:	leva@ecentrum.hu (maintainer)

8 files changed, 49 insertions, 57 deletions

diff --git a/MOVED b/MOVED
index d9b23af6881b..0ca2b70361da 100644
--- a/MOVED
+++ b/MOVED
@@ -11524,7 +11524,6 @@ www/qupzilla-qt5|www/falkon|2019-03-03|Has expired: Project continues as www/fal
 databases/puppetdb-terminus4|databases/puppetdb-terminus5|2019-03-03|Has expired: Puppet 4 has reached EOL
 sysutils/bacula-client|sysutils/bacula9-client|2019-03-03|Has expired: Unsupported. Please migrate to bacula9-server
 net-mgmt/nagios-check_bacula|net-mgmt/nagios-check_bacula9|2019-03-03|Has expired: Unsupported. Please migrate to bacula9-server
-security/kc|security/kc24|2019-03-03|Has expired: Versions 2.4.x use incompatible database format
 sysutils/bacula-server|sysutils/bacula9-server|2019-03-03|Has expired: Unsupported. Please migrate to bacula9-server
 sysutils/bacula-docs|sysutils/bacula9-docs|2019-03-03|Has expired: Unsupported. Please migrate to bacula9-docs
 sysutils/bacula-client-static|sysutils/bacula9-client-static|2019-03-03|Has expired: Unsupported. Please migrate to bacula9-server
@@ -17749,3 +17748,4 @@ math/cvc4|math/cvc5|2023-01-03|CVC4 was succeeded by CVC5
 math/cvc3|math/cvc5|2023-01-04|CVC3 was succeeded by CVC4 and CVC5
 devel/caf|devel/actor-framework|2023-01-08|Merge duplicates into devel/actor-framework that is a full software name
 net/nebula|security/nebula|2023-01-09|Remove duplicate
+security/kc24|security/kc|2023-01-13|kc24 was a transient package to easy database migration. Rename to original name
diff --git a/security/Makefile b/security/Makefile
index 4b9bfef1c6db..a45295338dd3 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -238,7 +238,7 @@
     SUBDIR += isnprober
     SUBDIR += john
     SUBDIR += kbfsd
-    SUBDIR += kc24
+    SUBDIR += kc
     SUBDIR += kdbxviewer
     SUBDIR += keepass
     SUBDIR += keepass-plugin-keepassrpc
diff --git a/security/kc24/Makefile b/security/kc/Makefile
index 83ae5e69473c..7a66d8ac03cf 100644
--- a/security/kc24/Makefile
+++ b/security/kc/Makefile
@@ -1,19 +1,17 @@
 PORTNAME=		kc
-PORTVERSION=		2.4.2
-PORTREVISION=	3
+PORTVERSION=		2.5.1
 CATEGORIES=		security
-PKGNAMESUFFIX=		24
 
 MAINTAINER=		leva@ecentrum.hu
 COMMENT=		Console based password storing application
-WWW=		https://github.com/levaidaniel/kc
+WWW=			https://github.com/levaidaniel/kc
 
 LICENSE=		BSD2CLAUSE
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
 LIB_DEPENDS=		libxml2.so:textproc/libxml2
 
-CONFLICTS=		kc
+CONFLICTS=		kc24
 
 OPTIONS_DEFINE=		PCRE SCRYPT
 OPTIONS_DEFAULT=	PCRE SCRYPT LIBEDIT
@@ -35,11 +33,15 @@ USES+=			pkgconfig ncurses ssl uidfix
 USE_GITHUB=		yes
 GH_ACCOUNT=		levaidaniel
 
-PLIST_FILES=		bin/kc man/man1/kc.1.gz
+PLIST_FILES=		bin/kc man/man1/kc.1.gz share/doc/kc/Changelog.md
 
 MAKE_ENV+=		BUNDLED_BCRYPT=y
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lncursesw|${NCURSESLIBS}|' ${WRKSRC}/Makefile
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/Changelog.md ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/security/kc/distinfo b/security/kc/distinfo
new file mode 100644
index 000000000000..adb38bbb908c
--- /dev/null
+++ b/security/kc/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1673275855
+SHA256 (levaidaniel-kc-2.5.1_GH0.tar.gz) = d0265da21986c261bd1502b313540bfe991af8b97e44a7296d822fe0e2e0a632
+SIZE (levaidaniel-kc-2.5.1_GH0.tar.gz) = 100143
diff --git a/security/kc24/pkg-descr b/security/kc/pkg-descr
index 091a4b70f512..091a4b70f512 100644
--- a/security/kc24/pkg-descr
+++ b/security/kc/pkg-descr
diff --git a/security/kc/pkg-message b/security/kc/pkg-message
new file mode 100644
index 000000000000..c08487d3e962
--- /dev/null
+++ b/security/kc/pkg-message
@@ -0,0 +1,36 @@
+[
+{ type: install
+  message: <<EOM
+Please read ${PREFIX}/share/doc/kc/Changelog.md to see why you might not be able to open your database anymore.
+
+Example:
+
+Running v2.5, creating a new then importing a v2.4 database that was using the default settings (sha512 KDF, aes256 cipher, cbc mode):
+
+$ kc
+Creating 'default.kcd'
+Using 'default.kcd' database.
+New password (empty to cancel):
+New password again (empty to cancel):
+Initializing...
+Database file: default.kcd (default.kcd)
+XML structure size: 148 bytes
+Security key(s): no
+Password: yes
+SSH agent: no
+Password function: sha512 (100000 iterations)
+Encryption: aes256, cbc
+Read-only: no
+Modified: yes
+<default% > import -o -R 5000 -k passwords.kcd
+Reading database...
+Opening 'passwords.kcd'
+Password:
+Decrypting...
+Checking database...
+Counting keys and keychains...
+Import finished.
+<passwords% >
+EOM
+}
+]
diff --git a/security/kc24/distinfo b/security/kc24/distinfo
deleted file mode 100644
index fcf8f86e845c..000000000000
--- a/security/kc24/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1524229681
-SHA256 (levaidaniel-kc-2.4.2_GH0.tar.gz) = ba769f9b7de4fa544bcd84fc9e94541aaa89cb8efb108579d96b68ee8015f43f
-SIZE (levaidaniel-kc-2.4.2_GH0.tar.gz) = 75286
diff --git a/security/kc24/pkg-message b/security/kc24/pkg-message
deleted file mode 100644
index 173f59337945..000000000000
--- a/security/kc24/pkg-message
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-IMPORTANT:
-kc v2.4 has introduced a new database file format that is incompatible
-with the older one (<2.4).
-
-Dump all your data to files before upgrading to version 2.4 and re-import:
-
-1) Dump the old database with the old version of kc:
-
-$ kc -k ~/.kc/default.kcd
-Password:
-<example_chain% > dump kcdump
-Dump OK
-<example_chain% > quit
-$ ls kcdump.xml
-kcdump.xml
-
-2) Make a backup, just in case
-
-$ mv ~/.kc/default.kcd ~/.kc/default.kcd-backup
-
-3) Upgrade kc to version 2.4
-
-4) Create a new, empty database file and import the dump
-
-$ kc
-Creating '~/.kc/default.kcd'
-Using '~/.kc/default.kcd' database.
-New password (empty to cancel):
-New password again (empty to cancel):
-<default% > importxml -k kcdump.xml
-Import OK
-<example_chain% > write
-Save OK
-<example_chain% > quit
-
-5) Test if the import is ok
-
-6) Remove the dump
-
-rm -P kcdump.xml
-EOM
-}
-]