OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Mar-2007 13:41:58
Branch: HEAD Handle: 2007030912415800
Modified files:
openpkg-src/bacula bacula.patch bacula.spec
Log:
fix original problem which obsoletes change of rev 1.45 and 1.46
Summary:
Revision Changes Path
1.7 +14 -0 openpkg-src/bacula/bacula.patch
1.47 +1 -0 openpkg-src/bacula/bacula.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bacula/bacula.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 bacula.patch
--- openpkg-src/bacula/bacula.patch 12 Jan 2007 14:42:30 -0000 1.6
+++ openpkg-src/bacula/bacula.patch 9 Mar 2007 12:41:58 -0000 1.7
@@ -131,3 +131,17 @@
#
# 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.46 -r1.47 bacula.spec
--- openpkg-src/bacula/bacula.spec 9 Mar 2007 12:03:01 -0000 1.46
+++ openpkg-src/bacula/bacula.spec 9 Mar 2007 12:41:58 -0000 1.47
@@ -251,6 +251,7 @@
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
+ '%attr(640,%{l_musr},%{l_mgrp}) %config(noreplace)
%{l_prefix}/etc/bacula/bconsole.conf' \
'%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula' \
'%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run' \
'%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run/subsys' \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
