Merge pull request #454 from Lex-2008/master

master deps for 3.13.0 release

Author: vpodzime

deps-packaging/README.md

@@ -31,16 +31,16 @@ Build dependencies:
 | PostgreSQL   |         9.0.23 |          9.0.23 | removed from cfengine built packages |                          |
 
 * [zlib](http://www.zlib.net/) 1.2.11
-* [OpenSSL](http://openssl.org/) 1.1.0h
+* [OpenSSL](http://openssl.org/) 1.1.1
 * [PCRE](http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) 8.42
 * [LMDB](https://github.com/LMDB/lmdb/) 0.9.22
-* [libyaml](http://pyyaml.org/wiki/LibYAML) 0.1.7
+* [libyaml](http://pyyaml.org/wiki/LibYAML) 0.2.1
 * [libxml2](http://xmlsoft.org/sources/) 2.9.8
 * [libiconv](http://ftp.gnu.org/gnu/libiconv/) 1.15
   * Needed by libxml2
-* [libacl](http://download.savannah.gnu.org/releases/acl/) 2.2.52
-* [libattr](http://download.savannah.gnu.org/releases/attr/) 2.4.47
-* [libcurl](http://curl.haxx.se/download.html) 7.60.0
+* [libacl](http://download.savannah.gnu.org/releases/acl/) 2.2.53
+* [libattr](http://download.savannah.gnu.org/releases/attr/) 2.4.48
+* [libcurl](http://curl.haxx.se/download.html) 7.61.1
 * libgcc
   * Currently only in use on AIX, Solaris, GCC dynamically links to it in order
     to substitute missing system functions
@@ -73,13 +73,13 @@ Build dependencies:
 
 Hub specific dependencies:
 
-* [APR](https://apr.apache.org/) 1.6.3
+* [APR](https://apr.apache.org/) 1.6.5
 * [apr-util](https://apr.apache.org/) 1.6.1
-* [Apache](http://httpd.apache.org/) 2.4.33
-* [PostgreSQL](http://www.postgresql.org/) for the hub 10.4
+* [Apache](http://httpd.apache.org/) 2.4.35
+* [PostgreSQL](http://www.postgresql.org/) for the hub 11.0
 * [Redis](http://redis.io/) 3.2.11
-* [PHP](http://php.net/) 7.2.6
-* [Git](https://www.kernel.org/pub/software/scm/git/) 2.17.1
+* [PHP](http://php.net/) 7.2.11
+* [Git](https://www.kernel.org/pub/software/scm/git/) 2.19.1
 * [rsync](https://download.samba.org/pub/rsync/) 3.1.3
 
 Other dependencies (**find out why they are needed!**)

deps-packaging/apache/cfbuild-apache.spec

@@ -1,4 +1,4 @@
-%define apache_version 2.4.33
+%define apache_version 2.4.35
 %global __os_install_post %{nil}
 
 Summary: CFEngine Build Automation -- apache

deps-packaging/apache/distfiles

@@ -1 +1 @@
-e983c251062872e5caf87372776c04c0  httpd-2.4.33.tar.gz
+92ddccfbd43b533578499d1faaad17fe  httpd-2.4.35.tar.gz

deps-packaging/apr/cfbuild-apr.spec

@@ -1,4 +1,4 @@
-%define apr_version 1.6.3
+%define apr_version 1.6.5
 
 Summary: CFEngine Build Automation -- apr
 Name: cfbuild-apr

deps-packaging/apr/distfiles

@@ -1 +1 @@
-57c6cc26a31fe420c546ad2234f22db4  apr-1.6.3.tar.gz
+0759294408daace192c935b7c9e76e04  apr-1.6.5.tar.gz

deps-packaging/git/cfbuild-git.spec

@@ -1,4 +1,4 @@
-%define git_version 2.17.1
+%define git_version 2.19.1
 
 Summary: CFEngine Build Automation -- git
 Name: cfbuild-git

deps-packaging/git/distfiles

@@ -1 +1 @@
-7bd949f027363a77462971640f562d17  git-2.17.1.tar.gz
+defb7d4f311d9de4e50b7bbdd36a6610  git-2.19.1.tar.gz

deps-packaging/libacl/acl.destdir.diff.gz

@@ -1,8 +1,11 @@
+%define acl_version 2.2.53
+
 Summary: CFEngine Build Automation -- libacl
 Name: cfbuild-libacl
 Version: %{version}
 Release: 1
-Source: acl-2.2.52.src.tar.gz
+Source: acl-%{acl_version}.tar.gz
+Patch0: no_fancy_gcc.patch
 License: MIT
 Group: Other
 Url: http://example.com
@@ -14,10 +17,9 @@ AutoReqProv: no
 
 %prep
 mkdir -p %{_builddir}
-%setup -q -n acl-2.2.52
-
-zcat ../../SOURCES/acl.destdir.diff.gz | $PATCH -p1 || true
+%setup -q -n acl-%{acl_version}
 
+%patch0 -p1
 ./configure --prefix=%{prefix} --enable-gettext=no
 
 %build
@@ -27,15 +29,15 @@ make
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-make install -C getfacl DESTDIR=${RPM_BUILD_ROOT} DIST_ROOT=/
-make install-dev install-lib DESTDIR=${RPM_BUILD_ROOT} DIST_ROOT=/
+make install DESTDIR=${RPM_BUILD_ROOT}
 
 cp ${RPM_BUILD_ROOT}%{prefix}/include/sys/acl.h ${RPM_BUILD_ROOT}%{prefix}/include/
 
+rm -rf ${RPM_BUILD_ROOT}%{prefix}/share
 rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib/*.a
 rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib/*.la
-rm -rf ${RPM_BUILD_ROOT}%{prefix}/libexec
-rm -rf ${RPM_BUILD_ROOT}%{prefix}/share
+rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib/pkgconfig
+find ${RPM_BUILD_ROOT}%{prefix}/bin/ -mindepth 1 -name 'getfacl' -o -print0 | xargs -0 rm -rf
 
 %clean
 rm -rf $RPM_BUILD_ROOT

deps-packaging/libacl/cfbuild-libacl.spec

@@ -11,7 +11,7 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
-	zcat acl.destdir.diff.gz | $(PATCH) -p1 || true
+	patch -p1 -i no_fancy_gcc.patch
 
 	./configure --prefix=$(PREFIX) --enable-gettext=no
 
@@ -25,17 +25,18 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
-	make install -C getfacl DESTDIR=$(CURDIR)/debian/tmp DIST_ROOT=/
-	make install-dev install-lib DESTDIR=$(CURDIR)/debian/tmp DIST_ROOT=/
+	make install DESTDIR=$(CURDIR)/debian/tmp
 
 # configure fails because acl.h does't exist in include dir
 # it's placed by default in include/sys
 
 	cp $(CURDIR)/debian/tmp$(PREFIX)/include/sys/acl.h $(CURDIR)/debian/tmp$(PREFIX)/include/
 
+	rm -rf $(CURDIR)/debian/tmp$(PREFIX)/share
 	rm -rf $(CURDIR)/debian/tmp$(PREFIX)/lib/*.a
 	rm -rf $(CURDIR)/debian/tmp$(PREFIX)/lib/*.la
-	rm -rf $(CURDIR)/debian/tmp$(PREFIX)/libexec
+	rm -rf $(CURDIR)/debian/tmp$(PREFIX)/lib/pkgconfig
+	find $(CURDIR)/debian/tmp$(PREFIX)/bin/ -mindepth 1 -name 'getfacl' -o -print0 | xargs -0 rm -rf
 
 binary-indep: build install