From f20c6a60ed4119f696c2c258cff0a51780dc60fa Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Mon, 30 Sep 2013 15:09:04 +0200 Subject: [PATCH] Build with full relro, Fix provides/requires, Fix pam.d config --- openwsman-2.4.0-pamsetup.patch | 15 +++++++++++++++ openwsman.spec | 30 ++++++++++++++++++++++-------- 2 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 openwsman-2.4.0-pamsetup.patch diff --git a/openwsman-2.4.0-pamsetup.patch b/openwsman-2.4.0-pamsetup.patch new file mode 100644 index 0000000..928c239 --- /dev/null +++ b/openwsman-2.4.0-pamsetup.patch @@ -0,0 +1,15 @@ +diff -up openwsman-2.4.0/etc/pam/openwsman.pamsetup openwsman-2.4.0/etc/pam/openwsman +--- openwsman-2.4.0/etc/pam/openwsman.pamsetup 2013-09-27 17:14:39.147565052 +0200 ++++ openwsman-2.4.0/etc/pam/openwsman 2013-09-27 17:15:12.744578165 +0200 +@@ -1,7 +1,7 @@ + #%PAM-1.0 +-auth required pam_unix2.so nullok ++auth required pam_unix.so nullok + auth required pam_nologin.so +-account required pam_unix2.so ++account required pam_unix.so + password required pam_pwcheck.so nullok +-password required pam_unix2.so nullok use_first_pass use_authtok +-session required pam_unix2.so none ++password required pam_unix.so nullok use_first_pass use_authtok ++session required pam_unix.so none diff --git a/openwsman.spec b/openwsman.spec index 91f9c98..0d9497c 100644 --- a/openwsman.spec +++ b/openwsman.spec @@ -14,7 +14,7 @@ BuildRequires: perl-devel pkgconfig openssl-devel BuildRequires: cmake BuildRequires: systemd-units Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Url: http://www.openwsman.org/ License: BSD Group: Applications/System @@ -27,6 +27,7 @@ Source2: openwsmand.service # script for testing presence of the certificates in ExecStartPre Source3: owsmantestcert.sh Patch1: openwsman-2.2.7-libssl.patch +Patch2: openwsman-2.4.0-pamsetup.patch %description Openwsman is a project intended to provide an open-source @@ -44,8 +45,8 @@ all system management aspects. License: BSD Group: System Environment/Libraries Summary: Open source Implementation of WS-Management -Provides: %{name} = %{version} -Obsoletes: %{name} < %{version} +Provides: %{name} = %{version}-%{release} +Obsoletes: %{name} < %{version}-%{release} %description -n libwsman1 Openwsman library for packages dependent on openwsman @@ -57,11 +58,11 @@ Openwsman library for packages dependent on openwsman License: BSD Group: Development/Libraries Summary: Open source Implementation of WS-Management -Provides: %{name}-devel = %{version} -Obsoletes: %{name}-devel < %{version} -Requires: libwsman1 = %{version} -Requires: %{name}-server = %{version} -Requires: %{name}-client = %{version} +Provides: %{name}-devel = %{version}-%{release} +Obsoletes: %{name}-devel < %{version}-%{release} +Requires: libwsman1 = %{version}-%{release} +Requires: %{name}-server = %{version}-%{release} +Requires: %{name}-client = %{version}-%{release} Requires: sblim-sfcc-devel libxml2-devel pam-devel Requires: libcurl-devel @@ -89,6 +90,7 @@ Requires(post): chkconfig Requires(preun): chkconfig Requires(postun): initscripts Summary: Openwsman Server and service libraries +Requires: libwsman1 = %{version}-%{release} %description server Openwsman Server and service libraries @@ -101,6 +103,7 @@ License: BSD Group: Development/Libraries Summary: Python bindings for openwsman client API Requires: python +Requires: libwsman1 = %{version}-%{release} %description python This package provides Python bindings to access the openwsman client @@ -115,6 +118,7 @@ Group: Development/Libraries Requires: ruby Requires: ruby(release) Summary: Ruby bindings for openwsman client API +Requires: libwsman1 = %{version}-%{release} %description ruby This package provides Ruby bindings to access the openwsman client API. @@ -135,6 +139,7 @@ License: BSD Group: Development/Libraries Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Summary: Perl bindings for openwsman client API +Requires: libwsman1 = %{version}-%{release} %description perl This package provides Perl bindings to access the openwsman client API. @@ -145,6 +150,7 @@ This package provides Perl bindings to access the openwsman client API. %prep %setup -q %patch1 -p1 -b .libssl +%patch2 -p1 -b .pamsetup # Fix wrong symlinks (fixed upstream, will be in 2.4.1) ln -sf %{_bindir}/rdoc bindings/ruby/rdoc1_9.rb @@ -159,6 +165,8 @@ mkdir build export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DFEDORA -DNO_SSL_CALLBACK" export SSL_LIB=`readlink %{_libdir}/libssl.so` +export CFLAGS="-D_GNU_SOURCE -fPIE -DPIE" +export LDFLAGS="$LDFLAGS -Wl,-z,now -pie" cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -282,6 +290,12 @@ rm -f /var/log/wsmand.log %changelog +* Mon Sep 30 2013 Vitezslav Crhonek - 2.4.0-2 +- Build with full relro +- Fix provides/requires +- Fix pam.d config (patch by Ales Ledvinka) + Resolves: #1013018 + * Tue Sep 17 2013 Vitezslav Crhonek - 2.4.0-1 - Update to openwsman-2.4.0 - Fix bogus date in %%changelog