CVS commit: pkgsrc/security/dropbear

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun May  4 13:17:39 UTC 2025

Modified Files:
        pkgsrc/security/dropbear: Makefile distinfo
        pkgsrc/security/dropbear/patches: patch-src_default__options.h
Added Files:
        pkgsrc/security/dropbear: options.mk
        pkgsrc/security/dropbear/files: dropbear.sh

Log Message:
dropbear: Various packaging improvements.

- Add rc script.
- Fix support for PKG_SYSCONFDIR.
- Move PKG_OPITONS into options.mk.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/security/dropbear/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/security/dropbear/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/dropbear/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/security/dropbear/files/dropbear.sh
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/security/dropbear/patches/patch-src_default__options.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/dropbear/Makefile
diff -u pkgsrc/security/dropbear/Makefile:1.43 pkgsrc/security/dropbear/Makefile:1.44
--- pkgsrc/security/dropbear/Makefile:1.43      Thu Mar  6 11:53:50 2025
+++ pkgsrc/security/dropbear/Makefile   Sun May  4 13:17:38 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2025/03/06 11:53:50 adam Exp $
+# $NetBSD: Makefile,v 1.44 2025/05/04 13:17:38 nia Exp $
 
 DISTNAME=      dropbear-2025.87
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  https://matt.ucc.asn.au/dropbear/releases/
 EXTRACT_SUFX=  .tar.bz2
@@ -14,33 +15,6 @@ GNU_CONFIGURE=               yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR} --disable-bundled-libtom
 USE_TOOLS+=            gmake
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.dropbear
-PKG_SUPPORTED_OPTIONS= pam
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mpam)
-.  include "../../mk/pam.buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-pam
-SUBST_CLASSES+=                pam
-SUBST_MESSAGE.pam=     Enabling PAM in options.h
-SUBST_STAGE.pam=       pre-configure
-SUBST_FILES.pam=       options.h
-SUBST_SED.pam=         -e "s/ENABLE_SVR_PASSWORD_AUTH/ENABLE_SVR_PAM_AUTH/"
-.endif
-
-OWN_DIRS+=             ${PKG_SYSCONFDIR}/dropbear
-
-SUBST_CLASSES+=                config
-SUBST_MESSAGE.config=  Fixing path to config directory.
-SUBST_STAGE.config=    post-build
-SUBST_FILES.config=    manpages/dropbear.8 manpages/dropbearkey.1
-SUBST_SED.config=      -e "s,/etc/dropbear/,"${PKG_SYSCONFDIR}"/dropbear/,g"
-
-# needed by dbscp
-CPPFLAGS+=             -DDROPBEAR_PATH_SSH_PROGRAM="\"${PREFIX}/bin/dbclient\""
-
 .include "../../x11/xauth/builtin.mk"
 
 CPPFLAGS+=             -DXAUTH_COMMAND="\"${XAUTHBASE}/bin/xauth\""
@@ -50,9 +24,29 @@ LDFLAGS.SunOS+=              -lsocket -lnsl
 
 BUILD_TARGET=          all scp
 
+PKG_SYSCONFSUBDIR=     dropbear
+
+RCD_SCRIPTS+=          dropbear
+
+OWN_DIRS+=             ${PKG_SYSCONFDIR}
+
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_MESSAGE.paths=   Fixing absolute paths.
+SUBST_FILES.paths=     src/default_options.h
+SUBST_VARS.paths=      PKG_SYSCONFDIR
+SUBST_VARS.paths+=     PREFIX
+
+SUBST_CLASSES+=                config
+SUBST_MESSAGE.config=  Fixing path to config directory.
+SUBST_STAGE.config=    post-build
+SUBST_FILES.config=    manpages/dropbear.8 manpages/dropbearkey.1
+SUBST_SED.config=      -e "s,/etc/dropbear/,${PKG_SYSCONFDIR:Q},g"
+
 post-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/scp ${DESTDIR}${PREFIX}/bin/dbscp
 
+.include "options.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../math/ltm/buildlink3.mk"
 .include "../../security/libtomcrypt/buildlink3.mk"

Index: pkgsrc/security/dropbear/distinfo
diff -u pkgsrc/security/dropbear/distinfo:1.35 pkgsrc/security/dropbear/distinfo:1.36
--- pkgsrc/security/dropbear/distinfo:1.35      Thu Mar  6 11:53:50 2025
+++ pkgsrc/security/dropbear/distinfo   Sun May  4 13:17:38 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.35 2025/03/06 11:53:50 adam Exp $
+$NetBSD: distinfo,v 1.36 2025/05/04 13:17:38 nia Exp $
 
 BLAKE2s (dropbear-2025.87.tar.bz2) = b31ac4f3febd9eb9bfb981c75fcdc2edb3794d86db0d7d25c3f3614b259c5ac5
 SHA512 (dropbear-2025.87.tar.bz2) = afe30b2c795c21ba76d0e4f7b95d9f61ca0ce31510c5fd5183feef2984b49122ccb600c5eae8ac05d9c3cf6bb6237f760cfcf4f7c546656f555e46e992d1efeb
 Size (dropbear-2025.87.tar.bz2) = 2368085 bytes
 SHA1 (patch-Makefile.in) = 0bb649ed8688666513c35e139e7e349fd83b3a1b
 SHA1 (patch-configure) = b17f647043b212adda53aad7fb8dc7e639be9494
