cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 11.0.5

Browse Source
This commit is contained in:
robert 2021-06-04 07:25:09 +00:00
parent 40ae68d246
commit 976ba21b99
3 changed files with 4 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/bacula/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.156 2021/06/02 07:06:38 robert Exp $
# $OpenBSD: Makefile,v 1.157 2021/06/04 07:25:09 robert Exp $
# XXX building this port while a version is already installed on the
# system will lead to unexpected hidden dependencies!!!
@ -10,7 +10,7 @@ COMMENT-mysql= Bacula libbaccats support for MySQL
COMMENT-pgsql= Bacula libbaccats support for PostgreSQL
COMMENT-sqlite3= Bacula libbaccats support for SQLite3
V= 11.0.4
V= 11.0.5
DISTNAME= bacula-$V
PKGNAME-main= bacula-client-$V
PKGNAME-server= bacula-server-$V

4
sysutils/bacula/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (bacula-11.0.4.tar.gz) = 5S04kr7Oo5M787/jrgCGLqlab2ifxxoupdxgFdaJKvk=
SIZE (bacula-11.0.4.tar.gz) = 5982430
SHA256 (bacula-11.0.5.tar.gz) = 71s7Z4EEQiAbgNwdR8zvd7XtN4/hKFQG86c0AbboERo=
SIZE (bacula-11.0.5.tar.gz) = 5982886

38
sysutils/bacula/patches/patch-src_cats_sql_get_c
View File

@ -1,38 +0,0 @@
$OpenBSD: patch-src_cats_sql_get_c,v 1.1 2021/06/02 07:06:38 robert Exp $
Index: src/cats/sql_get.c
--- src/cats/sql_get.c.orig
+++ src/cats/sql_get.c
@@ -1461,7 +1461,7 @@ bool BDB::bdb_get_accurate_jobids(JCR *jcr,
char clientid[50], jobid[50], filesetid[50];
char date[MAX_TIME_LENGTH];
char esc[MAX_ESCAPE_NAME_LENGTH];
- POOL_MEM query(PM_MESSAGE), name(PM_FNAME), aux(PM_FNAME);
+ POOL_MEM query(PM_MESSAGE), name(PM_FNAME);
/* Take the current time as upper limit if nothing else specified */
utime_t StartTime = (jr->StartTime)?jr->StartTime:time(NULL);
@@ -1481,13 +1481,12 @@ bool BDB::bdb_get_accurate_jobids(JCR *jcr,
* depdending on the Job level of the hint, we must
* adapt one of the queries (F, D, I) and add a JobId=x
*/
- edit_uint64(from_jobid, jobid);
+ edit_uint64(jcr->JobId, jobid);
}
if (jr->Name[0] != 0) {
bdb_escape_string(jcr, esc, jr->Name, strlen(jr->Name));
Mmsg(name, " AND Name = '%s' ", esc);
- aux.strcat(name.c_str());
}
/* First, find the last good Full backup for this job/client/fileset */
@@ -1496,7 +1495,7 @@ bool BDB::bdb_get_accurate_jobids(JCR *jcr,
edit_uint64(jr->ClientId, clientid),
date,
edit_uint64(jr->FileSetId, filesetid),
- aux.c_str()
+ name.c_str()
);
if (!bdb_sql_query(query.c_str(), NULL, NULL)) {