OBS User unknown 2007-11-21 21:09:52 +00:00 committed by Git OBS Bridge
parent e1ff869237
commit c5c545a27c
15 changed files with 76 additions and 65 deletions

View File

@ -1,22 +0,0 @@
--- src/cf.defs.h
+++ src/cf.defs.h
@@ -431,7 +431,7 @@
/*****************************************************************************/
#define CF_GRAINS 64
-#define ATTR 11
+#define ATTR 20
#define CF_NETATTR 7 /* icmp udp dns tcpsyn tcpfin tcpack */
#define PH_LIMIT 10
#define CF_WEEK (7.0*24.0*3600.0)
--- src/instrument.c
+++ src/instrument.c
@@ -244,7 +244,7 @@
DB_ENV *dbenv = NULL;
int ret, secs = CF_TICKS_PER_HOUR*hours, criterion, overdue;
time_t now = time(NULL),lsea = -1, tthen, then;
- char name[CF_BUFSIZE],hostname[CF_BUFSIZE],datebuf[CF_MAXVARSIZE];
+ char name[CF_BUFSIZE],hostname[CF_BUFSIZE],datebuf[CF_BUFSIZE];
char addr[CF_BUFSIZE],type[CF_BUFSIZE];
struct QPoint entry;
double average = 0.0, var = 0.0, ticksperminute = 60.0;

View File

@ -1,11 +0,0 @@
--- src/scli.c
+++ src/scli.c
@@ -58,6 +58,8 @@
}
+ptr=VSCLI;
+
if (!GetLock(ASUniqueName("scli"),CF_SCLI_COMM,ptr->ifelapsed,ptr->expireafter,VUQNAME,CFSTARTTIME))
{
ptr->done = 'y';

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c123bb04b6109f223518e6813c8dc4e5eb68f20b0f9f5108765aa4c27d4ec257
size 3203512

View File

@ -1,15 +1,15 @@
--- src/filedir.c
+++ src/filedir.c
@@ -126,7 +126,7 @@
int amroot = true, fixmode = true, docompress=false;
unsigned char digest[EVP_MAX_MD_SIZE+1];
@@ -127,7 +127,7 @@
unsigned char digest1[EVP_MAX_MD_SIZE+1];
unsigned char digest2[EVP_MAX_MD_SIZE+1];
-#if defined HAVE_CHFLAGS
+#if defined HAVE_CHFLAGS && ! defined __linux__
u_long newflags;
#endif
@@ -146,7 +146,7 @@
@@ -149,7 +149,7 @@
Debug("%s: Checking fs-object %s\n",VPREFIX,file);
@ -17,17 +17,17 @@
+#if defined HAVE_CHFLAGS && ! defined __linux__
if (ptr != NULL)
{
Debug("CheckExistingFile(+%o,-%o,+%o,-%o)\n",plus,minus,ptr->plus_flags,ptr->minus_flags);
@@ -380,7 +380,7 @@
Debug("CheckExistingFile(+%o,-%o,+%o,-%o)\n",ptr->plus,ptr->minus,ptr->plus_flags,ptr->minus_flags);
@@ -409,7 +409,7 @@
}
}
-#ifndef HAVE_CHFLAGS
+#if ! defined HAVE_CHFLAGS || defined __linux__
if (((newperm & 07777) == (dstat->st_mode & 07777)) && (action != touch)) /* file okay */
+#if ! defined HAVE_CHFLAGS || defined __linux__
if (((newperm & 07777) == (dstat->st_mode & 07777)) && (ptr->action != touch)) /* file okay */
{
Debug("File okay, newperm = %o, stat = %o\n",(newperm & 07777),(dstat->st_mode & 07777));
@@ -529,7 +529,7 @@
@@ -564,7 +564,7 @@
}

View File

@ -0,0 +1,22 @@
--- src/cf.defs.h
+++ src/cf.defs.h
@@ -457,7 +457,7 @@
/*****************************************************************************/
#define CF_GRAINS 64
-#define ATTR 11
+#define ATTR 20
#define CF_NETATTR 7 /* icmp udp dns tcpsyn tcpfin tcpack */
#define PH_LIMIT 10
#define CF_WEEK (7.0*24.0*3600.0)
--- src/instrument.c
+++ src/instrument.c
@@ -523,7 +523,7 @@
tthen = (time_t)then;
- snprintf(datebuf,CF_BUFSIZE-1,"%s",ctime(&tthen));
+ snprintf(datebuf,sizeof(datebuf),"%s",ctime(&tthen));
datebuf[strlen(datebuf)-9] = '\0'; /* Chop off second and year */
snprintf(addr,15,"%s",hostname+1);

3
cfengine-2.2.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8f349811785beb158ba5e1340289b89ebfa4b3a0b1bbea7cdffc5205f5cc6779
size 3340487

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Nov 21 14:54:35 CET 2007 - anicka@suse.cz
- update to 2.2.2
* changes in build procedure, libtoolizing
* beginning of an integrated auditing system added
* SCLI interface modifications
- fix init scripts (remove X-United-Linux headers,
add dependency to $remote_fs)
-------------------------------------------------------------------
Tue Jul 3 08:43:03 CEST 2007 - anicka@suse.cz

