Date: Tuesday, April 21, 2015 @ 08:51:27 Author: bpiotrowski Revision: 131788
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: cfacter/repos/community-staging-i686/ cfacter/repos/community-staging-i686/PKGBUILD (from rev 131787, cfacter/trunk/PKGBUILD) cfacter/repos/community-staging-i686/cfacter-0.4.1-boost-1.58.0.patch (from rev 131787, cfacter/trunk/cfacter-0.4.1-boost-1.58.0.patch) cfacter/repos/community-staging-x86_64/ cfacter/repos/community-staging-x86_64/PKGBUILD (from rev 131787, cfacter/trunk/PKGBUILD) cfacter/repos/community-staging-x86_64/cfacter-0.4.1-boost-1.58.0.patch (from rev 131787, cfacter/trunk/cfacter-0.4.1-boost-1.58.0.patch) -----------------------------------------------------------+ community-staging-i686/PKGBUILD | 37 ++++++++++++ community-staging-i686/cfacter-0.4.1-boost-1.58.0.patch | 32 ++++++++++ community-staging-x86_64/PKGBUILD | 37 ++++++++++++ community-staging-x86_64/cfacter-0.4.1-boost-1.58.0.patch | 32 ++++++++++ 4 files changed, 138 insertions(+) Copied: cfacter/repos/community-staging-i686/PKGBUILD (from rev 131787, cfacter/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2015-04-21 06:51:27 UTC (rev 131788) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> + +pkgname=cfacter +pkgver=0.4.1 +pkgrel=1 +pkgdesc='Implementation of facter functionality in C++11' +arch=('i686' 'x86_64') +url='https://github.com/puppetlabs/cfacter' +license=('APACHE') +depends=('boost-libs' 'curl' 'openssl' 'yaml-cpp' 'ruby') +makedepends=('boost' 'cmake' 'git') +source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz + git://github.com/puppetlabs/leatherman#commit=fb07598 + cfacter-0.4.1-boost-1.58.0.patch) +md5sums=('668f89143fd5e1767973f30bb1cee10a' + 'SKIP' + 'efd20861fbc289f32c677d308279c8a2') + +prepare() { + 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() { + cd $pkgname-$pkgver + cmake -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $pkgname-$pkgver + make install DESTDIR="$pkgdir" +} Copied: cfacter/repos/community-staging-i686/cfacter-0.4.1-boost-1.58.0.patch (from rev 131787, cfacter/trunk/cfacter-0.4.1-boost-1.58.0.patch) =================================================================== --- community-staging-i686/cfacter-0.4.1-boost-1.58.0.patch (rev 0) +++ community-staging-i686/cfacter-0.4.1-boost-1.58.0.patch 2015-04-21 06:51:27 UTC (rev 131788) @@ -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; + } Copied: cfacter/repos/community-staging-x86_64/PKGBUILD (from rev 131787, cfacter/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2015-04-21 06:51:27 UTC (rev 131788) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> + +pkgname=cfacter +pkgver=0.4.1 +pkgrel=1 +pkgdesc='Implementation of facter functionality in C++11' +arch=('i686' 'x86_64') +url='https://github.com/puppetlabs/cfacter' +license=('APACHE') +depends=('boost-libs' 'curl' 'openssl' 'yaml-cpp' 'ruby') +makedepends=('boost' 'cmake' 'git') +source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz + git://github.com/puppetlabs/leatherman#commit=fb07598 + cfacter-0.4.1-boost-1.58.0.patch) +md5sums=('668f89143fd5e1767973f30bb1cee10a' + 'SKIP' + 'efd20861fbc289f32c677d308279c8a2') + +prepare() { + 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() { + cd $pkgname-$pkgver + cmake -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $pkgname-$pkgver + make install DESTDIR="$pkgdir" +} Copied: cfacter/repos/community-staging-x86_64/cfacter-0.4.1-boost-1.58.0.patch (from rev 131787, cfacter/trunk/cfacter-0.4.1-boost-1.58.0.patch) =================================================================== --- community-staging-x86_64/cfacter-0.4.1-boost-1.58.0.patch (rev 0) +++ community-staging-x86_64/cfacter-0.4.1-boost-1.58.0.patch 2015-04-21 06:51:27 UTC (rev 131788) @@ -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; + }