From caba5272421d4636a23efb11566716bf41c9b9fe2968ea93e197e666d0303a31 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 12 Jun 2007 16:29:26 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cfengine?expand=0&rev=5 --- cfengine-2.1.22-configure.diff | 27 ------------------- cfengine-2.1.22-overflow.diff | 11 -------- cfengine-2.1.22-printf.diff | 11 -------- cfengine-2.1.22.tar.bz2 | 3 --- ...utomake.dif => cfengine-2.2.1-automake.dif | 6 ++--- ...-chflags.dif => cfengine-2.2.1-chflags.dif | 10 +++---- ...2.1.22-ia64.dif => cfengine-2.2.1-ia64.dif | 2 +- cfengine-2.2.1-overflow.diff | 22 +++++++++++++++ cfengine-2.2.1-printf.diff | 22 +++++++++++++++ ...=> cfengine-2.2.1-strict-aliasing-fix.diff | 0 cfengine-2.2.1-uninitialized.diff | 11 ++++++++ cfengine-2.2.1.tar.bz2 | 3 +++ cfengine.changes | 13 +++++++++ cfengine.spec | 20 ++++++++++---- 14 files changed, 95 insertions(+), 66 deletions(-) delete mode 100644 cfengine-2.1.22-configure.diff delete mode 100644 cfengine-2.1.22-overflow.diff delete mode 100644 cfengine-2.1.22-printf.diff delete mode 100644 cfengine-2.1.22.tar.bz2 rename cfengine-2.1.22-automake.dif => cfengine-2.2.1-automake.dif (69%) rename cfengine-2.1.22-chflags.dif => cfengine-2.2.1-chflags.dif (91%) rename cfengine-2.1.22-ia64.dif => cfengine-2.2.1-ia64.dif (93%) create mode 100644 cfengine-2.2.1-overflow.diff create mode 100644 cfengine-2.2.1-printf.diff rename cfengine-2.1.22-strict-aliasing-fix.diff => cfengine-2.2.1-strict-aliasing-fix.diff (100%) create mode 100644 cfengine-2.2.1-uninitialized.diff create mode 100644 cfengine-2.2.1.tar.bz2 diff --git a/cfengine-2.1.22-configure.diff b/cfengine-2.1.22-configure.diff deleted file mode 100644 index 351177c..0000000 --- a/cfengine-2.1.22-configure.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -375,7 +375,7 @@ - CPPFLAGS="$CPPFLAGS -I$d/include" - LDFLAGS="$LDFLAGS -L$d/lib" - PCRE_LIB="-lpcreposix" -- AC_MSG_RESULT = "$d" -+ AC_MSG_RESULT($d) - break - fi - done -@@ -386,13 +386,13 @@ - if test -f "${withval}/include/pcreposix.h" ; then - CPPFLAGS="$CPPFLAGS -I${withval}/include" - LDFLAGS="$LDFLAGS -L${withval}/lib" -- AC_MSG_RESULT = "${withval}" -+ AC_MSG_RESULT(${withval}) - else - AC_MSG_ERROR(Cannot find PCRE) - fi - fi - else -- AC_MSG_RESULT = "yes" -+ AC_MSG_RESULT(yes) - fi - LIBS="$LIBS -lpcreposix" - AC_DEFINE(USE_PCRE, 1, [Define if PCRE is available.]) diff --git a/cfengine-2.1.22-overflow.diff b/cfengine-2.1.22-overflow.diff deleted file mode 100644 index 549ac91..0000000 --- a/cfengine-2.1.22-overflow.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/cf.defs.h -+++ src/cf.defs.h -@@ -409,7 +409,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) diff --git a/cfengine-2.1.22-printf.diff b/cfengine-2.1.22-printf.diff deleted file mode 100644 index b323d80..0000000 --- a/cfengine-2.1.22-printf.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/edittools.c -+++ src/edittools.c -@@ -1443,7 +1443,7 @@ - { - if (ptr->warn == 'y') - { -- snprintf(OUTPUT,CF_BUFSIZE,"File %s did not exist and was marked for editing"); -+ snprintf(OUTPUT,CF_BUFSIZE,"File %s did not exist and was marked for editing",fname); - CfLog(cferror,OUTPUT,""); - } - return false; diff --git a/cfengine-2.1.22.tar.bz2 b/cfengine-2.1.22.tar.bz2 deleted file mode 100644 index b9a7b6f..0000000 --- a/cfengine-2.1.22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:489f7f0bdbc16c14c21fd211c2208bda03980778cf54dc9415b479993aea4ff6 -size 3177876 diff --git a/cfengine-2.1.22-automake.dif b/cfengine-2.2.1-automake.dif similarity index 69% rename from cfengine-2.1.22-automake.dif rename to cfengine-2.2.1-automake.dif index 03121f3..3c1bb36 100644 --- a/cfengine-2.1.22-automake.dif +++ b/cfengine-2.2.1-automake.dif @@ -1,10 +1,10 @@ --- doc/Makefile.am +++ doc/Makefile.am -@@ -7,6 +7,7 @@ +@@ -11,6 +11,7 @@ + htmldir = $(pkgdatadir)/html - htmlfiles = cfengine-Reference.html cfengine-Tutorial.html html_DATA = $(htmlfiles) +AM_MAKEINFOHTMLFLAGS = --no-split # Info used in building and installing Postscript files - ps1 = + psfiles = $(info_TEXINFOS:.texinfo=.ps) diff --git a/cfengine-2.1.22-chflags.dif b/cfengine-2.2.1-chflags.dif similarity index 91% rename from cfengine-2.1.22-chflags.dif rename to cfengine-2.2.1-chflags.dif index 7d88739..a4afa62 100644 --- a/cfengine-2.1.22-chflags.dif +++ b/cfengine-2.2.1-chflags.dif @@ -1,6 +1,6 @@ --- src/filedir.c +++ src/filedir.c -@@ -276,7 +276,7 @@ +@@ -126,7 +126,7 @@ int amroot = true, fixmode = true, docompress=false; unsigned char digest[EVP_MAX_MD_SIZE+1]; @@ -9,7 +9,7 @@ u_long newflags; #endif -@@ -294,7 +294,7 @@ +@@ -146,7 +146,7 @@ Debug("%s: Checking fs-object %s\n",VPREFIX,file); @@ -18,7 +18,7 @@ if (ptr != NULL) { Debug("CheckExistingFile(+%o,-%o,+%o,-%o)\n",plus,minus,ptr->plus_flags,ptr->minus_flags); -@@ -512,7 +512,7 @@ +@@ -380,7 +380,7 @@ } } @@ -27,9 +27,9 @@ 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)); -@@ -661,7 +661,7 @@ +@@ -529,7 +529,7 @@ } - + -#if defined HAVE_CHFLAGS /* BSD special flags */ +#if defined HAVE_CHFLAGS && ! defined __linux__ /* BSD special flags */ diff --git a/cfengine-2.1.22-ia64.dif b/cfengine-2.2.1-ia64.dif similarity index 93% rename from cfengine-2.1.22-ia64.dif rename to cfengine-2.2.1-ia64.dif index b7a4f99..8fe83fa 100644 --- a/cfengine-2.1.22-ia64.dif +++ b/cfengine-2.2.1-ia64.dif @@ -1,6 +1,6 @@ --- src/crypto.c +++ src/crypto.c -@@ -291,7 +291,7 @@ +@@ -290,7 +290,7 @@ Verbose("...\n"); diff --git a/cfengine-2.2.1-overflow.diff b/cfengine-2.2.1-overflow.diff new file mode 100644 index 0000000..6d718a6 --- /dev/null +++ b/cfengine-2.2.1-overflow.diff @@ -0,0 +1,22 @@ +--- 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; diff --git a/cfengine-2.2.1-printf.diff b/cfengine-2.2.1-printf.diff new file mode 100644 index 0000000..91de3f3 --- /dev/null +++ b/cfengine-2.2.1-printf.diff @@ -0,0 +1,22 @@ +--- src/edittools.c ++++ src/edittools.c +@@ -1355,7 +1355,7 @@ + { + if (ptr->warn == 'y') + { +- snprintf(OUTPUT,CF_BUFSIZE,"File %s did not exist and was marked for editing"); ++ snprintf(OUTPUT,CF_BUFSIZE,"File %s did not exist and was marked for editing",fname); + CfLog(cferror,OUTPUT,""); + } + return false; +--- src/functions.c ++++ src/functions.c +@@ -937,7 +937,7 @@ + + if (list->next != NULL && list->next->name != NULL) + { +- Debug("Setting %s[%s] = %s\n",lvalue,list->next->name); ++ Debug("Setting %s = %s\n",lvalue,list->next->name); + InstallControlRValue(lvalue,list->next->name); + } + else diff --git a/cfengine-2.1.22-strict-aliasing-fix.diff b/cfengine-2.2.1-strict-aliasing-fix.diff similarity index 100% rename from cfengine-2.1.22-strict-aliasing-fix.diff rename to cfengine-2.2.1-strict-aliasing-fix.diff diff --git a/cfengine-2.2.1-uninitialized.diff b/cfengine-2.2.1-uninitialized.diff new file mode 100644 index 0000000..205b1de --- /dev/null +++ b/cfengine-2.2.1-uninitialized.diff @@ -0,0 +1,11 @@ +--- 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'; diff --git a/cfengine-2.2.1.tar.bz2 b/cfengine-2.2.1.tar.bz2 new file mode 100644 index 0000000..962e482 --- /dev/null +++ b/cfengine-2.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c123bb04b6109f223518e6813c8dc4e5eb68f20b0f9f5108765aa4c27d4ec257 +size 3203512 diff --git a/cfengine.changes b/cfengine.changes index 8b93b40..5358b1a 100644 --- a/cfengine.changes +++ b/cfengine.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Jun 12 15:16:50 CEST 2007 - anicka@suse.cz + +- update to 2.2.1 + * scli: type section added. + * Code refactoring for package management. + * Bug fixes for problems introduced in 2.2.0. + * structural internal changes that ease the eventual + confluence with cfengine 3 +- fix overflowing buffer, uninitialized variable and + other minor problems +- remove -configure.diff, fixed in upstream + ------------------------------------------------------------------- Fri Apr 20 18:58:28 CEST 2007 - aj@suse.de diff --git a/cfengine.spec b/cfengine.spec index 031d3b8..90a8766 100644 --- a/cfengine.spec +++ b/cfengine.spec @@ -1,5 +1,5 @@ # -# spec file for package cfengine (Version 2.1.22) +# spec file for package cfengine (Version 2.2.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,8 +15,8 @@ BuildRequires: bison db-devel flex openssl-devel License: GNU General Public License (GPL) Group: Productivity/Networking/System Autoreqprov: on -Version: 2.1.22 -Release: 13 +Version: 2.2.1 +Release: 1 Summary: A Tool to Maintain Complicated Networks URL: http://www.iu.hio.no/cfengine/ Source: %{name}-%{version}.tar.bz2 @@ -28,8 +28,8 @@ Patch3: %{name}-%{version}-chflags.dif Patch4: %{name}-%{version}-automake.dif Patch5: %{name}-%{version}-strict-aliasing-fix.diff Patch7: %{name}-%{version}-printf.diff -Patch8: %{name}-%{version}-configure.diff Patch9: %{name}-%{version}-overflow.diff +Patch10: %{name}-%{version}-uninitialized.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %install_info_prereq @@ -52,8 +52,8 @@ Authors: %patch4 %patch5 %patch7 -%patch8 %patch9 +%patch10 %build %{suse_update_config -f} @@ -96,6 +96,16 @@ ln -sf ../../etc/init.d/cfservd $RPM_BUILD_ROOT/%{_sbindir}/rccfservd %attr(0755,root,root) %config /etc/init.d/* %changelog +* Tue Jun 12 2007 - anicka@suse.cz +- update to 2.2.1 + * scli: type section added. + * Code refactoring for package management. + * Bug fixes for problems introduced in 2.2.0. + * structural internal changes that ease the eventual + confluence with cfengine 3 +- fix overflowing buffer, uninitialized variable and + other minor problems +- remove -configure.diff, fixed in upstream * Fri Apr 20 2007 - aj@suse.de - Cleanup build requires. * Fri Mar 30 2007 - stbinner@suse.de