Date: Tuesday, April 21, 2015 @ 08:51:21 Author: bpiotrowski Revision: 131787
upgpkg: cfacter 0.4.1-1 rebuild against boost 1.58.0 Added: cfacter/trunk/cfacter-0.4.1-boost-1.58.0.patch Modified: cfacter/trunk/PKGBUILD ----------------------------------+ PKGBUILD | 16 ++++++++++------ cfacter-0.4.1-boost-1.58.0.patch | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-04-21 06:39:40 UTC (rev 131786) +++ PKGBUILD 2015-04-21 06:51:21 UTC (rev 131787) @@ -2,7 +2,7 @@ # Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> pkgname=cfacter -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc='Implementation of facter functionality in C++11' arch=('i686' 'x86_64') @@ -12,13 +12,17 @@ makedepends=('boost' 'cmake' 'git') source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz git://github.com/puppetlabs/leatherman#commit=fb07598 -) -md5sums=('d3f0de09384b41d5724b16d3c8b31f80' - 'SKIP') + cfacter-0.4.1-boost-1.58.0.patch) +md5sums=('668f89143fd5e1767973f30bb1cee10a' + 'SKIP' + 'efd20861fbc289f32c677d308279c8a2') prepare() { - rmdir $pkgname-$pkgver/vendor/leatherman - ln -s "$srcdir"/leatherman $pkgname-$pkgver/vendor/leatherman + cd $pkgname-$pkgver + rmdir vendor/leatherman + ln -s "$srcdir"/leatherman vendor/leatherman + + patch -p1 -i "$srcdir"/cfacter-0.4.1-boost-1.58.0.patch } build() { Added: cfacter-0.4.1-boost-1.58.0.patch =================================================================== --- cfacter-0.4.1-boost-1.58.0.patch (rev 0) +++ cfacter-0.4.1-boost-1.58.0.patch 2015-04-21 06:51:21 UTC (rev 131787) @@ -0,0 +1,32 @@ +diff --git a/lib/src/facts/linux/networking_resolver.cc b/lib/src/facts/linux/networking_resolver.cc +index 5ee6149..69bda3d 100644 +--- a/lib/src/facts/linux/networking_resolver.cc ++++ b/lib/src/facts/linux/networking_resolver.cc +@@ -42,12 +42,12 @@ namespace facter { namespace facts { namespace linux { + scoped_descriptor sock(socket(AF_INET, SOCK_DGRAM, 0)); + if (static_cast<int>(sock) < 0) { + LOG_WARNING("socket failed: %1% (%2%): interface MTU fact is unavailable for interface %3%.", strerror(errno), errno, interface); +- return {}; ++ return boost::none; + } + + if (ioctl(sock, SIOCGIFMTU, &req) == -1) { + LOG_WARNING("ioctl failed: %1% (%2%): interface MTU fact is unavailable for interface %3%.", strerror(errno), errno, interface); +- return {}; ++ return boost::none; + } + return req.ifr_mtu; + } +diff --git a/lib/src/facts/osx/networking_resolver.cc b/lib/src/facts/osx/networking_resolver.cc +index 7b27ee6..ea2335f 100644 +--- a/lib/src/facts/osx/networking_resolver.cc ++++ b/lib/src/facts/osx/networking_resolver.cc +@@ -32,7 +32,7 @@ namespace facter { namespace facts { namespace osx { + boost::optional<uint64_t> networking_resolver::get_link_mtu(string const& interface, void* data) const + { + if (!data) { +- return {}; ++ return boost::none; + } + return reinterpret_cast<if_data const*>(data)->ifi_mtu; + }