From cf9897108cc8288ac4eb23d6d1ef67176c479726 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 13 Jul 2007 04:44:08 +0000 Subject: [PATCH] kes Fix regress config non-portable test as pointed out by Florian Heigl kes Fix PSCMD for HP-UX in configure.in to have proper syntax. as pointed out by Florian Heigl git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5165 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/autoconf/configure.in | 2 +- bacula/src/lib/base64.c | 16 ++++++++-------- bacula/src/lib/bget_msg.c | 20 ++++++++++---------- bacula/src/lib/breg.c | 2 +- bacula/src/lib/tree.h | 12 ++++++------ bacula/src/lib/watchdog.h | 2 +- bacula/src/lib/workq.h | 24 ++++++++++++------------ bacula/src/version.h | 4 ++-- bacula/technotes-2.1 | 5 +++++ 9 files changed, 46 insertions(+), 41 deletions(-) diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 95fb2c2f3b..b8d7156f89 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -1899,7 +1899,7 @@ freebsd) largefile_support="yes" ;; hpux) - PSCMD="UNIX95=1 ps -e -o pid,comm" + PSCMD="UNIX95=1; ps -e -o pid,comm" CFLAGS="${CFLAGS} -D_XOPEN_SOURCE_EXTENDED=1" DISTVER=`uname -r` TAPEDRIVE="/dev/rmt/0hnb" diff --git a/bacula/src/lib/base64.c b/bacula/src/lib/base64.c index 681b27ce2b..0f69ca7e2c 100644 --- a/bacula/src/lib/base64.c +++ b/bacula/src/lib/base64.c @@ -1,14 +1,7 @@ -/* - * Generic base 64 input and output routines - * - * Written by Kern E. Sibbald, March MM. - * - * Version $Id$ - */ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2006 Free Software Foundation Europe e.V. + Copyright (C) 2000-2007 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -32,6 +25,13 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. */ +/* + * Generic base 64 input and output routines + * + * Written by Kern E. Sibbald, March MM. + * + * Version $Id$ + */ #include "bacula.h" diff --git a/bacula/src/lib/bget_msg.c b/bacula/src/lib/bget_msg.c index 9a6dedf056..8dc3299637 100644 --- a/bacula/src/lib/bget_msg.c +++ b/bacula/src/lib/bget_msg.c @@ -1,16 +1,7 @@ -/* - * Subroutines to receive network data and handle - * network signals for the FD and the SD. - * - * Kern Sibbald, May MMI previously in src/stored/fdmsg.c - * - * Version $Id$ - * - */ /* Bacula® - The Network Backup Solution - Copyright (C) 2001-2006 Free Software Foundation Europe e.V. + Copyright (C) 2001-2007 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -34,6 +25,15 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. */ +/* + * Subroutines to receive network data and handle + * network signals for the FD and the SD. + * + * Kern Sibbald, May MMI previously in src/stored/fdmsg.c + * + * Version $Id$ + * + */ #include "bacula.h" /* pull in global headers */ diff --git a/bacula/src/lib/breg.c b/bacula/src/lib/breg.c index 27b2b7030e..0f742d6665 100644 --- a/bacula/src/lib/breg.c +++ b/bacula/src/lib/breg.c @@ -7,7 +7,7 @@ * */ /* - BaculaÂ® - The Network Backup Solution + Bacula® - The Network Backup Solution Copyright (C) 2006-2006 Free Software Foundation Europe e.V. diff --git a/bacula/src/lib/tree.h b/bacula/src/lib/tree.h index db379ab1ad..b3a5cff41e 100644 --- a/bacula/src/lib/tree.h +++ b/bacula/src/lib/tree.h @@ -1,9 +1,3 @@ -/* - * Directory tree build/traverse routines - * - * Kern Sibbald, June MMII - * -*/ /* Bacula® - The Network Backup Solution @@ -31,6 +25,12 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. */ +/* + * Directory tree build/traverse routines + * + * Kern Sibbald, June MMII + * +*/ struct s_mem { struct s_mem *next; /* next buffer */ diff --git a/bacula/src/lib/watchdog.h b/bacula/src/lib/watchdog.h index 17a61c133d..b9dc783ea4 100644 --- a/bacula/src/lib/watchdog.h +++ b/bacula/src/lib/watchdog.h @@ -7,7 +7,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2002-2006 Free Software Foundation Europe e.V. + Copyright (C) 2002-2007 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. diff --git a/bacula/src/lib/workq.h b/bacula/src/lib/workq.h index 12af195b1a..185b5fcc11 100644 --- a/bacula/src/lib/workq.h +++ b/bacula/src/lib/workq.h @@ -1,18 +1,7 @@ -/* - * Bacula work queue routines. Permits passing work to - * multiple threads. - * - * Kern Sibbald, January MMI - * - * This code adapted from "Programming with POSIX Threads", by - * David R. Butenhof - * - * Version $Id$ - */ /* Bacula® - The Network Backup Solution - Copyright (C) 2001-2006 Free Software Foundation Europe e.V. + Copyright (C) 2001-2007 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -36,6 +25,17 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. */ +/* + * Bacula work queue routines. Permits passing work to + * multiple threads. + * + * Kern Sibbald, January MMI + * + * This code adapted from "Programming with POSIX Threads", by + * David R. Butenhof + * + * Version $Id$ + */ #ifndef __WORKQ_H #define __WORKQ_H 1 diff --git a/bacula/src/version.h b/bacula/src/version.h index 2a88b9f7bd..10b9545523 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -4,8 +4,8 @@ #undef VERSION #define VERSION "2.1.27" -#define BDATE "12 July 2007" -#define LSMDATE "12Jul07" +#define BDATE "13 July 2007" +#define LSMDATE "13Jul07" #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n" #define BYEAR "2007" /* year for copyright messages in progs */ diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1 index f163e43f78..72bf20f166 100644 --- a/bacula/technotes-2.1 +++ b/bacula/technotes-2.1 @@ -1,6 +1,11 @@ Technical notes on version 2.1 General: +13Jul07 +kes Fix regress config non-portable test as pointed out by + Florian Heigl +kes Fix PSCMD for HP-UX in configure.in to have proper syntax. + as pointed out by Florian Heigl 12Jul07 kes Fix missing rctx. prefixes on the Darwin code in src/filed/restore.c Reported by Frank Sweetser. -- 2.39.5