OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 10-Oct-2003 16:01:54
Branch: HEAD Handle: 2003101015015003
Modified files:
openpkg-src/powerdns fsl.powerdns powerdns.spec rc.powerdns
openpkg-web news.txt
Log:
Put all log files in separate log directory
Summary:
Revision Changes Path
1.6 +5 -5 openpkg-src/powerdns/fsl.powerdns
1.32 +8 -4 openpkg-src/powerdns/powerdns.spec
1.14 +4 -4 openpkg-src/powerdns/rc.powerdns
1.6955 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/powerdns/fsl.powerdns
============================================================================
$ cvs diff -u -r1.5 -r1.6 fsl.powerdns
--- openpkg-src/powerdns/fsl.powerdns 9 Oct 2003 19:37:50 -0000 1.5
+++ openpkg-src/powerdns/fsl.powerdns 10 Oct 2003 14:01:52 -0000 1.6
@@ -8,7 +8,7 @@
)
-> {
debug: file(
- path="@l_prefix@/var/powerdns/pdns.log",
+ path="@l_prefix@/var/powerdns/log/pdns.log",
perm=0660, jitter=1, monitor=3600
)
}
@@ -20,7 +20,7 @@
)
-> {
debug: file(
- path="@l_prefix@/var/powerdns/bindbe.log",
+ path="@l_prefix@/var/powerdns/log/bindbe.log",
perm=0660, jitter=1, monitor=3600
)
}
@@ -32,7 +32,7 @@
)
-> {
debug: file(
- path="@l_prefix@/var/powerdns/bind2be.log",
+ path="@l_prefix@/var/powerdns/log/bind2be.log",
perm=0660, jitter=1, monitor=3600
)
}
@@ -44,7 +44,7 @@
)
-> {
debug: file(
- path="@l_prefix@/var/powerdns/randbe.log",
+ path="@l_prefix@/var/powerdns/log/randbe.log",
perm=0660, jitter=1, monitor=3600
)
}
@@ -56,7 +56,7 @@
)
-> {
debug: file(
- path="@l_prefix@/var/powerdns/gsqlbe.log",
+ path="@l_prefix@/var/powerdns/log/gsqlbe.log",
perm=0660, jitter=1, monitor=3600
)
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/powerdns/powerdns.spec
============================================================================
$ cvs diff -u -r1.31 -r1.32 powerdns.spec
--- openpkg-src/powerdns/powerdns.spec 9 Oct 2003 19:37:50 -0000 1.31
+++ openpkg-src/powerdns/powerdns.spec 10 Oct 2003 14:01:53 -0000 1.32
@@ -33,7 +33,7 @@
Group: DNS
License: GPL
Version: 2.9.11
-Release: 20031009
+Release: 20031010
# package options
%option with_fsl yes
@@ -138,7 +138,6 @@
%install
rm -rf $RPM_BUILD_ROOT
- %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/powerdns
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
@@ -157,7 +156,7 @@
-e 's;# \(daemon=\)no;\1yes;' \
-e 's;# \(launch=\);\1bind;' \
-e 's;# \(local-address=\)0.0.0.0;\1127.0.0.1;' \
- -e 's;# \(logfile=\)pdns.log;\1%{l_prefix}/var/powerdns/pdns.log;' \
+ -e 's;# \(logfile=\)pdns.log;\1%{l_prefix}/var/powerdns/log/pdns.log;' \
-e 's;# \(setgid=\);\1%{l_mgid};' \
-e 's;# \(setuid=\);\1%{l_muid};' \
-e 's;# \(socket-dir=\)/var/run;\1%{l_prefix}/var/powerdns;' \
@@ -179,12 +178,17 @@
%{SOURCE fsl.powerdns} \
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+ # create an empty var and log directory
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/powerdns/log
+
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%not %dir %{l_prefix}/etc/fsl' \
'%config %{l_prefix}/etc/fsl/fsl.powerdns' \
'%dir %attr(0775,%{l_susr},%{l_mgrp}) %{l_prefix}/var/powerdns' \
+ '%dir %attr(0775,%{l_susr},%{l_mgrp}) %{l_prefix}/var/powerdns/log' \
'%dir %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/powerdns' \
'%config %attr(0600,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/powerdns/*'
@@ -204,6 +208,6 @@
# before erase, stop service and remove log files
[ $1 -eq 0 ] || exit 0
%{l_rc} powerdns stop 2>/dev/null
- rm -f $RPM_INSTALL_PREFIX/var/powerdns/*.log* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/powerdns/log/* >/dev/null 2>&1 || true
exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/powerdns/rc.powerdns
============================================================================
$ cvs diff -u -r1.13 -r1.14 rc.powerdns
--- openpkg-src/powerdns/rc.powerdns 9 Oct 2003 19:37:50 -0000 1.13
+++ openpkg-src/powerdns/rc.powerdns 10 Oct 2003 14:01:53 -0000 1.14
@@ -5,25 +5,25 @@
%config
powerdns_enable="$openpkg_rc_def"
- powerdns_pdns_file="@l_prefix@/var/powerdns/pdns.log"
+ powerdns_pdns_file="@l_prefix@/var/powerdns/log/pdns.log"
powerdns_pdns_prolog="true"
powerdns_pdns_epilog="true"
powerdns_pdns_numfiles="10"
powerdns_pdns_minsize="1M"
powerdns_pdns_complevel="9"
- powerdns_bindbe_file="@l_prefix@/var/powerdns/bindbe.log"
+ powerdns_bindbe_file="@l_prefix@/var/powerdns/log/bindbe.log"
powerdns_bindbe_prolog="true"
powerdns_bindbe_epilog="true"
powerdns_bindbe_numfiles="10"
powerdns_bindbe_minsize="1M"
powerdns_bindbe_complevel="9"
- powerdns_bind2be_file="@l_prefix@/var/powerdns/bind2be.log"
+ powerdns_bind2be_file="@l_prefix@/var/powerdns/log/bind2be.log"
powerdns_bind2be_prolog="true"
powerdns_bind2be_epilog="true"
powerdns_bind2be_numfiles="10"
powerdns_bind2be_minsize="1M"
powerdns_bind2be_complevel="9"
- powerdns_gsqlbe_file="@l_prefix@/var/powerdns/gsqlbe.log"
+ powerdns_gsqlbe_file="@l_prefix@/var/powerdns/log/gsqlbe.log"
powerdns_gsqlbe_prolog="true"
powerdns_gsqlbe_epilog="true"
powerdns_gsqlbe_numfiles="10"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6954 -r1.6955 news.txt
--- openpkg-web/news.txt 10 Oct 2003 13:53:35 -0000 1.6954
+++ openpkg-web/news.txt 10 Oct 2003 14:01:50 -0000 1.6955
@@ -1,3 +1,4 @@
+10-Oct-2003: Upgraded package: P<powerdns-2.9.11-20031010>
10-Oct-2003: Upgraded package: P<openpkg-20031010-20031010>
10-Oct-2003: Upgraded package: P<gxmame-0.33-20031010>
10-Oct-2003: Upgraded package: P<sysmon-0.91.20-20031010>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
