Skip to content

Commit b43df80

Browse files
authored
Merge pull request #454 from Lex-2008/master
master deps for 3.13.0 release
2 parents 0196880 + cb8d329 commit b43df80

38 files changed

+215
-247
lines changed

deps-packaging/README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ Build dependencies:
3131
| PostgreSQL | 9.0.23 | 9.0.23 | removed from cfengine built packages | |
3232

3333
* [zlib](http://www.zlib.net/) 1.2.11
34-
* [OpenSSL](http://openssl.org/) 1.1.0h
34+
* [OpenSSL](http://openssl.org/) 1.1.1
3535
* [PCRE](http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) 8.42
3636
* [LMDB](https://github.com/LMDB/lmdb/) 0.9.22
37-
* [libyaml](http://pyyaml.org/wiki/LibYAML) 0.1.7
37+
* [libyaml](http://pyyaml.org/wiki/LibYAML) 0.2.1
3838
* [libxml2](http://xmlsoft.org/sources/) 2.9.8
3939
* [libiconv](http://ftp.gnu.org/gnu/libiconv/) 1.15
4040
* Needed by libxml2
41-
* [libacl](http://download.savannah.gnu.org/releases/acl/) 2.2.52
42-
* [libattr](http://download.savannah.gnu.org/releases/attr/) 2.4.47
43-
* [libcurl](http://curl.haxx.se/download.html) 7.60.0
41+
* [libacl](http://download.savannah.gnu.org/releases/acl/) 2.2.53
42+
* [libattr](http://download.savannah.gnu.org/releases/attr/) 2.4.48
43+
* [libcurl](http://curl.haxx.se/download.html) 7.61.1
4444
* libgcc
4545
* Currently only in use on AIX, Solaris, GCC dynamically links to it in order
4646
to substitute missing system functions
@@ -73,13 +73,13 @@ Build dependencies:
7373

7474
Hub specific dependencies:
7575

76-
* [APR](https://apr.apache.org/) 1.6.3
76+
* [APR](https://apr.apache.org/) 1.6.5
7777
* [apr-util](https://apr.apache.org/) 1.6.1
78-
* [Apache](http://httpd.apache.org/) 2.4.33
79-
* [PostgreSQL](http://www.postgresql.org/) for the hub 10.4
78+
* [Apache](http://httpd.apache.org/) 2.4.35
79+
* [PostgreSQL](http://www.postgresql.org/) for the hub 11.0
8080
* [Redis](http://redis.io/) 3.2.11
81-
* [PHP](http://php.net/) 7.2.6
82-
* [Git](https://www.kernel.org/pub/software/scm/git/) 2.17.1
81+
* [PHP](http://php.net/) 7.2.11
82+
* [Git](https://www.kernel.org/pub/software/scm/git/) 2.19.1
8383
* [rsync](https://download.samba.org/pub/rsync/) 3.1.3
8484

8585
Other dependencies (**find out why they are needed!**)

deps-packaging/apache/cfbuild-apache.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%define apache_version 2.4.33
1+
%define apache_version 2.4.35
22
%global __os_install_post %{nil}
33

44
Summary: CFEngine Build Automation -- apache

deps-packaging/apache/distfiles

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e983c251062872e5caf87372776c04c0 httpd-2.4.33.tar.gz
1+
92ddccfbd43b533578499d1faaad17fe httpd-2.4.35.tar.gz

deps-packaging/apr/cfbuild-apr.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%define apr_version 1.6.3
1+
%define apr_version 1.6.5
22

33
Summary: CFEngine Build Automation -- apr
44
Name: cfbuild-apr

deps-packaging/apr/distfiles

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
57c6cc26a31fe420c546ad2234f22db4 apr-1.6.3.tar.gz
1+
0759294408daace192c935b7c9e76e04 apr-1.6.5.tar.gz

deps-packaging/git/cfbuild-git.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%define git_version 2.17.1
1+
%define git_version 2.19.1
22

33
Summary: CFEngine Build Automation -- git
44
Name: cfbuild-git

deps-packaging/git/distfiles

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7bd949f027363a77462971640f562d17 git-2.17.1.tar.gz
1+
defb7d4f311d9de4e50b7bbdd36a6610 git-2.19.1.tar.gz
-509 Bytes
Binary file not shown.

deps-packaging/libacl/cfbuild-libacl.spec

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
%define acl_version 2.2.53
2+
13
Summary: CFEngine Build Automation -- libacl
24
Name: cfbuild-libacl
35
Version: %{version}
46
Release: 1
5-
Source: acl-2.2.52.src.tar.gz
7+
Source: acl-%{acl_version}.tar.gz
8+
Patch0: no_fancy_gcc.patch
69
License: MIT
710
Group: Other
811
Url: http://example.com
@@ -14,10 +17,9 @@ AutoReqProv: no
1417

1518
%prep
1619
mkdir -p %{_builddir}
17-
%setup -q -n acl-2.2.52
18-
19-
zcat ../../SOURCES/acl.destdir.diff.gz | $PATCH -p1 || true
20+
%setup -q -n acl-%{acl_version}
2021

22+
%patch0 -p1
2123
./configure --prefix=%{prefix} --enable-gettext=no
2224

2325
%build
@@ -27,15 +29,15 @@ make
2729
%install
2830
rm -rf ${RPM_BUILD_ROOT}
2931

30-
make install -C getfacl DESTDIR=${RPM_BUILD_ROOT} DIST_ROOT=/
31-
make install-dev install-lib DESTDIR=${RPM_BUILD_ROOT} DIST_ROOT=/
32+
make install DESTDIR=${RPM_BUILD_ROOT}
3233

3334
cp ${RPM_BUILD_ROOT}%{prefix}/include/sys/acl.h ${RPM_BUILD_ROOT}%{prefix}/include/
3435

36+
rm -rf ${RPM_BUILD_ROOT}%{prefix}/share
3537
rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib/*.a
3638
rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib/*.la
37-
rm -rf ${RPM_BUILD_ROOT}%{prefix}/libexec
38-
rm -rf ${RPM_BUILD_ROOT}%{prefix}/share
39+
rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib/pkgconfig
40+
find ${RPM_BUILD_ROOT}%{prefix}/bin/ -mindepth 1 -name 'getfacl' -o -print0 | xargs -0 rm -rf
3941

4042
%clean
4143
rm -rf $RPM_BUILD_ROOT

deps-packaging/libacl/debian/rules

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ build: build-stamp
1111
build-stamp:
1212
dh_testdir
1313

14-
zcat acl.destdir.diff.gz | $(PATCH) -p1 || true
14+
patch -p1 -i no_fancy_gcc.patch
1515

1616
./configure --prefix=$(PREFIX) --enable-gettext=no
1717

@@ -25,17 +25,18 @@ install: build
2525
dh_clean -k
2626
dh_installdirs
2727

28-
make install -C getfacl DESTDIR=$(CURDIR)/debian/tmp DIST_ROOT=/
29-
make install-dev install-lib DESTDIR=$(CURDIR)/debian/tmp DIST_ROOT=/
28+
make install DESTDIR=$(CURDIR)/debian/tmp
3029

3130
# configure fails because acl.h does't exist in include dir
3231
# it's placed by default in include/sys
3332

3433
cp $(CURDIR)/debian/tmp$(PREFIX)/include/sys/acl.h $(CURDIR)/debian/tmp$(PREFIX)/include/
3534

35+
rm -rf $(CURDIR)/debian/tmp$(PREFIX)/share
3636
rm -rf $(CURDIR)/debian/tmp$(PREFIX)/lib/*.a
3737
rm -rf $(CURDIR)/debian/tmp$(PREFIX)/lib/*.la
38-
rm -rf $(CURDIR)/debian/tmp$(PREFIX)/libexec
38+
rm -rf $(CURDIR)/debian/tmp$(PREFIX)/lib/pkgconfig
39+
find $(CURDIR)/debian/tmp$(PREFIX)/bin/ -mindepth 1 -name 'getfacl' -o -print0 | xargs -0 rm -rf
3940

4041
binary-indep: build install
4142

0 commit comments

Comments
 (0)