OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-May-2007 18:16:43
Branch: HEAD Handle: 2007051817164300
Modified files:
openpkg-src/bacula bacula.patch bacula.spec
Log:
upgrading package: bacula 2.0.3 -> 2.1.8
Summary:
Revision Changes Path
1.8 +8 -22 openpkg-src/bacula/bacula.patch
1.48 +11 -21 openpkg-src/bacula/bacula.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bacula/bacula.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 bacula.patch
--- openpkg-src/bacula/bacula.patch 9 Mar 2007 12:41:58 -0000 1.7
+++ openpkg-src/bacula/bacula.patch 18 May 2007 16:16:43 -0000 1.8
@@ -1,6 +1,6 @@
Index: manpages/Makefile.in
---- manpages/Makefile.in.orig 2006-08-27 20:30:56 +0200
-+++ manpages/Makefile.in 2007-01-12 15:35:55 +0100
+--- manpages/Makefile.in.orig 2007-04-24 17:47:01 +0200
++++ manpages/Makefile.in 2007-05-18 17:50:22 +0200
@@ -20,23 +20,21 @@
install:
$(MKDIR) $(DESTDIR)/$(mandir)/man8
@@ -32,8 +32,8 @@
clean: dummy
Index: scripts/bacula.in
---- scripts/bacula.in.orig 2006-04-05 15:18:45 +0200
-+++ scripts/bacula.in 2006-05-14 20:38:13 +0200
+--- scripts/bacula.in.orig 2006-04-07 10:22:17 +0200
++++ scripts/bacula.in 2007-05-18 17:50:22 +0200
@@ -17,31 +17,37 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -85,8 +85,8 @@
*)
Index: scripts/btraceback.in
---- scripts/btraceback.in.orig 2005-05-08 11:18:21 +0200
-+++ scripts/btraceback.in 2006-05-14 20:32:36 +0200
+--- scripts/btraceback.in.orig 2005-05-08 11:18:24 +0200
++++ scripts/btraceback.in 2007-05-18 17:50:22 +0200
@@ -11,6 +11,9 @@
PNAME=`basename $1`
if test `uname -s` = SunOS ; then
@@ -98,8 +98,8 @@
| @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX
traceback of ${PNAME}" @dump_email@
else
Index: src/dird/bacula-dir.conf.in
---- src/dird/bacula-dir.conf.in.orig 2005-10-26 16:02:04 +0200
-+++ src/dird/bacula-dir.conf.in 2006-05-14 20:32:36 +0200
+--- src/dird/bacula-dir.conf.in.orig 2007-03-30 23:46:04 +0200
++++ src/dird/bacula-dir.conf.in 2007-05-18 17:50:22 +0200
@@ -29,7 +29,8 @@
Level = Incremental
Client = @[EMAIL PROTECTED]
@@ -131,17 +131,3 @@
#
# When to do the backups, full backup on first sunday of the month,
# differential (i.e. incremental since full) every other sunday,
-Index: src/console/console.c
---- src/console/console.c.orig 2007-02-06 15:37:57 +0100
-+++ src/console/console.c 2007-03-09 13:30:52 +0100
-@@ -55,10 +55,6 @@
- #define isatty(fd) (fd==0)
- #endif
-
--/* Exported variables */
--
--extern int rl_catch_signals;
--
- /* Imported functions */
- int authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons);
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bacula/bacula.spec
============================================================================
$ cvs diff -u -r1.47 -r1.48 bacula.spec
--- openpkg-src/bacula/bacula.spec 9 Mar 2007 12:41:58 -0000 1.47
+++ openpkg-src/bacula/bacula.spec 18 May 2007 16:16:43 -0000 1.48
@@ -32,8 +32,8 @@
Class: PLUS
Group: System
License: GPL
-Version: 2.0.3
-Release: 20070309
+Version: 2.1.8
+Release: 20070518
# package options
%option with_server yes
@@ -122,15 +122,8 @@
rm -f src/lib/tcpd.h
%build
- # delay generation of default passwords until installation, else
- # the config files change on every install leading _always_ to
- # the generation of .rpmnew files which prevent rc start/stop/restart
- for pwd in dir_password fd_password sd_password \
- mon_dir_password mon_fd_password mon_sd_password; do
- %{l_shtool} subst \
- -e "s;^s,@$pwd@,;s,@-$pwd-@,;" \
- configure
- done
+ # generate a random director password
+ password="`openssl rand -base64 33`"
# for the same reason remove version informations from config files
%{l_shtool} subst \
@@ -139,7 +132,7 @@
# use localhost as default host
%{l_shtool} subst \
- -e 's/s,@hostname@,$hostname,/s,@hostname@,localhost,/' \
+ -e 's;hostname=.*;hostname=localhost;g' \
configure
# configure
@@ -159,6 +152,12 @@
--with-sd-group=%{l_rgrp} \
--with-fd-user=%{l_susr} \
--with-fd-group=%{l_sgrp} \
+ --with-dir-password="$password" \
+ --with-fd-password="$password" \
+ --with-sd-password="$password" \
+ --with-mon-dir-password="$password" \
+ --with-mon-fd-password="$password" \
+ --with-mon-sd-password="$password" \
--disable-conio \
--enable-readline \
--with-readline=%{l_prefix} \
@@ -283,15 +282,6 @@
chown %{l_rusr}:%{l_rgrp} $RPM_INSTALL_PREFIX/var/bacula/bacula.db
fi
- # generate default passwords
- for pwd in dir_password fd_password sd_password \
- mon_dir_password mon_fd_password mon_sd_password; do
- %{l_shtool} subst \
- -e "s;@$pwd@;`openssl rand -base64 33`;" \
- $RPM_INSTALL_PREFIX/etc/bacula/*.conf \
- $RPM_INSTALL_PREFIX/etc/bacula/*.conf.rpmnew 2>/dev/null
- done
-
# after upgrade, restart service
[ $1 -eq 2 ] || exit 0
eval `%{l_rc} bacula status 2>/dev/null`
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
