From 1376ff3837c370876c63cc8e06602823064ff3f2cd35eaf377a6aacd62a8d7e9 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 27 Jun 2008 17:57:44 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cfengine?expand=0&rev=10 --- cfengine-2.2.3.tar.bz2 | 3 - ...utomake.dif => cfengine-2.2.7-automake.dif | 0 ...-chflags.dif => cfengine-2.2.7-chflags.dif | 16 +-- ...-2.2.3-ia64.dif => cfengine-2.2.7-ia64.dif | 0 ...rflow.diff => cfengine-2.2.7-overflow.diff | 8 +- ...-printf.diff => cfengine-2.2.7-printf.diff | 2 +- ...=> cfengine-2.2.7-strict-aliasing-fix.diff | 6 +- cfengine-2.2.7.tar.bz2 | 3 + cfengine.changes | 14 ++ cfengine.spec | 126 +++++++++--------- 10 files changed, 97 insertions(+), 81 deletions(-) delete mode 100644 cfengine-2.2.3.tar.bz2 rename cfengine-2.2.3-automake.dif => cfengine-2.2.7-automake.dif (100%) rename cfengine-2.2.3-chflags.dif => cfengine-2.2.7-chflags.dif (73%) rename cfengine-2.2.3-ia64.dif => cfengine-2.2.7-ia64.dif (100%) rename cfengine-2.2.3-overflow.diff => cfengine-2.2.7-overflow.diff (81%) rename cfengine-2.2.3-printf.diff => cfengine-2.2.7-printf.diff (97%) rename cfengine-2.2.3-strict-aliasing-fix.diff => cfengine-2.2.7-strict-aliasing-fix.diff (94%) create mode 100644 cfengine-2.2.7.tar.bz2 diff --git a/cfengine-2.2.3.tar.bz2 b/cfengine-2.2.3.tar.bz2 deleted file mode 100644 index e7c0e80..0000000 --- a/cfengine-2.2.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:518bbd0a6a035b993d0cfbe0ede217b106122f41a1d2bfeda9b99a4084fe3518 -size 3350469 diff --git a/cfengine-2.2.3-automake.dif b/cfengine-2.2.7-automake.dif similarity index 100% rename from cfengine-2.2.3-automake.dif rename to cfengine-2.2.7-automake.dif diff --git a/cfengine-2.2.3-chflags.dif b/cfengine-2.2.7-chflags.dif similarity index 73% rename from cfengine-2.2.3-chflags.dif rename to cfengine-2.2.7-chflags.dif index ac7e07c..5a3ae46 100644 --- a/cfengine-2.2.3-chflags.dif +++ b/cfengine-2.2.7-chflags.dif @@ -1,33 +1,33 @@ --- src/filedir.c +++ src/filedir.c -@@ -127,7 +127,7 @@ - unsigned char digest1[EVP_MAX_MD_SIZE+1]; +@@ -128,7 +128,7 @@ unsigned char digest2[EVP_MAX_MD_SIZE+1]; + enum fileactions action = ptr->action; -#if defined HAVE_CHFLAGS +#if defined HAVE_CHFLAGS && ! defined __linux__ u_long newflags; #endif -@@ -149,7 +149,7 @@ +@@ -150,7 +150,7 @@ Debug("%s: Checking fs-object %s\n",VPREFIX,file); - + -#if defined HAVE_CHFLAGS +#if defined HAVE_CHFLAGS && ! defined __linux__ if (ptr != NULL) { Debug("CheckExistingFile(+%o,-%o,+%o,-%o)\n",ptr->plus,ptr->minus,ptr->plus_flags,ptr->minus_flags); -@@ -409,7 +409,7 @@ +@@ -417,7 +417,7 @@ } } -#ifndef HAVE_CHFLAGS -+#if ! defined HAVE_CHFLAGS || defined __linux__ - if (((newperm & 07777) == (dstat->st_mode & 07777)) && (ptr->action != touch)) /* file okay */ ++#if ! defined HAVE_CHFLAGS || defined __linux__ + if (((newperm & 07777) == (dstat->st_mode & 07777)) && (action != touch)) /* file okay */ { Debug("File okay, newperm = %o, stat = %o\n",(newperm & 07777),(dstat->st_mode & 07777)); -@@ -564,7 +564,7 @@ +@@ -572,7 +572,7 @@ } diff --git a/cfengine-2.2.3-ia64.dif b/cfengine-2.2.7-ia64.dif similarity index 100% rename from cfengine-2.2.3-ia64.dif rename to cfengine-2.2.7-ia64.dif diff --git a/cfengine-2.2.3-overflow.diff b/cfengine-2.2.7-overflow.diff similarity index 81% rename from cfengine-2.2.3-overflow.diff rename to cfengine-2.2.7-overflow.diff index 4c7fc80..8061031 100644 --- a/cfengine-2.2.3-overflow.diff +++ b/cfengine-2.2.7-overflow.diff @@ -1,8 +1,8 @@ --- src/cf.defs.h +++ src/cf.defs.h -@@ -456,7 +456,7 @@ - /*****************************************************************************/ - +@@ -462,7 +462,7 @@ + #define CF_PERSISTENCE 30 + #define LDT_BUFSIZE 10 #define CF_GRAINS 64 -#define ATTR 11 +#define ATTR 20 @@ -11,7 +11,7 @@ #define CF_WEEK (7.0*24.0*3600.0) --- src/instrument.c +++ src/instrument.c -@@ -523,7 +523,7 @@ +@@ -547,7 +547,7 @@ tthen = (time_t)then; diff --git a/cfengine-2.2.3-printf.diff b/cfengine-2.2.7-printf.diff similarity index 97% rename from cfengine-2.2.3-printf.diff rename to cfengine-2.2.7-printf.diff index 35897cc..3534fbe 100644 --- a/cfengine-2.2.3-printf.diff +++ b/cfengine-2.2.7-printf.diff @@ -11,7 +11,7 @@ return false; --- src/functions.c +++ src/functions.c -@@ -983,7 +983,7 @@ +@@ -984,7 +984,7 @@ if (list->next != NULL && list->next->name != NULL) { diff --git a/cfengine-2.2.3-strict-aliasing-fix.diff b/cfengine-2.2.7-strict-aliasing-fix.diff similarity index 94% rename from cfengine-2.2.3-strict-aliasing-fix.diff rename to cfengine-2.2.7-strict-aliasing-fix.diff index 9f84449..c3306ac 100644 --- a/cfengine-2.2.3-strict-aliasing-fix.diff +++ b/cfengine-2.2.7-strict-aliasing-fix.diff @@ -11,7 +11,7 @@ struct Image ip; char stamp[CF_BUFSIZE]; time_t STAMPNOW; -@@ -435,7 +439,7 @@ +@@ -436,7 +440,7 @@ ip.plus = CF_SAMEMODE; ip.minus = CF_SAMEMODE; ip.uid = &fakeuid; @@ -20,7 +20,7 @@ ip.action = "do"; ip.recurse = 0; ip.type = 't'; -@@ -858,6 +862,10 @@ +@@ -869,6 +873,10 @@ { struct stat frombuf,tobuf; char saved[CF_BUFSIZE], *lastnode; struct UidList fakeuid; @@ -31,7 +31,7 @@ struct Image ip; char stamp[CF_BUFSIZE]; time_t STAMPNOW; -@@ -888,7 +896,7 @@ +@@ -899,7 +907,7 @@ ip.plus = CF_SAMEMODE; ip.minus = CF_SAMEMODE; ip.uid = &fakeuid; diff --git a/cfengine-2.2.7.tar.bz2 b/cfengine-2.2.7.tar.bz2 new file mode 100644 index 0000000..853f9fb --- /dev/null +++ b/cfengine-2.2.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a2f36b605556e571290d129e0431398a6616850431e03435e2566a6afe6d216 +size 850479 diff --git a/cfengine.changes b/cfengine.changes index 702c6a7..89cad99 100644 --- a/cfengine.changes +++ b/cfengine.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Jun 27 17:14:56 CEST 2008 - anicka@suse.cz + +- update to 2.2.7 + * Xen detection + * Sensor code added for linux cfenvd + * Documentation is no longer distributed in the tarball + * rxdirs= added to files. Default is false. If set to true, + cfengine will not assume that x-bits should be set when r is + set on directory permissions. + * Group initialization to popen, so shellcommands groups are + consistent with uid login id + * bugfixes + ------------------------------------------------------------------- Tue Jan 15 14:37:49 CET 2008 - anicka@suse.cz diff --git a/cfengine.spec b/cfengine.spec index 20a8ed5..252e6a3 100644 --- a/cfengine.spec +++ b/cfengine.spec @@ -1,5 +1,5 @@ # -# spec file for package cfengine (Version 2.2.3) +# spec file for package cfengine (Version 2.2.7) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,12 +10,13 @@ # norootforbuild + Name: cfengine BuildRequires: bison db-devel flex openssl-devel License: GPL v2 or later Group: Productivity/Networking/System AutoReqProv: on -Version: 2.2.3 +Version: 2.2.7 Release: 1 Summary: A Tool to Maintain Complicated Networks Url: http://www.cfengine.org/ @@ -30,7 +31,6 @@ Patch5: %{name}-%{version}-strict-aliasing-fix.diff Patch7: %{name}-%{version}-printf.diff Patch9: %{name}-%{version}-overflow.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %install_info_prereq %description GNU cfengine is an abstract programming language for system @@ -78,15 +78,7 @@ rm $RPM_BUILD_ROOT/%{_libdir}/libcfengine.a %clean [ -d %{buildroot} -a "%{buildroot}" != "" ] && rm -rf %{buildroot} -%post -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}-Anomalies.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}-Reference.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}-Tutorial.info.gz - %postun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}-Anomalies.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}-Reference.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}-Tutorial.info.gz %insserv_cleanup %preun @@ -99,11 +91,21 @@ rm $RPM_BUILD_ROOT/%{_libdir}/libcfengine.a %doc AUTHORS ChangeLog NEWS README COPYING TODO inputs/*.example /usr/sbin/* %doc %{_mandir}/man?/* -%doc %{_infodir}/*.info* %attr(0755,root,root) %config /etc/init.d/* %changelog -* Tue Jan 15 2008 - anicka@suse.cz +* Fri Jun 27 2008 anicka@suse.cz +- update to 2.2.7 + * Xen detection + * Sensor code added for linux cfenvd + * Documentation is no longer distributed in the tarball + * rxdirs= added to files. Default is false. If set to true, + cfengine will not assume that x-bits should be set when r is + set on directory permissions. + * Group initialization to popen, so shellcommands groups are + consistent with uid login id + * bugfixes +* Tue Jan 15 2008 anicka@suse.cz - update to 2.2.3 * minor tweaks and bug fixes * IgnoreInterfaceRegex( "vm.*" ) added to control @@ -115,19 +117,19 @@ rm $RPM_BUILD_ROOT/%{_libdir}/libcfengine.a * cfenvgraph --erasehistory users,www_in etc will now set the average and variance of learned cfenvd data to zero. * audit=true/false flag added to most actions -* Mon Nov 26 2007 - anicka@suse.cz +* Mon Nov 26 2007 anicka@suse.cz - remove .a and .la file from the package, fix debuginfo package building -* Wed Nov 21 2007 - anicka@suse.cz +* 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 +* Tue Jul 03 2007 anicka@suse.cz - add %%insserv_cleanup to %%postun -* Tue Jun 12 2007 - anicka@suse.cz +* Tue Jun 12 2007 anicka@suse.cz - update to 2.2.1 * scli: type section added. * Code refactoring for package management. @@ -137,11 +139,11 @@ rm $RPM_BUILD_ROOT/%{_libdir}/libcfengine.a - fix overflowing buffer, uninitialized variable and other minor problems - remove -configure.diff, fixed in upstream -* Fri Apr 20 2007 - aj@suse.de +* Fri Apr 20 2007 aj@suse.de - Cleanup build requires. -* Fri Mar 30 2007 - stbinner@suse.de +* Fri Mar 30 2007 stbinner@suse.de - add bison and flex to build requires -* Fri Feb 02 2007 - anicka@suse.cz +* Fri Feb 02 2007 anicka@suse.cz - update to 2.1.22 * cfshow output formatting changes * database internal format changes @@ -156,110 +158,110 @@ rm $RPM_BUILD_ROOT/%{_libdir}/libcfengine.a * Encryption level added for full encryption of opendir traffic. Must set FullEncryption = ( true ) in control for compatability * bugfixes -* Wed Oct 18 2006 - anicka@suse.cz +* Wed Oct 18 2006 anicka@suse.cz - fix array subscript out of range (#211160) -* Thu Sep 21 2006 - anicka@suse.cz +* Thu Sep 21 2006 anicka@suse.cz - update to 2.1.21 * copy action now supports this $(this) variable * PH support removed from cfenvd during code rationalization * ReturnsZeroShell function added * Cfenvd code rationalization and channge in database format * bugfixes -* Fri Jun 16 2006 - schwab@suse.de +* Fri Jun 16 2006 schwab@suse.de - Fix syntax error in configure script. -* Fri May 19 2006 - anicka@suse.cz +* Fri May 19 2006 anicka@suse.cz - update to 2.1.20: - various minor bugfixes added -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Thu Jan 05 2006 - anicka@suse.cz +* Thu Jan 05 2006 anicka@suse.cz - update to 2.1.17 -* Tue Nov 15 2005 - anicka@suse.cz +* Tue Nov 15 2005 anicka@suse.cz - update to 2.1.17 - remove CAN-2005-2960 patch (affected file removed by upstream) -* Fri Oct 07 2005 - schwab@suse.de +* Fri Oct 07 2005 schwab@suse.de - Don't strip binaries. -* Wed Oct 05 2005 - anicka@suse.cz +* Wed Oct 05 2005 anicka@suse.cz - fix too few arguments to a *printf function -* Tue Oct 04 2005 - anicka@suse.cz +* Tue Oct 04 2005 anicka@suse.cz - fix CAN-2005-2960 vulnerability (#120075) - update to 2.1.16 -* Mon Aug 01 2005 - anicka@suse.cz +* Mon Aug 01 2005 anicka@suse.cz - update to 2.1.15 -* Fri Apr 22 2005 - postadal@suse.cz +* Fri Apr 22 2005 postadal@suse.cz - updated to version 2.1.14 -* Sun Feb 13 2005 - ro@suse.de +* Sun Feb 13 2005 ro@suse.de - added libpng to nfb (for tetex) -* Thu Feb 03 2005 - postadal@suse.cz +* Thu Feb 03 2005 postadal@suse.cz - updated to version 2.1.13 - added init scripts (cfenvd, cfexecd, cfservd) -* Tue Aug 17 2004 - postadal@suse.cz +* Tue Aug 17 2004 postadal@suse.cz - updated to version 2.1.9 -* Wed Feb 18 2004 - postadal@suse.cz +* Wed Feb 18 2004 postadal@suse.cz - updated to version 2.1.3 - removed obsoleted patch db.dif - fixed code that broke strict aliasing -* Fri Jan 23 2004 - ro@suse.de +* Fri Jan 23 2004 ro@suse.de - fix build with current automake use another method to pass flags to MAKEINFOHTML -* Sat Jan 10 2004 - adrian@suse.de +* Sat Jan 10 2004 adrian@suse.de - build as user -* Wed Aug 06 2003 - postadal@suse.cz +* Wed Aug 06 2003 postadal@suse.cz - updated to version 2.0.7p3 - removed obsoleted patch (info.diff) -* Mon May 12 2003 - ro@suse.de +* Mon May 12 2003 ro@suse.de - fix build with db-4.1 - fix compile: chflags function available does not mean struct stat has st_flags -* Thu Apr 24 2003 - ro@suse.de +* Thu Apr 24 2003 ro@suse.de - fix install_info --delete call and move from preun to postun -* Wed Feb 26 2003 - postadal@suse.cz +* Wed Feb 26 2003 postadal@suse.cz - used install-info macros - fixed Anomalies.texinfo (dir entry) -* Tue Sep 17 2002 - ro@suse.de +* Tue Sep 17 2002 ro@suse.de - removed bogus self-provides -* Wed Jul 31 2002 - postadal@suse.cz +* Thu Aug 01 2002 postadal@suse.cz - update to version 2.0.3 * Hpux config changes * new options * new list in cfservd.conf * a lot of fixes -* Fri Nov 23 2001 - cihlar@suse.cz +* Fri Nov 23 2001 cihlar@suse.cz - added Url: -* Mon Nov 05 2001 - cihlar@suse.cz +* Mon Nov 05 2001 cihlar@suse.cz - fixed to compile with automake 1.5 -* Mon Apr 23 2001 - cihlar@suse.cz +* Mon Apr 23 2001 cihlar@suse.cz - fixed warnings on ia64 -* Tue Mar 06 2001 - cihlar@suse.cz +* Tue Mar 06 2001 cihlar@suse.cz - update to version 1.6.3 -* Mon Oct 30 2000 - cihlar@suse.cz +* Mon Oct 30 2000 cihlar@suse.cz - update to version 1.6.0.a13 - bzipped sources -* Tue Oct 03 2000 - cihlar@suse.cz +* Tue Oct 03 2000 cihlar@suse.cz - update to version 1.6.0.a11 -* Mon May 15 2000 - cihlar@suse.cz +* Mon May 15 2000 cihlar@suse.cz - Group sorted - %%{_defaultdocdir} instead of /usr/doc/packages -* Mon Apr 10 2000 - bk@suse.de +* Tue Apr 11 2000 bk@suse.de - added suse update config macro -* Tue Apr 04 2000 - cihlar@suse.cz +* Tue Apr 04 2000 cihlar@suse.cz - upgrade to version 1.5.4 - added BuildRoot -* Mon Jan 17 2000 - ro@suse.de +* Mon Jan 17 2000 ro@suse.de - update to 1.5.3 , man, info to /usr/share -* Mon Sep 13 1999 - bs@suse.de +* Mon Sep 13 1999 bs@suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Wed Sep 01 1999 - ro@suse.de +* Wed Sep 01 1999 ro@suse.de - update to 1.5.1 / specfile cleanup -* Tue Sep 22 1998 - ro@suse.de +* Tue Sep 22 1998 ro@suse.de - update to 1.4.12 -* Mon Mar 02 1998 - florian@suse.de +* Mon Mar 02 1998 florian@suse.de - update to release 1.4.10 -* Fri Oct 10 1997 - florian@suse.de +* Fri Oct 10 1997 florian@suse.de - update to release 1.4.8a -* Mon Jul 07 1997 - florian@suse.de +* Mon Jul 07 1997 florian@suse.de - update to release 1.4.0 -* Thu Jan 02 1997 - florian@suse.de +* Thu Jan 02 1997 florian@suse.de - update to newest version 1.3.16 -* Thu Jan 02 1997 - florian@suse.de +* Thu Jan 02 1997 florian@suse.de - Update auf neue Version 1.3.12.