[PATCH clr-bundles] add udisks2 to desktop bundle
by Leandro Dorileo
Gvfs will use its udisks2 monitor to handle automount.
---
bundles/desktop | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/bundles/desktop b/bundles/desktop
index 6509b77..59d4fa7 100644
--- a/bundles/desktop
+++ b/bundles/desktop
@@ -119,6 +119,15 @@ nautilus
cups
thermal_daemon
+# volume/storage
+udisks2
+libbytesize
+volume_key
+libblockdev
+libatasmart
+libstoragemgmt
+libiscsi
+
# x.org bits
mesa
xf86-input-libinput
--
2.15.1
4 years, 5 months
[PATCH clr-bundles] os-utils-gui: Remove super-ceded package
by William Douglas
xf86-input-mouse is not needed due to xf86-input-evdev providing the
same functionality.
---
bundles/os-utils-gui | 1 -
1 file changed, 1 deletion(-)
diff --git a/bundles/os-utils-gui b/bundles/os-utils-gui
index d557bbf..54d503f 100644
--- a/bundles/os-utils-gui
+++ b/bundles/os-utils-gui
@@ -72,7 +72,6 @@ xdg-utils
xdg-user-dirs
xemacs
xf86-input-evdev
-xf86-input-mouse
xf86-input-synaptics
xf86-video-fbdev
xf86-video-vesa
--
2.15.0
4 years, 5 months
[PATCH clr-bundles] sysadmin-remote: Add cockpit
by William Douglas
Add the cockpit-bridge and services to enable running cockpit-ws in a
container which will provide a web interface for remote host
management.
---
bundles/sysadmin-remote | 1 +
1 file changed, 1 insertion(+)
diff --git a/bundles/sysadmin-remote b/bundles/sysadmin-remote
index b1ddfd4..3f9094e 100644
--- a/bundles/sysadmin-remote
+++ b/bundles/sysadmin-remote
@@ -5,6 +5,7 @@
# [MAINTAINER]: Marcos Simental <marcos.simental.magana(a)intel.com>
include(openssh-server)
include(python-basic)
+cockpit
docker-py
nagios-plugins
nrpe
--
2.15.0
4 years, 5 months
[PATCH postgresql] postgresql: Move socket to /run/postgresql
by Brett T. Warden
By default, the UNIX domain socket is created in /tmp. Instead, move it
to the more-suitable /run/postgresql.
Signed-off-by: Brett T. Warden <brett.t.warden(a)intel.com>
---
0001-Move-socket-to-run-postgresql.patch | 29 +++++++++++++++++++++++++++++
options.conf | 2 ++
postgresql.spec | 12 +++++++++---
postgresql.tmpfiles | 1 +
release | 2 +-
series | 1 +
6 files changed, 43 insertions(+), 4 deletions(-)
create mode 100644 0001-Move-socket-to-run-postgresql.patch
create mode 100644 postgresql.tmpfiles
create mode 100644 series
diff --git a/0001-Move-socket-to-run-postgresql.patch b/0001-Move-socket-to-run-postgresql.patch
new file mode 100644
index 0000000..eed938c
--- /dev/null
+++ b/0001-Move-socket-to-run-postgresql.patch
@@ -0,0 +1,29 @@
+From 70786333de7cdd09ac8ae14a5f6d693ed193567c Mon Sep 17 00:00:00 2001
+From: "Brett T. Warden" <brett.t.warden(a)intel.com>
+Date: Thu, 7 Dec 2017 16:32:17 -0800
+Subject: [PATCH] Move socket to /run/postgresql
+
+By default, the UNIX domain socket for postgresql is created in /tmp.
+This fits more appropriately under /run/postgresql.
+
+Signed-off-by: Brett T. Warden <brett.t.warden(a)intel.com>
+---
+ src/include/pg_config_manual.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
+index 96885bb..8cee64e 100644
+--- a/src/include/pg_config_manual.h
++++ b/src/include/pg_config_manual.h
+@@ -182,7 +182,7 @@
+ * here's where to twiddle it. You can also override this at runtime
+ * with the postmaster's -k switch.
+ */
+-#define DEFAULT_PGSOCKET_DIR "/tmp"
++#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
+
+ /*
+ * This is the default event source for Windows event log.
+--
+2.15.1
+
diff --git a/options.conf b/options.conf
index 27e8bfc..818e16a 100644
--- a/options.conf
+++ b/options.conf
@@ -11,6 +11,8 @@ giturl =
allow_test_failures = false
# unset %build ld_as_needed variable
asneeded = false
+# this package is trusted enough to automatically update (used by other tools)
+autoupdate = false
# extend flags with '-std=gnu++98
broken_c++ = false
# disable parallelization during build
diff --git a/postgresql.spec b/postgresql.spec
index c5ebeb4..8fa6a37 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -4,11 +4,12 @@
#
Name : postgresql
Version : 9.6.5
-Release : 34
+Release : 35
URL : https://ftp.postgresql.org/pub/source/v9.6.5/postgresql-9.6.5.tar.bz2
Source0 : https://ftp.postgresql.org/pub/source/v9.6.5/postgresql-9.6.5.tar.bz2
Source1 : postgresql-install.service
Source2 : postgresql.service
+Source3 : postgresql.tmpfiles
Summary : No detailed summary available
Group : Development/Tools
License : PostgreSQL TCL
@@ -28,6 +29,7 @@ BuildRequires : python-dev
BuildRequires : readline-dev
BuildRequires : systemd-dev
BuildRequires : zlib-dev
+Patch1: 0001-Move-socket-to-run-postgresql.patch
%description
PostgreSQL Database Management System
@@ -84,13 +86,14 @@ lib components for the postgresql package.
%prep
%setup -q -n postgresql-9.6.5
+%patch1 -p1
%build
export http_proxy=http://127.0.0.1:9/
export https_proxy=http://127.0.0.1:9/
export no_proxy=localhost,127.0.0.1,0.0.0.0
export LANG=C
-export SOURCE_DATE_EPOCH=1512600882
+export SOURCE_DATE_EPOCH=1512693753
export AR=gcc-ar
export RANLIB=gcc-ranlib
export NM=gcc-nm
@@ -103,12 +106,14 @@ export CXXFLAGS="$CXXFLAGS -O3 -falign-functions=32 -ffat-lto-objects -flto=4 -f
make V=1 %{?_smp_mflags}
%install
-export SOURCE_DATE_EPOCH=1512600882
+export SOURCE_DATE_EPOCH=1512693753
rm -rf %{buildroot}
%make_install
mkdir -p %{buildroot}/usr/lib/systemd/system
install -m 0644 %{SOURCE1} %{buildroot}/usr/lib/systemd/system/postgresql-install.service
install -m 0644 %{SOURCE2} %{buildroot}/usr/lib/systemd/system/postgresql.service
+mkdir -p %{buildroot}/usr/lib/tmpfiles.d
+install -m 0644 %{SOURCE3} %{buildroot}/usr/lib/tmpfiles.d/postgresql.conf
%files
%defattr(-,root,root,-)
@@ -164,6 +169,7 @@ install -m 0644 %{SOURCE2} %{buildroot}/usr/lib/systemd/system/postgresql.servic
%defattr(-,root,root,-)
/usr/lib/systemd/system/postgresql-install.service
/usr/lib/systemd/system/postgresql.service
+/usr/lib/tmpfiles.d/postgresql.conf
%files data
%defattr(-,root,root,-)
diff --git a/postgresql.tmpfiles b/postgresql.tmpfiles
new file mode 100644
index 0000000..04edad2
--- /dev/null
+++ b/postgresql.tmpfiles
@@ -0,0 +1 @@
+d /run/postgresql 0755 postgres postgres - -
diff --git a/release b/release
index a787364..8f92bfd 100644
--- a/release
+++ b/release
@@ -1 +1 @@
-34
+35
diff --git a/series b/series
new file mode 100644
index 0000000..6e92931
--- /dev/null
+++ b/series
@@ -0,0 +1 @@
+0001-Move-socket-to-run-postgresql.patch
--
2.15.1
4 years, 5 months
[PATCH clr-bundles] Add vnc-server bundle
by William Douglas
Create a bundle containing a vnc server and desktop to allow a remote
vnc session use case.
---
bundles/vnc-server | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 bundles/vnc-server
diff --git a/bundles/vnc-server b/bundles/vnc-server
new file mode 100644
index 0000000..0872a9e
--- /dev/null
+++ b/bundles/vnc-server
@@ -0,0 +1,9 @@
+# [TITLE]: vnc-server
+# [DESCRIPTION]: Enable the host to be a vnc desktop server
+# [STATUS]: WIP
+# [CAPABILITIES]:
+# [MAINTAINER]: Marcos Simental <marcos.simental.magana(a)intel.com>
+include(desktop)
+include(openssh-server)
+tigervnc
+tigervnc-extras
--
2.15.0
4 years, 5 months
[PATCH nrpe] nrpe: Add config and systemd service
by Brett T. Warden
Add the systemd unit file, sample config, and a default config that
optionally includes files in /etc/nrpe.d.
Rework the makefile to support multiple targets properly, and to create
directories properly in the build environment.
Signed-off-by: Brett T. Warden <brett.t.warden(a)intel.com>
---
This is the autospec'ed change for nrpe that includes the previous patch.
...up-recursive-make-recipes-and-create-dirs.patch | 136 +++++++++++++++++++++
Makefile | 2 +-
configure | 2 +-
make_install_append | 3 +
make_install_args | 1 +
nrpe.spec | 47 ++++++-
options.conf | 8 ++
pkgconfig_add | 1 +
release | 2 +-
series | 1 +
10 files changed, 194 insertions(+), 9 deletions(-)
create mode 100644 0002-Fixup-recursive-make-recipes-and-create-dirs.patch
create mode 100644 make_install_append
create mode 100644 make_install_args
diff --git a/0002-Fixup-recursive-make-recipes-and-create-dirs.patch b/0002-Fixup-recursive-make-recipes-and-create-dirs.patch
new file mode 100644
index 0000000..a3087bb
--- /dev/null
+++ b/0002-Fixup-recursive-make-recipes-and-create-dirs.patch
@@ -0,0 +1,136 @@
+From c6f295ecb995b11f3a2bc71e1fd04f8ed32b8f7c Mon Sep 17 00:00:00 2001
+From: "Brett T. Warden" <brett.t.warden(a)intel.com>
+Date: Mon, 4 Dec 2017 17:11:01 -0800
+Subject: [PATCH 2/2] Fixup recursive make recipes and create dirs
+
+Replace cd with -C in recursive make recipes to allow multiple targets.
+Create directories for init and config files.
+---
+ Makefile.in | 48 ++++++++++++++++++++++++------------------------
+ 1 file changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 989d914..34726e1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -46,7 +46,7 @@ SRC_INIT=@src_init@
+
+
+ all:
+- cd $(SRC_BASE); $(MAKE)
++ $(MAKE) -C $(SRC_BASE)
+
+ @echo "";\
+ echo "*** Compile finished ***";\
+@@ -58,19 +58,19 @@ all:
+ echo ""
+
+ nrpe:
+- cd $(SRC_BASE); $(MAKE)
++ $(MAKE) -C $(SRC_BASE)
+
+ check_nrpe:
+- cd $(SRC_BASE); $(MAKE)
++ $(MAKE) -C $(SRC_BASE)
+
+ install-plugin:
+- cd $(SRC_BASE); $(MAKE) $@
++ $(MAKE) -C $(SRC_BASE) $@
+
+ install-daemon:
+- cd $(SRC_BASE); $(MAKE) $@
++ $(MAKE) -C $(SRC_BASE) $@
+
+ install:
+- cd $(SRC_BASE); $(MAKE) $@
++ $(MAKE) -C $(SRC_BASE) $@
+
+ install-init:
+ @if test $(SRC_INIT) = unknown; then \
+@@ -78,28 +78,28 @@ install-init:
+ exit 1; \
+ fi
+ @if test $(INIT_TYPE) = upstart; then\
+- echo $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+- $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
++ echo $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
++ $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+ echo initctl reload-configuration; \
+ initctl reload-configuration; \
+ elif test $(INIT_TYPE) = systemd; then\
+- echo $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+- $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
++ echo $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
++ $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+ elif test $(INIT_TYPE) = smf10 -o $(INIT_TYPE) = smf11; then \
+ echo $(INSTALL) -m 775 -g sys -d $(INIT_DIR);\
+ $(INSTALL) -m 775 -g sys -d $(INIT_DIR);\
+- echo $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+- $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
++ echo $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
++ $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+ echo svccfg import $(INIT_DIR)/$(INIT_FILE); \
+ svccfg import $(INIT_DIR)/$(INIT_FILE); \
+ echo "*** Run 'svcadm enable nrpe' to start it"; \
+ elif test $(INIT_TYPE) = gentoo; then\
+- $(INSTALL) -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
++ $(INSTALL) -D -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+ echo rc-update add nrpe default; \
+ rc-update add nrpe default; \
+ else\
+- echo $(INSTALL) -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+- $(INSTALL) -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
++ echo $(INSTALL) -D -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
++ $(INSTALL) -D -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+ if test $(INIT_TYPE) = newbsd; then\
+ if test $(DIST) = openbsd; then\
+ echo "# nrpe@bsd_enable@=NO" >> /etc/rc.conf;\
+@@ -132,23 +132,23 @@ install-inetd:
+ cat startup/$(SRC_INETD) >> $(INETD_DIR)/$(INETD_FILE); \
+ elif test $(INETD_TYPE) = systemd; then \
+ SRC_INETD_FILE=`echo "$(SRC_INETD)" | sed -e 's/socket/socket-svc/'`; \
+- echo $(INSTALL) -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \
+- $(INSTALL) -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \
++ echo $(INSTALL) -D -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \
++ $(INSTALL) -D -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \
+ elif test $(INETD_TYPE) = smf10 -o $(INETD_TYPE) = smf11; then \
+ echo $(INSTALL) -m 775 -g sys -d $(INETD_DIR);\
+ $(INSTALL) -m 775 -g sys -d $(INETD_DIR);\
+- echo $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
+- $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
++ echo $(INSTALL) -D -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
++ $(INSTALL) -D -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
+ $(INSTALL) -m 775 -d $(INETD_DIR);\
+ echo svccfg import $(INETD_DIR)/$(INETD_FILE); \
+ svccfg import $(INETD_DIR)/$(INETD_FILE); \
+ echo "*** Run 'svcadm enable nrpe' to start it"; \
+ elif test $(INIT_TYPE) = launchd; then\
+- $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
++ $(INSTALL) -D -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
+ launchctl load $(INETD_DIR)/$(INETD_FILE); \
+ else\
+- echo $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
+- $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
++ echo $(INSTALL) -D -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
++ $(INSTALL) -D -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
+ fi
+ @$(EGREP) -q "^nrpe[\t ]+@nrpe_port@/tcp" /etc/services || \
+ echo "***** MAKE SURE 'nrpe @nrpe_port@/tcp' IS IN YOUR /etc/services FILE"
+@@ -164,12 +164,12 @@ install-groups-users:
+ fi
+
+ clean:
+- cd $(SRC_BASE); $(MAKE) $@; cd ..
++ $(MAKE) -C $(SRC_BASE) $@
+ rm -f core
+ rm -f *~ */*~
+
+ distclean: clean
+- cd $(SRC_BASE); $(MAKE) $@; cd ..
++ $(MAKE) -C $(SRC_BASE) $@
+ rm -rf autom4te.cache
+ rm -f config.log config.status config.cache sample-config/nrpe.cfg $(SRC_INCLUDE)/config.h
+ rm -f startup/bsd-init startup/debian-init startup/default-init startup/default-inetd
+--
+2.15.1
+
diff --git a/Makefile b/Makefile
index c5b0e56..b7c9f00 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
PKG_NAME := nrpe
-URL := https://github.com/NagiosEnterprises/nrpe/releases/download/nrpe-3.2.1/nr...
+URL = https://github.com/NagiosEnterprises/nrpe/releases/download/nrpe-3.2.1/nr...
include ../common/Makefile.common
diff --git a/configure b/configure
index 44a474f..9a8d371 100644
--- a/configure
+++ b/configure
@@ -1 +1 @@
---with-init-type=systemd
+--with-init-type=systemd --sysconfdir=/usr/share/defaults/nrpe
diff --git a/make_install_append b/make_install_append
new file mode 100644
index 0000000..c91e9f6
--- /dev/null
+++ b/make_install_append
@@ -0,0 +1,3 @@
+mkdir -p %{buildroot}/usr/share/doc/nrpe
+mv %{buildroot}/usr/share/defaults/nrpe/nrpe.cfg %{buildroot}/usr/share/doc/nrpe/sample.cfg
+echo 'include_dir=/etc/nrpe.d' > %{buildroot}/usr/share/defaults/nrpe/nrpe.cfg
diff --git a/make_install_args b/make_install_args
new file mode 100644
index 0000000..eb64ac9
--- /dev/null
+++ b/make_install_args
@@ -0,0 +1 @@
+install-config install-init
diff --git a/nrpe.spec b/nrpe.spec
index 6bfc0bd..7d2343c 100644
--- a/nrpe.spec
+++ b/nrpe.spec
@@ -4,7 +4,7 @@
#
Name : nrpe
Version : 3.2.1
-Release : 2
+Release : 3
URL : https://github.com/NagiosEnterprises/nrpe/releases/download/nrpe-3.2.1/nr...
Source0 : https://github.com/NagiosEnterprises/nrpe/releases/download/nrpe-3.2.1/nr...
Summary : No detailed summary available
@@ -12,9 +12,12 @@ Group : Development/Tools
License : GPL-2.0
Requires: nrpe-bin
Requires: nrpe-config
-BuildRequires : openssl-dev
+Requires: nrpe-data
+Requires: nrpe-doc
+BuildRequires : pkgconfig(openssl)
BuildRequires : procps-ng
Patch1: 0001-Fixups-for-autoconf-automake-files.patch
+Patch2: 0002-Fixup-recursive-make-recipes-and-create-dirs.patch
%description
@@ -22,6 +25,7 @@ Patch1: 0001-Fixups-for-autoconf-automake-files.patch
%package bin
Summary: bin components for the nrpe package.
Group: Binaries
+Requires: nrpe-data
Requires: nrpe-config
%description bin
@@ -36,23 +40,45 @@ Group: Default
config components for the nrpe package.
+%package data
+Summary: data components for the nrpe package.
+Group: Data
+
+%description data
+data components for the nrpe package.
+
+
+%package doc
+Summary: doc components for the nrpe package.
+Group: Documentation
+
+%description doc
+doc components for the nrpe package.
+
+
%prep
%setup -q -n nrpe-3.2.1
%patch1 -p1
+%patch2 -p1
%build
export http_proxy=http://127.0.0.1:9/
export https_proxy=http://127.0.0.1:9/
export no_proxy=localhost,127.0.0.1,0.0.0.0
export LANG=C
-export SOURCE_DATE_EPOCH=1506702716
-%configure --disable-static --with-init-type=systemd
+export SOURCE_DATE_EPOCH=1512499872
+%configure --disable-static --with-init-type=systemd --sysconfdir=/usr/share/defaults/nrpe
make V=1 %{?_smp_mflags}
%install
-export SOURCE_DATE_EPOCH=1506702716
+export SOURCE_DATE_EPOCH=1512499872
rm -rf %{buildroot}
-%make_install
+%make_install install-config install-init
+## make_install_append content
+mkdir -p %{buildroot}/usr/share/doc/nrpe
+mv %{buildroot}/usr/share/defaults/nrpe/nrpe.cfg %{buildroot}/usr/share/doc/nrpe/sample.cfg
+echo 'include_dir=/etc/nrpe.d' > %{buildroot}/usr/share/defaults/nrpe/nrpe.cfg
+## make_install_append end
%files
%defattr(-,root,root,-)
@@ -65,4 +91,13 @@ rm -rf %{buildroot}
%files config
%defattr(-,root,root,-)
+/usr/lib/systemd/system/nrpe.service
/usr/lib/tmpfiles.d/nrpe.conf
+
+%files data
+%defattr(-,root,root,-)
+/usr/share/defaults/nrpe/nrpe.cfg
+
+%files doc
+%defattr(-,root,root,-)
+%doc /usr/share/doc/nrpe/*
diff --git a/options.conf b/options.conf
index 070a323..c606985 100644
--- a/options.conf
+++ b/options.conf
@@ -1,3 +1,9 @@
+[package]
+name = nrpe
+archives =
+url = https://github.com/NagiosEnterprises/nrpe/releases/download/nrpe-3.2.1/nr...
+giturl = https://github.com/NagiosEnterprises/nrpe.git
+
[autospec]
# build 32 bit libraries
32bit = false
@@ -5,6 +11,8 @@
allow_test_failures = false
# unset %build ld_as_needed variable
asneeded = false
+# this package is trusted enough to automatically update (used by other tools)
+autoupdate = false
# extend flags with '-std=gnu++98
broken_c++ = false
# disable parallelization during build
diff --git a/pkgconfig_add b/pkgconfig_add
index dd3b77c..d217f12 100644
--- a/pkgconfig_add
+++ b/pkgconfig_add
@@ -1,2 +1,3 @@
# This file contains additional pkgconfig build requirements that did
# not get picked up automatically. One name per line, no whitespace.
+openssl
diff --git a/release b/release
index 0cfbf08..00750ed 100644
--- a/release
+++ b/release
@@ -1 +1 @@
-2
+3
diff --git a/series b/series
index 321ab8e..f4ef586 100644
--- a/series
+++ b/series
@@ -1 +1,2 @@
0001-Fixups-for-autoconf-automake-files.patch
+0002-Fixup-recursive-make-recipes-and-create-dirs.patch
--
2.15.1
4 years, 5 months
[PATCH nrpe] Fixup recursive make recipes and create dirs
by Brett T. Warden
Replace cd with -C in recursive make recipes to allow multiple targets.
Create directories for init and config files.
---
This is an additional patch to be applied to nrpe source.
Makefile.in | 48 ++++++++++++++++++++++++------------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 989d914..34726e1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,7 +46,7 @@ SRC_INIT=@src_init@
all:
- cd $(SRC_BASE); $(MAKE)
+ $(MAKE) -C $(SRC_BASE)
@echo "";\
echo "*** Compile finished ***";\
@@ -58,19 +58,19 @@ all:
echo ""
nrpe:
- cd $(SRC_BASE); $(MAKE)
+ $(MAKE) -C $(SRC_BASE)
check_nrpe:
- cd $(SRC_BASE); $(MAKE)
+ $(MAKE) -C $(SRC_BASE)
install-plugin:
- cd $(SRC_BASE); $(MAKE) $@
+ $(MAKE) -C $(SRC_BASE) $@
install-daemon:
- cd $(SRC_BASE); $(MAKE) $@
+ $(MAKE) -C $(SRC_BASE) $@
install:
- cd $(SRC_BASE); $(MAKE) $@
+ $(MAKE) -C $(SRC_BASE) $@
install-init:
@if test $(SRC_INIT) = unknown; then \
@@ -78,28 +78,28 @@ install-init:
exit 1; \
fi
@if test $(INIT_TYPE) = upstart; then\
- echo $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
- $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+ echo $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+ $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
echo initctl reload-configuration; \
initctl reload-configuration; \
elif test $(INIT_TYPE) = systemd; then\
- echo $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
- $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+ echo $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+ $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
elif test $(INIT_TYPE) = smf10 -o $(INIT_TYPE) = smf11; then \
echo $(INSTALL) -m 775 -g sys -d $(INIT_DIR);\
$(INSTALL) -m 775 -g sys -d $(INIT_DIR);\
- echo $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
- $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+ echo $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+ $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
echo svccfg import $(INIT_DIR)/$(INIT_FILE); \
svccfg import $(INIT_DIR)/$(INIT_FILE); \
echo "*** Run 'svcadm enable nrpe' to start it"; \
elif test $(INIT_TYPE) = gentoo; then\
- $(INSTALL) -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+ $(INSTALL) -D -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
echo rc-update add nrpe default; \
rc-update add nrpe default; \
else\
- echo $(INSTALL) -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
- $(INSTALL) -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+ echo $(INSTALL) -D -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
+ $(INSTALL) -D -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \
if test $(INIT_TYPE) = newbsd; then\
if test $(DIST) = openbsd; then\
echo "# nrpe@bsd_enable@=NO" >> /etc/rc.conf;\
@@ -132,23 +132,23 @@ install-inetd:
cat startup/$(SRC_INETD) >> $(INETD_DIR)/$(INETD_FILE); \
elif test $(INETD_TYPE) = systemd; then \
SRC_INETD_FILE=`echo "$(SRC_INETD)" | sed -e 's/socket/socket-svc/'`; \
- echo $(INSTALL) -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \
- $(INSTALL) -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \
+ echo $(INSTALL) -D -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \
+ $(INSTALL) -D -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \
elif test $(INETD_TYPE) = smf10 -o $(INETD_TYPE) = smf11; then \
echo $(INSTALL) -m 775 -g sys -d $(INETD_DIR);\
$(INSTALL) -m 775 -g sys -d $(INETD_DIR);\
- echo $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
- $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
+ echo $(INSTALL) -D -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
+ $(INSTALL) -D -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
$(INSTALL) -m 775 -d $(INETD_DIR);\
echo svccfg import $(INETD_DIR)/$(INETD_FILE); \
svccfg import $(INETD_DIR)/$(INETD_FILE); \
echo "*** Run 'svcadm enable nrpe' to start it"; \
elif test $(INIT_TYPE) = launchd; then\
- $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
+ $(INSTALL) -D -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
launchctl load $(INETD_DIR)/$(INETD_FILE); \
else\
- echo $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
- $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
+ echo $(INSTALL) -D -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
+ $(INSTALL) -D -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
fi
@$(EGREP) -q "^nrpe[\t ]+@nrpe_port@/tcp" /etc/services || \
echo "***** MAKE SURE 'nrpe @nrpe_port@/tcp' IS IN YOUR /etc/services FILE"
@@ -164,12 +164,12 @@ install-groups-users:
fi
clean:
- cd $(SRC_BASE); $(MAKE) $@; cd ..
+ $(MAKE) -C $(SRC_BASE) $@
rm -f core
rm -f *~ */*~
distclean: clean
- cd $(SRC_BASE); $(MAKE) $@; cd ..
+ $(MAKE) -C $(SRC_BASE) $@
rm -rf autom4te.cache
rm -f config.log config.status config.cache sample-config/nrpe.cfg $(SRC_INCLUDE)/config.h
rm -f startup/bsd-init startup/debian-init startup/default-init startup/default-inetd
--
2.15.1
4 years, 5 months
Weird compiler errors with -O0 -fopenmp and Eigen
by Markus Ebner
Hi,
I am experiencing a weird problem, while developping C++ on clearlinux with gcc and Eigen.
The following code-snippet:
#include <eigen3/Eigen/Dense>
template<typename TInputBlock, typename TOutputBlock>
static void encode(const TInputBlock& input, TOutputBlock& output) {
Eigen::MatrixXf mul0(8, 8);
Eigen::MatrixXf mul1(8, 8);
output = (mul0 * input * mul1);
}
int main() {
Eigen::MatrixXf input(8, 8);
Eigen::MatrixXf output(8, 8);
encode(input, output);
}
compiles fine with the following gcc-invocation on Gentoo and OpenSUSE (using GCC-7.2.0 and GCC-7.2.1 respectively):
g++ -g -O0 -fopenmp ./main.cpp
However, using this invocation on clearlinux spouts a bunch of weird errors I can't track down, from one of the SIMD intrinsics headers.
This error is specific to this special combination of gcc-arguments: "-O0 -fopenmp". Removing either one of them results in a successfull compilation.
Another way to get it to build on clearlinux, is by adding "-ftree-fre" to the gcc-invocation.
I tried the current master of Eigen, as well as the version that comes with clearlinux.
Might this come from clearlinux-specific changes to the gcc codebase?
Thanks!
4 years, 5 months
[clr-dev internal] [PATCH clr-bundles] desktop-apps-extras: add pidgin-sipe
by Leandro Dorileo
Signed-off-by: Leandro Dorileo <leandro.maciel.dorileo(a)intel.com>
---
bundles/desktop-apps-extras | 1 +
1 file changed, 1 insertion(+)
diff --git a/bundles/desktop-apps-extras b/bundles/desktop-apps-extras
index 12fcc9d..92db6b3 100644
--- a/bundles/desktop-apps-extras
+++ b/bundles/desktop-apps-extras
@@ -13,6 +13,7 @@ gmic
gphoto2
hexchat
pidgin
+pidgin-sipe
rxvt-unicode
spice-gtk
thunderbird
--
2.15.1
4 years, 5 months
[PATCH clr-bundles] Add 'certbot' as 'letsencrypt-client' bundle.
by Auke Kok
This doesn't really fit in any other category, but it's such
a common tool that it deserves some place of its own.
WIP since I'm not 100% convinced runtime dependencies are in order
yet. Once I test this bundle proper I will change to 'Active'.
---
bundles/letsencrypt-client | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 bundles/letsencrypt-client
diff --git a/bundles/letsencrypt-client b/bundles/letsencrypt-client
new file mode 100644
index 0000000..c9fb5b5
--- /dev/null
+++ b/bundles/letsencrypt-client
@@ -0,0 +1,6 @@
+# [TITLE]: letsencrypt-client
+# [DESCRIPTION]: Obtain and renew valid SSL certificates through Let's Encrypt's ACME service.
+# [STATUS]: WIP
+# [CAPABILITIES]:
+# [MAINTAINER]: Auke Kok <auke-jan.h.kok(a)intel.com>
+certbot
--
2.15.1
4 years, 5 months