-SHA1 (patch-src_default__options.h) = af60ea91516639e055266b3dd74f100aa6100f0d
+SHA1 (patch-src_default__options.h) = c0be06f186a4fb07ad0aedc26047f7077847e75a

Index: pkgsrc/security/dropbear/patches/patch-src_default__options.h
diff -u pkgsrc/security/dropbear/patches/patch-src_default__options.h:1.1 pkgsrc/security/dropbear/patches/patch-src_default__options.h:1.2
--- pkgsrc/security/dropbear/patches/patch-src_default__options.h:1.1   Thu Apr  4 12:13:28 2024
+++ pkgsrc/security/dropbear/patches/patch-src_default__options.h       Sun May  4 13:17:39 2025
@@ -1,16 +1,30 @@
-$NetBSD: patch-src_default__options.h,v 1.1 2024/04/04 12:13:28 wiz Exp $
+$NetBSD: patch-src_default__options.h,v 1.2 2025/05/04 13:17:39 nia Exp $
 
-comment out the path to the dropbear ssh client
-- this is passed through CFLAGS
+Fix hardcoded paths.
 
---- src/default_options.h.orig 2024-04-04 14:30:00.000000000 +0000
+--- src/default_options.h.orig 2025-03-05 14:30:00.000000000 +0000
 +++ src/default_options.h
-@@ -324,7 +324,7 @@ group1 in Dropbear server too */
+@@ -23,10 +23,10 @@ IMPORTANT: Some options will require "ma
+ /* Default hostkey paths - these can be specified on the command line.
+  * Homedir is prepended if path begins with ~/
+  */
+-#define DSS_PRIV_FILENAME "/etc/dropbear/dropbear_dss_host_key"
+-#define RSA_PRIV_FILENAME "/etc/dropbear/dropbear_rsa_host_key"
+-#define ECDSA_PRIV_FILENAME "/etc/dropbear/dropbear_ecdsa_host_key"
+-#define ED25519_PRIV_FILENAME "/etc/dropbear/dropbear_ed25519_host_key"
++#define DSS_PRIV_FILENAME "@PKG_SYSCONFDIR@/dropbear_dss_host_key"
++#define RSA_PRIV_FILENAME "@PKG_SYSCONFDIR@/dropbear_rsa_host_key"
++#define ECDSA_PRIV_FILENAME "@PKG_SYSCONFDIR@/dropbear_ecdsa_host_key"
++#define ED25519_PRIV_FILENAME "@PKG_SYSCONFDIR@/dropbear_ed25519_host_key"
+ 
+ /* Set NON_INETD_MODE if you require daemon functionality (ie Dropbear listens
+  * on chosen ports and keeps accepting connections. This is the default.
+@@ -330,7 +330,7 @@ group1 in Dropbear server too */
  
  /* This is used by the scp binary when used as a client binary. If you're
   * not using the Dropbear client, you'll need to change it */
 -#define DROPBEAR_PATH_SSH_PROGRAM "/usr/bin/dbclient"
-+/*#define DROPBEAR_PATH_SSH_PROGRAM "/usr/bin/dbclient"*/
++#define DROPBEAR_PATH_SSH_PROGRAM "@PREFIX@/bin/dbclient"
  
  /* Whether to log commands executed by a client. This only logs the
   * (single) command sent to the server, not what a user did in a

Added files:

Index: pkgsrc/security/dropbear/options.mk
diff -u /dev/null pkgsrc/security/dropbear/options.mk:1.1
--- /dev/null   Sun May  4 13:17:39 2025
+++ pkgsrc/security/dropbear/options.mk Sun May  4 13:17:38 2025
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2025/05/04 13:17:38 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.dropbear
+PKG_SUPPORTED_OPTIONS= pam
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpam)
+.  include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-pam
+SUBST_CLASSES+=                pam
+SUBST_MESSAGE.pam=     Enabling PAM in options.h
+SUBST_STAGE.pam=       pre-configure
+SUBST_FILES.pam=       options.h
+SUBST_SED.pam=         -e "s/ENABLE_SVR_PASSWORD_AUTH/ENABLE_SVR_PAM_AUTH/"
+.endif

Index: pkgsrc/security/dropbear/files/dropbear.sh
diff -u /dev/null pkgsrc/security/dropbear/files/dropbear.sh:1.1
--- /dev/null   Sun May  4 13:17:39 2025
+++ pkgsrc/security/dropbear/files/dropbear.sh  Sun May  4 13:17:38 2025
@@ -0,0 +1,25 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: dropbear.sh,v 1.1 2025/05/04 13:17:38 nia Exp $
+#
+# PROVIDE: dropbear
+# REQUIRE: DAEMON
+
+if [ -f /etc/rc.subr ]; then
+        . /etc/rc.subr
+fi
+
+name="dropbear"
+rcvar=$name
+command="@PREFIX@/sbin/dropbear"
+command_args="${command_args} -R"
+command_args="${command_args} -P @VARBASE@/run/dropbear.pid"
+pidfile="@VARBASE@/run/dropbear.pid"
+
+if [ -f /etc/rc.subr ]; then
+       load_rc_config $name
+       run_rc_command "$1"
+else
+       @ECHO@ -n " ${name}"
+       ${command} ${dropbear_flags} ${command_args}
+fi