View File

@ -1,5 +1,5 @@
#
# spec file for package cfengine (Version 2.2.1)
# spec file for package cfengine (Version 2.2.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -14,11 +14,11 @@ Name: cfengine
BuildRequires: bison db-devel flex openssl-devel
License: GPL v2 or later
Group: Productivity/Networking/System
Autoreqprov: on
Version: 2.2.1
Release: 4
AutoReqProv: on
Version: 2.2.2
Release: 1
Summary: A Tool to Maintain Complicated Networks
URL: http://www.iu.hio.no/cfengine/
Url: http://www.cfengine.org/
Source: %{name}-%{version}.tar.bz2
Source2: cfenvd
Source3: cfexecd
@ -29,7 +29,6 @@ Patch4: %{name}-%{version}-automake.dif
Patch5: %{name}-%{version}-strict-aliasing-fix.diff
Patch7: %{name}-%{version}-printf.diff
Patch9: %{name}-%{version}-overflow.diff
Patch10: %{name}-%{version}-uninitialized.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %install_info_prereq
@ -53,7 +52,6 @@ Authors:
%patch5
%patch7
%patch9
%patch10
%build
%{suse_update_config -f}
@ -61,6 +59,7 @@ autoreconf -fi
CC=gcc CFLAGS="$RPM_OPT_FLAGS" \
./configure --prefix=/usr \
--with-docs \
--libdir=%{_libdir} \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
--datadir=%{_defaultdocdir}
@ -73,6 +72,7 @@ install -m 744 %{S:2} %{S:3} %{S:4} $RPM_BUILD_ROOT/etc/init.d/
ln -sf ../../etc/init.d/cfenvd $RPM_BUILD_ROOT/%{_sbindir}/rccfenvd
ln -sf ../../etc/init.d/cfexecd $RPM_BUILD_ROOT/%{_sbindir}/rccfexecd
ln -sf ../../etc/init.d/cfservd $RPM_BUILD_ROOT/%{_sbindir}/rccfservd
sed -i 's@-L/usr/src/packages/BUILD/cfengine-2.2.2/pub@@' $RPM_BUILD_ROOT/%{_libdir}/libcfengine.la
%clean
[ -d %{buildroot} -a "%{buildroot}" != "" ] && rm -rf %{buildroot}
@ -88,15 +88,27 @@ ln -sf ../../etc/init.d/cfservd $RPM_BUILD_ROOT/%{_sbindir}/rccfservd
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}-Tutorial.info.gz
%insserv_cleanup
%preun
%stop_on_removal /etc/init.d/cfenvd
%stop_on_removal /etc/init.d/cfservd
%stop_on_removal /etc/init.d/cfexecd
%files
%defattr(-,root,root)
%doc AUTHORS ChangeLog NEWS README COPYING TODO inputs/*.example
/usr/sbin/*
%{_libdir}/*
%doc %{_mandir}/man?/*
%doc %{_infodir}/*.info*
%attr(0755,root,root) %config /etc/init.d/*
%changelog
* Wed Nov 21 2007 - anicka@suse.cz
- update to 2.2.2
* changes in build procedure, libtoolizing
* beginning of an integrated auditing system added
* SCLI interface modifications
- fix init scripts (remove X-United-Linux headers,
add dependency to $remote_fs)
* Tue Jul 03 2007 - anicka@suse.cz
- add %%insserv_cleanup to %%postun
* Tue Jun 12 2007 - anicka@suse.cz

8
cfenvd
View File

@ -13,10 +13,10 @@
#
### BEGIN INIT INFO
# Provides: cfenvd
# Required-Start: $local_fs
# X-UnitedLinux-Should-Start: $time sendmail
# Required-Stop: $local_fs
# X-UnitedLinux-Should-Stop: $time sendmail
# Required-Start: $local_fs $remote_fs
# Should-Start: $time sendmail
# Required-Stop: $local_fs $emote_fs
# Should-Stop: $time sendmail
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: cfenvd daemon for collecting random events

View File

@ -13,10 +13,10 @@
#
### BEGIN INIT INFO
# Provides: cfexecd
# Required-Start: $local_fs
# X-UnitedLinux-Should-Start: $time sendmail
# Required-Stop: $local_fs
# X-UnitedLinux-Should-Stop: $time sendmail
# Required-Start: $local_fs $remote_fs
# Should-Start: $time sendmail
# Required-Stop: $local_fs $remote_fs
# Should-Stop: $time sendmail
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: cfexecd daemon is a wrapper for local execution of cfagent

View File

@ -13,10 +13,10 @@
#
### BEGIN INIT INFO
# Provides: cfservd
# Required-Start: $local_fs
# X-UnitedLinux-Should-Start: $time sendmail
# Required-Stop: $local_fs
# X-UnitedLinux-Should-Stop: $time sendmail
# Required-Start: $local_fs $remote_fs
# Should-Start: $time sendmail
# Required-Stop: $local_fs $remote_fs
# Should-Stop: $time sendmail
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: cfservd daemon for starting cfengine remotely