summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/bacula-doc/Makefile4
-rw-r--r--sysutils/bacula-doc/PLIST5
-rw-r--r--sysutils/bacula-doc/distinfo8
-rw-r--r--sysutils/bacula/Makefile.common4
-rw-r--r--sysutils/bacula/distinfo16
-rw-r--r--sysutils/bacula/patches/patch-ab42
-rw-r--r--sysutils/bacula/patches/patch-ad16
-rw-r--r--sysutils/bacula/patches/patch-an6
-rw-r--r--sysutils/bacula/patches/patch-ao8
-rw-r--r--sysutils/bacula/patches/patch-ap6
10 files changed, 28 insertions, 87 deletions
diff --git a/sysutils/bacula-doc/Makefile b/sysutils/bacula-doc/Makefile
index d233331f117..e85f4c97f44 100644
--- a/sysutils/bacula-doc/Makefile
+++ b/sysutils/bacula-doc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2010/03/09 07:06:00 adam Exp $
+# $NetBSD: Makefile,v 1.24 2010/05/08 09:05:47 adam Exp $
-DISTNAME= bacula-docs-5.0.1
+DISTNAME= bacula-docs-5.0.2
PKGNAME= ${DISTNAME:S/docs/doc/}
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/}
diff --git a/sysutils/bacula-doc/PLIST b/sysutils/bacula-doc/PLIST
index 25330e570e0..36e9ec2b933 100644
--- a/sysutils/bacula-doc/PLIST
+++ b/sysutils/bacula-doc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2010/03/09 07:06:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2010/05/08 09:05:47 adam Exp $
share/doc/bacula/console/About_this_document.html
share/doc/bacula/console/Bacula_Console.html
share/doc/bacula/console/Bacula_Console_Operators_Gu.html
@@ -86,6 +86,7 @@ share/doc/bacula/developers/Save_Protocol_Between_File.html
share/doc/bacula/developers/Sequence_Creation_Records_S.html
share/doc/bacula/developers/Serialization.html
share/doc/bacula/developers/Session_Label.html
+share/doc/bacula/developers/Setting_up_Regession_Testin.html
share/doc/bacula/developers/Smart_Memory_Allocation.html
share/doc/bacula/developers/Step_Step_Modifying_Bacula.html
share/doc/bacula/developers/Steps_Take_Porting.html
@@ -169,6 +170,7 @@ share/doc/bacula/main/New_Features_in_3_0_0.html
share/doc/bacula/main/New_Features_in_5_0_0.html
share/doc/bacula/main/New_Features_in_5_0_1.html
share/doc/bacula/main/New_Features_in_Released.html
+share/doc/bacula/main/Release_Version_5_0_2.html
share/doc/bacula/main/Released_Version_3_0_3_3_0_.html
share/doc/bacula/main/Restore_Command.html
share/doc/bacula/main/Storage_Daemon_Configuratio.html
@@ -221,7 +223,6 @@ share/doc/bacula/main/img38.png
share/doc/bacula/main/img39.png
share/doc/bacula/main/img4.png
share/doc/bacula/main/img40.png
-share/doc/bacula/main/img41.png
share/doc/bacula/main/img5.png
share/doc/bacula/main/img6.png
share/doc/bacula/main/img7.png
diff --git a/sysutils/bacula-doc/distinfo b/sysutils/bacula-doc/distinfo
index 77fd4d5edff..d266b6de270 100644
--- a/sysutils/bacula-doc/distinfo
+++ b/sysutils/bacula-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20 2010/03/09 07:06:00 adam Exp $
+$NetBSD: distinfo,v 1.21 2010/05/08 09:05:47 adam Exp $
-SHA1 (bacula-docs-5.0.1.tar.bz2) = db69fa81810b3716aa9d05755e51f3375e423b66
-RMD160 (bacula-docs-5.0.1.tar.bz2) = af8378d90abcc70b6e26a2434daf25c3f7329c6d
-Size (bacula-docs-5.0.1.tar.bz2) = 34571061 bytes
+SHA1 (bacula-docs-5.0.2.tar.bz2) = e5d5494883492ef60c70b72dee62ae08a9a133c3
+RMD160 (bacula-docs-5.0.2.tar.bz2) = fbcbc3c46bd4b5c326ec454b0055029513412b4c
+Size (bacula-docs-5.0.2.tar.bz2) = 34587039 bytes
diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index 4046b601e69..31213fc2084 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.53 2010/03/09 07:06:00 adam Exp $
+# $NetBSD: Makefile.common,v 1.54 2010/05/08 09:05:47 adam Exp $
#
# used by sysutils/bacula-clientonly/Makefile
# used by sysutils/bacula-tray-monitor/Makefile
# used by sysutils/bacula-wx-console/Makefile
-DISTNAME= bacula-5.0.1
+DISTNAME= bacula-5.0.2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/}
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo
index 0f35132b8c2..7a738c10ef7 100644
--- a/sysutils/bacula/distinfo
+++ b/sysutils/bacula/distinfo
@@ -1,19 +1,17 @@
-$NetBSD: distinfo,v 1.40 2010/03/09 07:06:00 adam Exp $
+$NetBSD: distinfo,v 1.41 2010/05/08 09:05:47 adam Exp $
-SHA1 (bacula-5.0.1.tar.gz) = b6fd0c62d26c113d3bdccf69cd630b16d7261b5b
-RMD160 (bacula-5.0.1.tar.gz) = 587f49794556fe2eeed55eb3aaedfc3a6861761c
-Size (bacula-5.0.1.tar.gz) = 4057506 bytes
+SHA1 (bacula-5.0.2.tar.gz) = fe5b8d682fe73d2458f0b2965ea88386ba40f0d5
+RMD160 (bacula-5.0.2.tar.gz) = cb2e767476baf0d0bc3573a39882870e41dda6db
+Size (bacula-5.0.2.tar.gz) = 4189272 bytes
SHA1 (patch-aa) = 088623d447102579d2723f0ff0a1e802d83cfdd0
-SHA1 (patch-ab) = 07ff96289fe4fe9a1d666b3fa70c97f9ad45bc34
SHA1 (patch-ac) = 4ba89bcf49ce82b527edc789e2b17a781cb8622e
-SHA1 (patch-ad) = dc0fcf90112e973e122370feb3b31a9495efa17a
SHA1 (patch-ae) = cfd66ce6ae33b993a9398b1d40aa6b6c7fc84552
SHA1 (patch-af) = eb573f4b823c6c693634989883d2f94d2fa81f98
SHA1 (patch-ah) = 8cfe18b486fdd49eb162e20509ddf59e4b0c7375
SHA1 (patch-ai) = 388e075e7ec54fb377ee9dbe8338c667efb256ee
SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2
SHA1 (patch-am) = a2bfd8f345ce2c68b9387b02b08437cb9fc5772b
-SHA1 (patch-an) = c6028add3598bec7f0cceaed6ecfbc6c67b0c4ab
-SHA1 (patch-ao) = 1fd6f196210abc0d9645404e24b953d9dbee93d3
-SHA1 (patch-ap) = 65ca9bcf58d1004e022c466bc40bb9f822e87f77
+SHA1 (patch-an) = dbad88c5a6f60c501176103e794e85ab9400dd1a
+SHA1 (patch-ao) = bf35f9569909fe3d96c4bc7aca1ff989c75b4d2b
+SHA1 (patch-ap) = 383a4449e6503e518bc40d2053127e5968ad3cd4
SHA1 (patch-aq) = a8cabf3b43e1a2a878105875d68d5b000fe6632a
diff --git a/sysutils/bacula/patches/patch-ab b/sysutils/bacula/patches/patch-ab
deleted file mode 100644
index 76bd7c6a278..00000000000
--- a/sysutils/bacula/patches/patch-ab
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2009/08/24 08:23:41 adam Exp $
-
---- src/lib/crypto.c.orig 2008-11-06 20:10:08.000000000 +0100
-+++ src/lib/crypto.c
-@@ -309,7 +309,11 @@ typedef struct PEM_CB_Context {
- */
- static ASN1_OCTET_STRING *openssl_cert_keyid(X509 *cert) {
- X509_EXTENSION *ext;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ const X509V3_EXT_METHOD *method;
-+#else
- X509V3_EXT_METHOD *method;
-+#endif
- ASN1_OCTET_STRING *keyid;
- int i;
- #if (OPENSSL_VERSION_NUMBER >= 0x0090800FL)
-@@ -1099,7 +1103,11 @@ CRYPTO_SESSION *crypto_session_new (cryp
- /* Encrypt the session key */
- ekey = (unsigned char *)malloc(EVP_PKEY_size(keypair->pubkey));
-
-+#if OPENSSL_VERSION_NUMBER >= 0x00909000L
-+ if ((ekey_len = EVP_PKEY_encrypt_old(ekey, cs->session_key, cs->session_key_len, keypair->pubkey)) <= 0) {
-+#else
- if ((ekey_len = EVP_PKEY_encrypt(ekey, cs->session_key, cs->session_key_len, keypair->pubkey)) <= 0) {
-+#endif
- /* OpenSSL failure */
- RecipientInfo_free(ri);
- crypto_session_free(cs);
-@@ -1222,8 +1230,13 @@ crypto_error_t crypto_session_decode(con
- /* Decrypt the session key */
- /* Allocate sufficient space for the largest possible decrypted data */
- cs->session_key = (unsigned char *)malloc(EVP_PKEY_size(keypair->privkey));
-+#if OPENSSL_VERSION_NUMBER >= 0x00909000L
-+ cs->session_key_len = EVP_PKEY_decrypt_old(cs->session_key, M_ASN1_STRING_data(ri->encryptedKey),
-+ M_ASN1_STRING_length(ri->encryptedKey), keypair->privkey);
-+#else
- cs->session_key_len = EVP_PKEY_decrypt(cs->session_key, M_ASN1_STRING_data(ri->encryptedKey),
- M_ASN1_STRING_length(ri->encryptedKey), keypair->privkey);
-+#endif
-
- if (cs->session_key_len <= 0) {
- openssl_post_errors(M_ERROR, _("Failure decrypting the session key"));
diff --git a/sysutils/bacula/patches/patch-ad b/sysutils/bacula/patches/patch-ad
deleted file mode 100644
index 8941c99e98c..00000000000
--- a/sysutils/bacula/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2009/08/24 08:23:41 adam Exp $
-
---- src/lib/tls.c.orig 2008-11-22 19:36:12.000000000 +0100
-+++ src/lib/tls.c
-@@ -315,7 +315,11 @@ bool tls_postconnect_verify_host(JCR *jc
- extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
-
- if (strcmp(extname, "subjectAltName") == 0) {
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+ const X509V3_EXT_METHOD *method;
-+#else
- X509V3_EXT_METHOD *method;
-+#endif
- STACK_OF(CONF_VALUE) *val;
- CONF_VALUE *nval;
- void *extstr = NULL;
diff --git a/sysutils/bacula/patches/patch-an b/sysutils/bacula/patches/patch-an
index a87d40bd200..499eab407fa 100644
--- a/sysutils/bacula/patches/patch-an
+++ b/sysutils/bacula/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.2 2010/03/09 07:06:00 adam Exp $
+$NetBSD: patch-an,v 1.3 2010/05/08 09:05:47 adam Exp $
---- src/tools/Makefile.in.orig 2010-02-24 15:33:48.000000000 +0000
+--- src/tools/Makefile.in.orig 2010-04-27 19:58:29.000000000 +0000
+++ src/tools/Makefile.in
@@ -57,21 +57,21 @@ all: Makefile $(TOOLS) gigaslam grow
@echo " "
@@ -59,7 +59,7 @@ $NetBSD: patch-an,v 1.2 2010/03/09 07:06:00 adam Exp $
bvfs_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) bvfs_test.o
$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ bvfs_test.o \
@@ -118,7 +118,7 @@ gigaslam: gigaslam.o
- $(CXX) -o $@ gigaslam.o
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o
grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
diff --git a/sysutils/bacula/patches/patch-ao b/sysutils/bacula/patches/patch-ao
index 1676a0dfad7..6b388b793cc 100644
--- a/sysutils/bacula/patches/patch-ao
+++ b/sysutils/bacula/patches/patch-ao
@@ -1,9 +1,9 @@
-$NetBSD: patch-ao,v 1.3 2010/03/09 07:06:00 adam Exp $
+$NetBSD: patch-ao,v 1.4 2010/05/08 09:05:47 adam Exp $
---- configure.orig 2010-02-24 15:33:48.000000000 +0000
+--- configure.orig 2010-04-27 19:58:29.000000000 +0000
+++ configure
-@@ -31880,7 +31880,7 @@ if test "${support_bat}" = "yes" ; then
- as_fn_error "Could not find qmake $PATH. Check your Qt installation" "$LINENO" 5
+@@ -47193,7 +47193,7 @@ echo "$as_me: error: Could not find qmak
+ { (exit 1); exit 1; }; }
fi
- QMAKEBIN="qmake"
diff --git a/sysutils/bacula/patches/patch-ap b/sysutils/bacula/patches/patch-ap
index 55721cbeea8..cbffac02dfb 100644
--- a/sysutils/bacula/patches/patch-ap
+++ b/sysutils/bacula/patches/patch-ap
@@ -1,6 +1,6 @@
-$NetBSD: patch-ap,v 1.2 2009/08/24 08:23:41 adam Exp $
+$NetBSD: patch-ap,v 1.3 2010/05/08 09:05:47 adam Exp $
---- src/qt-console/bat.pro.in.orig 2009-06-08 10:38:06.000000000 +0200
+--- src/qt-console/bat.pro.in.orig 2010-04-27 19:58:29.000000000 +0000
+++ src/qt-console/bat.pro.in
@@ -11,8 +11,6 @@ CONFIG += qt debug @QWT@
@@ -17,6 +17,6 @@ $NetBSD: patch-ap,v 1.2 2009/08/24 08:23:41 adam Exp $
LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
-QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)
+QMAKE_LINK = $(CXX)
- QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m 0754 -p
+ QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
QMAKE_CLEAN += .libs/* bat
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 18:47:20 +0000