head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.4 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.2 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.7.0.16 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.14 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.12 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.10 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.8 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.6 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.4 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.2 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q1:1.5.0.6 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.4 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.2 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.3.0.6 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.4 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.2 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.1.0.6 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.4 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.2 pkgsrc-2008Q2-base:1.1; locks; strict; comment @# @; 1.8 date 2012.10.06.17.54.53; author christos; state dead; branches; next 1.7; 1.7 date 2010.12.26.18.39.46; author adam; state Exp; branches; next 1.6; 1.6 date 2010.05.08.09.06.17; author adam; state dead; branches; next 1.5; 1.5 date 2009.08.24.08.23.41; author adam; state Exp; branches; next 1.4; 1.4 date 2009.07.10.19.21.28; author hasso; state Exp; branches; next 1.3; 1.3 date 2008.11.28.13.47.51; author adam; state Exp; branches; next 1.2; 1.2 date 2008.11.21.14.09.31; author adam; state dead; branches; next 1.1; 1.1 date 2008.07.13.15.26.36; author tonnerre; state Exp; branches; next ; desc @@ 1.8 log @Upgrade to 5.2.12. This is a bug fix release. - A new bpluginfo utility tool - Make dump_resource respect console ACL's (security fix) - Add chio-changer-openbsd submitted in bug #1903 - Important Copy job bug fixed. Major changes since 5.2.9: - IPv6 networking should work correctly now - SQL Counter problems resolved - Bat hanging after running a number of jobs - dbcheck rw_writelock problem - Windows VSS restore bug New Feature: - Add rudimentary support for backing up AFS More complete changelog at: http://www.bacula.org/en/?page=news @ text @$NetBSD: patch-ab,v 1.7 2010/12/26 18:39:46 adam Exp $ --- src/findlib/attribs.c.orig 2010-08-05 14:29:51.000000000 +0000 +++ src/findlib/attribs.c @@@@ -240,7 +240,7 @@@@ void encode_stat(char *buf, struct stat int decode_stat(char *buf, struct stat *statp, int32_t *LinkFI) { char *p = buf; - int64_t val; + intmax_t val; p += from_base64(&val, p); plug(statp->st_dev, val); @@@@ -325,7 +325,7 @@@@ int decode_stat(char *buf, struct stat * int32_t decode_LinkFI(char *buf, struct stat *statp) { char *p = buf; - int64_t val; + intmax_t val; skip_nonspaces(&p); /* st_dev */ p++; /* skip space */ @@@@ -632,7 +632,7 @@@@ int encode_attribsEx(JCR *jcr, char *att static bool set_win32_attributes(JCR *jcr, ATTR *attr, BFILE *ofd) { char *p = attr->attrEx; - int64_t val; + intmax_t val; WIN32_FILE_ATTRIBUTE_DATA atts; ULARGE_INTEGER li; POOLMEM *win32_ofile; @ 1.7 log @Changes 5.0.3: This 5.0.3 version is significant bug fix update to version 5.0.2. It includes new code and some new features. There is no database change since prior versions of 5.0. Compatibility: -------------- As always, both the Director and Storage daemon must be upgraded at the same time. Older 5.0.x and 3.0.x File Daemons are compatible with the 5.0.3 Director and Storage daemons. There should be no need to upgrade older File Daemons. Changes and New Features: - If a VSS (Windows) snapshot fails, the whole Job is failed, previously it printed a warning message and continued. - New editing codes %b = Job Bytes and %f = Job Files for runscripts - Any non-Bacula project plugins (i.e. third party plugins) must be upgraded to specify AGPLv3 in place of the GPLv2 used previously for the PLUGIN_LICENSE. - The bat Media page text columns can be sorted by clicking on the column. - If possible, the SD will automatically update the catalog Volume size if it does not match the Volume size. The mismatch between the Volume sizes typically occurs when the FD has a comm line drop or the FD crashes. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Changes 5.0.2: - Add lmgr_is_locked() function to test if a thread own a mutex - Remove comment field added in last patch - Check if sql backend is thread-safe - Fix cancel crash reported by Stephen Thompson - fix grant_postgresql_privileges doesn t grant permissions on jobhisto_jobid_seq - Add lock position info to volume manager - Permits to use lock manager with file/line from outside - Replace ASSERT in block.c with fail Job - Use uint32_t for max_concurrent_jobs - Use file and line for rwlock and lmgr in db_lock() - Add File and Line info to rw_lock for lmgr - Fix database locking calling db_lock and returning from function without calling db_unlock. - Add missing db_unlock to bvfs_update_cache. - Allow users to build bat without static QT if desired. - Fix for qt mkspecs location on Fedora 12. - Another fix for OpenSSLv1 - Add -lrt to Solaris links - Fix tls.c for OpenSSLv1 - Fix plugin load not to stop if one plugin bad -- pointed out by James - Remove --without-qwt from configure statement. - Fix bug in bvfs_update function, should work much better now - Lets not generate the ingres code automatically when the .sc or .sh files changes as it seems these files get outdated on some systems and then this rule kicks in on systems that don't have the esqlcc ingres compiler installed. - Fix CentOS detection in regression get-os script - Create subroutines to add exclusion for plugins - This adds sql debugging to these classes that Eric wrote. - This is a 1/2 fix of the issue. It allows for the sorting of the two non graphic columns, but still does not allow for sorting the graphic columns. The issue is with last. By setting the sort value, you are setting the value on the last. To experiment with what I mean, use the set background that I have commented out in this commit. - Fix OpenSSL 1.x problem in crypto.c on Fedora 12 - Display AllowCompress warning message only if compression used in FileSet - Added comment on dbi backend needing a recent version of libdbi from CVS as the version currently released 0.8.3 wont work for compiling the code. - Add Warning check to SQL - Fix readline to use TERM_LIB found for conio - Move bacula shared objects in separate bacula-libs package. - Fix for termcap lib on suse. - Fix for shared objects name convention change. - Remove mandrive and suse bacula.spec from configure - Fix compile link flags for gigaslam - Add missing defines for gccver. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.5 2009/08/24 08:23:41 adam Exp $ d3 8 a10 17 --- 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)); d12 8 a19 19 +#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 d21 11 a31 2 if (cs->session_key_len <= 0) { openssl_post_errors(M_ERROR, _("Failure decrypting the session key")); @ 1.5 log @Changes 3.0.2: * Fix 1323 about a problem when mounting a requested volume during a restore. * Add more example SD Device configurations. * Force the client_encoding to SQL_ASCII when database is already using this mode. * Fix 1335 about postgresql error message during copy session * Cleanup old job records when starting the director (Created/Running -> Failed) * Apply patch in bug 1315 by McMichaeli that fixes scripts/logwatch * Add more output when spooling and no space left * Fix postgresql driver bug that displayed rows from time to time. * Implement the project 'restore' menu: enter a JobId, automatically select dependents * Should fix 1323 about verify accurate jobs and deleted files. * more... @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Unbreak it with openssl older than 0.9.9. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2008/11/28 13:47:51 adam Exp $ d3 15 a17 3 --- ./src/lib/crypto.c.orig 2008-11-06 21:10:08 +0200 +++ ./src/lib/crypto.c 2009-07-10 13:27:39 +0300 @@@@ -1099,7 +1099,11 @@@@ CRYPTO_SESSION *crypto_session_new (cryp d29 1 a29 1 @@@@ -1222,8 +1226,13 @@@@ crypto_error_t crypto_session_decode(con @ 1.3 log @Added OpenSSL as an option @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- src/lib/crypto.c.orig 2008-11-28 13:50:13.000000000 +0100 +++ src/lib/crypto.c @@@@ -1099,7 +1099,7 @@@@ CRYPTO_SESSION *crypto_session_new (cryp d9 1 a9 1 - if ((ekey_len = EVP_PKEY_encrypt(ekey, cs->session_key, cs->session_key_len, keypair->pubkey)) <= 0) { d11 3 d17 1 a17 1 @@@@ -1222,7 +1222,7 @@@@ crypto_error_t crypto_session_decode(con d21 1 a21 1 - cs->session_key_len = EVP_PKEY_decrypt(cs->session_key, M_ASN1_STRING_data(ri->encryptedKey), d23 3 d27 1 d30 1 @ 1.2 log @Changes 2.4.3: * Apply 2.4.2-cancel-non-running-jobs.patch to be able to cancel a non created job faster. * Fix typo in configure.in that breaks --with-db-password option * Remove all double quotes from SQLite creating script and replace by single quotes as suggested by John Huttley. * Fix SQL case problem that may cause the failure of DiskToCatalog. * Copy missing storage name into edit buffer. As far as I can tell this never caused a bug. * Remove catalog dependency for bcopy * Modify catalog scripts to have an easier packaging integration, using default variables. Make difference between SQLite3 and SQLite in db_get_type() job when reading from one autochanger and writing to another. * Add more information to SD acquire.c INFO messages. * Fix NULL Volume name error when reading and the drive must be switched. * Fix a Verify InitCatalog problem where in certain cases a garbage filename may be entered in the verification database. * Add space after version before date in bat about dialog. * Fix seg fault in Dir during estimate command with no level value given. * Add message to migration job when the target job is already migrated. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2008/07/13 15:26:36 tonnerre Exp $ d3 20 a22 24 --- src/cats/make_catalog_backup.in.orig 2007-04-24 17:36:15.000000000 +0200 +++ src/cats/make_catalog_backup.in @@@@ -8,7 +8,11 @@@@ # $2 is the user name with which to access the database # (default = bacula). # $3 is the password with which to access the database or "" if no password -# (default "") +# (default ""). WARNING!!! Passing the password via the command line is +# insecure and should not be used since any user can display the command +# line arguments and the environment using ps. Please consult your +# MySQL or PostgreSQL manual for secure methods of specifying the +# password. # $4 is the host on which the database is located # (default "") # @@@@ -31,7 +35,7 @@@@ else else MYSQLHOST="" fi - ${BINDIR}/mysqldump -u $2$MYSQLPASSWORD$MYSQLHOST -f --opt $1 >$1.sql + ${BINDIR}/mysqldump -u ${2}${MYSQLPASSWORD}${MYSQLHOST} -f --opt $1 >$1.sql else if test xpostgresql = x@@DB_TYPE@@ ; then if test $# -gt 2; then @ 1.1 log @Add patches "solving" the issue of bacula exposing passwords et cetera through the command line parameters of various tools (CVE-2007-5626). @ text @d1 1 a1 1 $NetBSD$ @