pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/chat/quassel
Module Name: pkgsrc
Committed By: wiz
Date: Tue May 13 14:49:27 UTC 2025
Modified Files:
pkgsrc/chat/quassel: Makefile distinfo
Added Files:
pkgsrc/chat/quassel/files: quasselcore.sh
pkgsrc/chat/quassel/patches: patch-CMakeLists.txt
Log Message:
chat/quassel: add rc.d script to quasselcore
Add patch to send only warning when check SSL support of Qt5,
instead of error. Qt5 of pkgsrc has SSL support, but
quassel can't detect at configure time.
Convert to cmake/build.mk.
>From Robert Bagdan on tech-pkg.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/chat/quassel/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/chat/quassel/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/quassel/files/quasselcore.sh
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/quassel/patches/patch-CMakeLists.txt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/chat/quassel/Makefile
diff -u pkgsrc/chat/quassel/Makefile:1.48 pkgsrc/chat/quassel/Makefile:1.49
--- pkgsrc/chat/quassel/Makefile:1.48 Thu Apr 24 14:13:22 2025
+++ pkgsrc/chat/quassel/Makefile Tue May 13 14:49:26 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2025/04/24 14:13:22 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2025/05/13 14:49:26 wiz Exp $
DISTNAME= quassel-0.14.0
-PKGREVISION= 23
+PKGREVISION= 24
CATEGORIES= chat
MASTER_SITES= https://quassel-irc.org/pub/
EXTRACT_SUFX= .tar.bz2
@@ -12,7 +12,6 @@ COMMENT= Modern, cross-platform, distrib
LICENSE= gnu-gpl-v2 OR gnu-gpl-v3
USE_TOOLS+= bash perl
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_CXX_FEATURES+= c++14
@@ -25,7 +24,24 @@ REPLACE_PERL+= data/scripts/mpris
LDFLAGS.SunOS+= -lsocket -lnsl
+.include "../../mk/bsd.prefs.mk"
+RCD_SCRIPTS= quasselcore
+
+.if ${INIT_SYSTEM} == "rc.d"
+DEPENDS+= daemonize-[0-9]*:../../sysutils/daemonize
+.endif
+
+QUASSELCORE_USER?= quasselcore
+QUASSELCORE_GROUP?= quasselcore
+PKG_GROUPS= ${QUASSELCORE_GROUP}
+PKG_USERS= ${QUASSELCORE_USER}:${QUASSELCORE_GROUP}
+PKG_GROUPS_VARS= QUASSELCORE_GROUP
+PKG_USERS_VARS= QUASSELCORE_USER
+FILES_SUBST+= QUASSELCORE_USER=${QUASSELCORE_USER}
+FILES_SUBST+= QUASSELCORE_GROUP=${QUASSELCORE_GROUP}
+
.include "options.mk"
+.include "../../devel/cmake/build.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../databases/openldap-client/buildlink3.mk"
Index: pkgsrc/chat/quassel/distinfo
diff -u pkgsrc/chat/quassel/distinfo:1.5 pkgsrc/chat/quassel/distinfo:1.6
--- pkgsrc/chat/quassel/distinfo:1.5 Sat Mar 5 10:32:10 2022
+++ pkgsrc/chat/quassel/distinfo Tue May 13 14:49:26 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2022/03/05 10:32:10 nia Exp $
+$NetBSD: distinfo,v 1.6 2025/05/13 14:49:26 wiz Exp $
BLAKE2s (quassel-0.14.0.tar.bz2) = 047dd940bdc2ba65ded12ae82572a748b95d61e79e9880e9dd64786ec10e67cb
SHA512 (quassel-0.14.0.tar.bz2) = ea6b9723acab5ce73f760692770c1340c03bf277d2c99a2520345bfb6a7bb6fdc64a01dccfd7026341b46ee727821e1bcc2f487be72dfbc155f1de1ad264763f
Size (quassel-0.14.0.tar.bz2) = 4774297 bytes
+SHA1 (patch-CMakeLists.txt) = d42753c94064d72c59077c520978fc2cfbeea2c2
Added files:
Index: pkgsrc/chat/quassel/files/quasselcore.sh
diff -u /dev/null pkgsrc/chat/quassel/files/quasselcore.sh:1.1
--- /dev/null Tue May 13 14:49:27 2025
+++ pkgsrc/chat/quassel/files/quasselcore.sh Tue May 13 14:49:26 2025
@@ -0,0 +1,63 @@
+#!@RCD_SCRIPTS_SHELL@
+
+# PROVIDE: quasselcore
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+# User-settable rc.conf variables and their default values:
+: ${quasselcore_data:="@VARBASE@/db/quasselcore"}
+: ${quasselcore_log:="@VARBASE@/log/quasselcore.log"}
+: ${quasselcore_listen:="0.0.0.0,::"}
+: ${quasselcore_args:="--configdir=${quasselcore_data} --logfile=${quasselcore_log} --listen=${quasselcore_listen}"}
+: ${quasselcore_user:="@QUASSELCORE_USER@"}
+: ${quasselcore_group:="@QUASSELCORE_GROUP@"}
+
+name="quasselcore"
+rcvar="${name}"
+pidfile="@VARBASE@/run/${name}/${name}.pid"
+command="@PREFIX@/sbin/daemonize"
+procname="@PREFIX@/bin/${name}"
+command_args="${command_args} -p ${pidfile}"
+command_args="${command_args} ${procname} ${quasselcore_args}"
+start_precmd="${name}_prestart"
+keygen_cmd="${name}_keygen"
+extra_commands="keygen"
+
+quasselcore_keygen()
+{
+ cat > /tmp/.mkcert.cfg <<EOT
+[req]
+distinguished_name = req_distinguished_name
+prompt = no
+[req_distinguished_name]
+countryName = VA
+stateOrProvinceName = Valinor
+localityName = Valimar
+organizationName = Valimar Industry Ltd
+EOT
+ openssl req -config /tmp/.mkcert.cfg \
+ -x509 -nodes -days 365 -newkey rsa:4096 \
+ -keyout "${quasselcore_data}/quasselCert.pem" \
+ -out "${quasselcore_data}/quasselCert.pem"
+ chown ${quasselcore_user}:${quasselcore_group} "${quasselcore_data}/quasselCert.pem"
+ chmod 400 "${quasselcore_data}/quasselCert.pem"
+ rm -f /tmp/.mkcert.cfg
+}
+
+uasselcore_prestart()
+{
+ install -d -o ${quasselcore_user} -g ${quasselcore_group} ${quasselcore_data}
+ install -d -o ${quasselcore_user} -g ${quasselcore_group} @VARBASE@/run/${name}
+
+ if [ ! -f "${quasselcore_log}" ]; then
+ install -o ${quasselcore_user} -g ${quasselcore_group} /dev/null ${quasselcore_log}
+ fi
+ if [ ! -f "${quasselcore_data}/quasselCert.pem" ]; then
+ quasselcore_keygen
+ fi
+}
+
+load_rc_config ${name}
+run_rc_command "$1"
Index: pkgsrc/chat/quassel/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/chat/quassel/patches/patch-CMakeLists.txt:1.1
--- /dev/null Tue May 13 14:49:27 2025
+++ pkgsrc/chat/quassel/patches/patch-CMakeLists.txt Tue May 13 14:49:26 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2025/05/13 14:49:26 wiz Exp $
+
+* Qt5 of pkgsrc has SSL support, but cmake can't detect
+
+--- CMakeLists.txt.orig 2022-01-01 17:11:21.000000000 +0000
++++ CMakeLists.txt
+@@ -223,7 +223,7 @@ check_cxx_source_compiles("
+ cmake_pop_check_state()
+
+ if (NOT HAVE_SSL)
+- message(FATAL_ERROR "Quassel requires SSL support, but Qt is built with QT_NO_SSL")
++ message(WARNING "Quassel requires SSL support, but maybe Qt is built with QT_NO_SSL")
+ endif()
+
+ # Optional Qt components
Home |
Main Index |
Thread Index |
Old Index