aboutsummaryrefslogtreecommitdiff
path: root/net-im/jabber/files
diff options
context:
space:
mode:
Diffstat (limited to 'net-im/jabber/files')
-rw-r--r--net-im/jabber/files/patch-jabberd-mio_tls.cc101
-rw-r--r--net-im/jabber/files/patch-man-Makefile.in9
-rw-r--r--net-im/jabber/files/pkg-deinstall.in1
-rw-r--r--net-im/jabber/files/pkg-install.in11
4 files changed, 110 insertions, 12 deletions
diff --git a/net-im/jabber/files/patch-jabberd-mio_tls.cc b/net-im/jabber/files/patch-jabberd-mio_tls.cc
index 12bc9f54aadd..1a945861ceb2 100644
--- a/net-im/jabber/files/patch-jabberd-mio_tls.cc
+++ b/net-im/jabber/files/patch-jabberd-mio_tls.cc
@@ -1,6 +1,14 @@
--- jabberd/mio_tls.cc.orig 2008-03-06 10:21:01.669677189 +0100
+++ jabberd/mio_tls.cc 2008-03-06 10:35:04.744064592 +0100
-@@ -612,7 +612,7 @@
+@@ -39,7 +39,6 @@
+ #include <set>
+ #include <string>
+ #include <sstream>
+-#include <gcrypt.h>
+ #include <vector>
+ #include <list>
+ #include <iostream>
+@@ -612,7 +611,7 @@
}
// load OpenPGP key/certificate
@@ -9,7 +17,7 @@
if (ret < 0) {
log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret));
continue;
-@@ -631,7 +631,7 @@
+@@ -631,7 +630,7 @@
}
// load the OpenPGP keyring
@@ -18,7 +26,7 @@
if (ret < 0) {
log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret));
continue;
-@@ -640,23 +640,6 @@
+@@ -640,23 +639,6 @@
continue;
}
@@ -42,3 +50,90 @@
// setup protocols to use
if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) {
char const *const protocols_data = xmlnode_get_data(cur);
+@@ -916,7 +898,7 @@
+ /* load asn1 tree to be used by libtasn1 */
+ ret = asn1_array2tree(subjectAltName_asn1_tab, &mio_tls_asn1_tree, NULL);
+ if (ret != ASN1_SUCCESS) {
+- std::cerr << "Error preparing the libtasn1 library: " << libtasn1_strerror(ret) << std::endl;
++ std::cerr << "Error preparing the libtasn1 library: " << asn1_strerror(ret) << std::endl;
+ return false;
+ /* XXX we have to delete the structure on shutdown using asn1_delete_structure(&mio_tls_asn1_tree) */
+ }
+@@ -1684,14 +1666,14 @@
+ /* init subjectAltName_element */
+ ret = asn1_create_element(mio_tls_asn1_tree, "PKIX1.SubjectAltName", &subjectAltName_element);
+ if (ret != ASN1_SUCCESS) {
+- log_warn(log_id.c_str(), "error creating asn1 element for PKIX1.SubjectAltName: %s (%s)", libtasn1_strerror(ret), cert_subject.c_str());
++ log_warn(log_id.c_str(), "error creating asn1 element for PKIX1.SubjectAltName: %s (%s)", asn1_strerror(ret), cert_subject.c_str());
+ break;
+ }
+
+ /* decode the extension */
+ ret = asn1_der_decoding(&subjectAltName_element, subjectAltName, subjectAltName_size, NULL);
+ if (ret != ASN1_SUCCESS) {
+- log_warn(log_id.c_str(), "error DER decoding subjectAltName extension: %s (%s)", libtasn1_strerror(ret), cert_subject.c_str());
++ log_warn(log_id.c_str(), "error DER decoding subjectAltName extension: %s (%s)", asn1_strerror(ret), cert_subject.c_str());
+ asn1_delete_structure(&subjectAltName_element);
+ break;
+ }
+@@ -1712,7 +1694,7 @@
+ break;
+ }
+ if (ret != ASN1_SUCCESS) {
+- log_notice(log_id.c_str(), "error accessing type for %s in subjectAltName: %s (%s)", cnt_string, libtasn1_strerror(ret), cert_subject.c_str());
++ log_notice(log_id.c_str(), "error accessing type for %s in subjectAltName: %s (%s)", cnt_string, asn1_strerror(ret), cert_subject.c_str());
+ break;
+ }
+
+@@ -1732,7 +1714,7 @@
+
+ ret = asn1_read_value(subjectAltName_element, access_string, dNSName, &dNSName_len);
+ if (ret != ASN1_SUCCESS) {
+- log_notice(log_id.c_str(), "error accessing %s in subjectAltName: %s (%s)", access_string, libtasn1_strerror(ret), cert_subject.c_str());
++ log_notice(log_id.c_str(), "error accessing %s in subjectAltName: %s (%s)", access_string, asn1_strerror(ret), cert_subject.c_str());
+ break;
+ }
+
+@@ -1772,7 +1754,7 @@
+ /* get the OID of the otherName */
+ ret = asn1_read_value(subjectAltName_element, access_string_type, otherNameType, &otherNameType_len);
+ if (ret != ASN1_SUCCESS) {
+- log_notice(log_id.c_str(), "error accessing type information %s in subjectAltName: %s (%s)", access_string_type, libtasn1_strerror(ret), cert_subject.c_str());
++ log_notice(log_id.c_str(), "error accessing type information %s in subjectAltName: %s (%s)", access_string_type, asn1_strerror(ret), cert_subject.c_str());
+ break;
+ }
+
+@@ -1785,7 +1767,7 @@
+ /* get the value of the otherName */
+ ret = asn1_read_value(subjectAltName_element, access_string_value, otherNameValue, &otherNameValue_len);
+ if (ret != ASN1_SUCCESS) {
+- log_notice(log_id.c_str(), "error accessing value of othername %s in subjectAltName: %s (%s)", access_string_value, libtasn1_strerror(ret), cert_subject.c_str());
++ log_notice(log_id.c_str(), "error accessing value of othername %s in subjectAltName: %s (%s)", access_string_value, asn1_strerror(ret), cert_subject.c_str());
+ break;
+ }
+
+@@ -1799,21 +1781,21 @@
+
+ ret = asn1_create_element(mio_tls_asn1_tree, "PKIX1.DirectoryString", &directoryString_element);
+ if (ret != ASN1_SUCCESS) {
+- log_notice(log_id.c_str(), "error creating DirectoryString element: %s (%s)", libtasn1_strerror(ret), cert_subject.c_str());
++ log_notice(log_id.c_str(), "error creating DirectoryString element: %s (%s)", asn1_strerror(ret), cert_subject.c_str());
+ asn1_delete_structure(&directoryString_element);
+ break;
+ }
+
+ ret = asn1_der_decoding(&directoryString_element, otherNameValue, otherNameValue_len, NULL);
+ if (ret != ASN1_SUCCESS) {
+- log_notice(log_id.c_str(), "error decoding DirectoryString: %s (%s)", libtasn1_strerror(ret), cert_subject.c_str());
++ log_notice(log_id.c_str(), "error decoding DirectoryString: %s (%s)", asn1_strerror(ret), cert_subject.c_str());
+ asn1_delete_structure(&directoryString_element);
+ break;
+ }
+
+ ret = asn1_read_value(directoryString_element, "utf8String", thisIdOnXMPPaddr, &thisIdOnXMPPaddr_len);
+ if (ret != ASN1_SUCCESS) {
+- log_notice(log_id.c_str(), "error accessing utf8String of DirectoryString: %s (%s)", libtasn1_strerror(ret), cert_subject.c_str());
++ log_notice(log_id.c_str(), "error accessing utf8String of DirectoryString: %s (%s)", asn1_strerror(ret), cert_subject.c_str());
+ asn1_delete_structure(&directoryString_element);
+ break;
+ }
diff --git a/net-im/jabber/files/patch-man-Makefile.in b/net-im/jabber/files/patch-man-Makefile.in
index 6a433ef56bfd..315abac1331b 100644
--- a/net-im/jabber/files/patch-man-Makefile.in
+++ b/net-im/jabber/files/patch-man-Makefile.in
@@ -11,12 +11,3 @@
edit = sed \
-e 's,\@sysconfdir\@,$(sysconfdir),g' \
-e 's,\@VERSION\@,$(VERSION),g'
-@@ -387,7 +387,7 @@
-
- info-am:
-
--install-data-am: install-man
-+install-data-am:
-
- install-exec-am:
-
diff --git a/net-im/jabber/files/pkg-deinstall.in b/net-im/jabber/files/pkg-deinstall.in
index 274d53a37749..93c63ae9f7f8 100644
--- a/net-im/jabber/files/pkg-deinstall.in
+++ b/net-im/jabber/files/pkg-deinstall.in
@@ -8,6 +8,7 @@ USER=%%JABBER_USER%%
GROUP=%%JABBER_GROUP%%
RUNDIR="%%JABBER_RUNDIR%%"
SPOOLDIR="%%JABBER_SPOOLDIR%%"
+LOGDIR="%%LOGDIR%%"
if pw usershow "${USER}" 2>/dev/null 1>&2; then
echo "To delete Jabber user permanently, use 'pw userdel ${USER}'"
diff --git a/net-im/jabber/files/pkg-install.in b/net-im/jabber/files/pkg-install.in
index 2a7c130c1be1..d07e0e8e732a 100644
--- a/net-im/jabber/files/pkg-install.in
+++ b/net-im/jabber/files/pkg-install.in
@@ -11,6 +11,7 @@ GID=%%JABBER_GID%%
ETCDIR=%%JABBER_ETCDIR%%
RUNDIR=%%JABBER_RUNDIR%%
SPOOLDIR=%%JABBER_SPOOLDIR%%
+LOGDIR=%%JABBER_LOGDIR%%
if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
if pw groupadd ${GROUP} -g ${GID}; then
@@ -47,6 +48,16 @@ if [ ! -d ${SPOOLDIR} ]; then
mkdir -p ${SPOOLDIR}
fi
+if [ ! -d ${SPOOLDIR} ]; then
+ echo "Creating \"${SPOOLDIR}\"."
+ mkdir -p ${SPOOLDIR}
+fi
+
+if [ ! -d ${LOGDIR} ]; then
+ echo "Creating \"${LOGDIR}\"."
+ mkdir -p ${LOGDIR}
+fi
+
echo "Fixing ownerships and modes in \"${SPOOLDIR}\"."
chown -R ${USER}:${GROUP} ${SPOOLDIR}
chmod -R go= ${SPOOLDIR}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-07 01:28:26 +0000