Accepting request 183674 from systemsmanagement

Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/183674 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cfengine?expand=0&rev=37
2013-07-18 15:31:02 +00:00 · 2013-07-18 15:31:02 +00:00 · 012a11b6a7
commit 012a11b6a7
parent 4dbffc26a1 57a53f9dc6
5 changed files with 73 additions and 5 deletions
--- a/cfengine-3.5.0.tar.gz
+++ b/cfengine-3.5.0.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:07da213c9bf4018efca58a43d7f8991819031e076f5228cd3f2623e58d5c9cee
-size 1504817
--- a/cfengine-3.5.1.tar.gz
+++ b/cfengine-3.5.1.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d2484d5bdeaa5b6d5435b58a92a8da2bafc18294bb8eae348614e663f934429
+size 1509646
--- a/cfengine.changes
+++ b/cfengine.changes
@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Thu Jul 11 11:30:59 UTC 2013 - kkaempf@suse.com
+
+- Update to 3.5.1
+  Core Changes:
+  - the CFEngine Standard Library in masterfiles/libraries is now
+    split into promise-type specific policy files, and lives in a
+    version-specific directory. This should have no impact on current
+    code, but allows more granular include of needed stdlib
+    elements (Redmine #3044)
+  - file changes are logged with log level Notice, not Error
+
+  Bug fixes:
+  - fix recursive copying of files (Redmine #2965)
+  - respect classes in templates (Redmine ##2928)
+  - fix timestamps on Windows (Redmine #2933)
+  - fix non-root cf-agent flooding syslog (Redmine #2980)
+  - fix email flood from cf-execd due to timestamps in agent output
+    (Redmine #3011)
+  - Preserve security context when editing or copying local files
+    (Redmine #2728)
+  - fix path for sys.crontab on redhat systems (Redmine #2553)
+  - prevent incorrect "insert_lines promise uses the same
+    select_line_matching anchor" warning (Redmine #2778)
+  - Fix regression of setting VIPADDRESS to 127.0.0.1 (Redmine #3010)
+  - Fix "changes" promise not receiving status when file is missing
+    (Redmine #2820)
+  - Fix symlinks being destroyed when editing them (Redmine #2363)
+  - Fix missing "promise kept" status for the last line in a file
+    (Redmine #2943)
+
+-------------------------------------------------------------------
+Tue Jul  9 07:35:58 UTC 2013 - kkaempf@suse.com
+
+- explicitly enable postgres, pthreads, openssl, pcre, libvirt
+  and libacl
+
+- add libacl-headers.patch to adapt to libacl-devel packaging
+
 -------------------------------------------------------------------
 Thu Jun 13 06:54:57 UTC 2013 - kkaempf@suse.com

--- a/cfengine.spec
+++ b/cfengine.spec
@ -28,10 +28,12 @@ Name:           cfengine
 Summary:        CFEngine automates large-scale IT computing infrastructure
 License:        GPL-3.0
 Group:          Productivity/Networking/System
-Version:        3.5.0
+Version:        3.5.1
 Release:        0
 Url:            http://www.cfengine.org/
 Source:         %{name}-%{version}.tar.gz
+# there's no /usr/include/acl.h in SUSE
+Patch1:         libacl-headers.patch
 Source1:        http://www.cfengine.org/manuals/cf3-Reference.pdf
 Source2:        http://www.cfengine.org/manuals/cf3-conceptguide.pdf
 Source3:        http://www.cfengine.org/manuals/cf3-glossary.pdf
@ -60,14 +62,18 @@ BuildRequires:  flex
 BuildRequires:  libtokyocabinet-devel
 BuildRequires:  libtool
 BuildRequires:  libxml2-devel
+#
 # Disable mysql for SLE_11:
+#
 #   configure: error: MySQL client library exports symbols clashing with
 #   OpenSSL. Get the update from distribution provider, recompile MySQL
 #   library or disable MySQL connector. See
 #   http://bugs.mysql.com/bug.php?id=65055 for details.
+#
 %if 0%{?suse_version} != 1110
 BuildRequires:  mysql-devel
 %endif
+BuildRequires:  libacl-devel
 BuildRequires:  libvirt-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pcre-devel
@ -144,6 +150,9 @@ This package contains the files of the cfengine server.

 %prep
 %setup -q -n %{name}-%{version}
+%if 0%{?suse_version}
+%patch1 -p1
+%endif
 ##### rpmlint
 #### wrong-file-end-of-line-encoding
 #### incorrect-fsf-address
@ -152,6 +161,7 @@ find ./examples -type f -name "*.cf" -exec perl -p -i -e 's|\r\n|\n|,s|^# Founda

 %build
 autoreconf -fi
+# /usr/include/sys for acl.h
 CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
 %configure \
  --disable-static \
@ -159,7 +169,14 @@ CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
  --with-libxml2 \
  --datadir=/var \
  --docdir=%{_docdir}/%{name} \
-  --with-workdir=%{workdir}
+  --with-workdir=%{workdir} \
+  --with-postgresql \
+  --with-pthreads \
+  --with-openssl \
+  --with-pcre \
+  --with-libvirt \
+  --with-libacl \
+  --with-libxml2
 %{__make} %{?_smp_mflags}

 # --datadir=/var/lib/%%{name}/inputs \
--- a/libacl-headers.patch
+++ b/libacl-headers.patch
@ -0,0 +1,12 @@
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cfengine-3.5.0/configure.ac ./configure.ac
+--- ../orig-cfengine-3.5.0/configure.ac	2013-06-12 15:09:56.000000000 +0200
+++ ./configure.ac	2013-07-09 09:11:22.387724353 +0200
+@@ -350,7 +350,7 @@
+ if test "x$with_libacl" != xno; then
+   CF3_WITH_LIBRARY(libacl, [
+     AC_CHECK_LIB(acl, acl_init, [], [if test "x$with_libacl" != xcheck; then AC_MSG_ERROR(Cannot find libacl library); fi])
+-    AC_CHECK_HEADERS([acl.h sys/acl.h acl/libacl.h], [], [if test "x$with_libacl" != xcheck; then AC_MSG_ERROR(Cannot find libacl library headers); fi])
+    AC_CHECK_HEADERS([sys/acl.h acl/libacl.h], [], [if test "x$with_libacl" != xcheck; then AC_MSG_ERROR(Cannot find libacl library headers); fi])
+   ])
+  fi
+