Hello community,

here is the log from the commit of package sblim-sfcb for openSUSE:Factory 
checked in at 2018-05-17 18:04:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sblim-sfcb (Old)
 and      /work/SRC/openSUSE:Factory/.sblim-sfcb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "sblim-sfcb"

Thu May 17 18:04:48 2018 rev:54 rq:609928 version:1.4.9

Changes:
--------
--- /work/SRC/openSUSE:Factory/sblim-sfcb/sblim-sfcb.changes    2018-02-09 
15:53:26.710679142 +0100
+++ /work/SRC/openSUSE:Factory/.sblim-sfcb.new/sblim-sfcb.changes       
2018-05-17 18:05:26.371834293 +0200
@@ -1,0 +2,9 @@
+Tue May 15 13:19:28 UTC 2018 - adam.ma...@suse.de
+
+- service_init_certs.patch: Certificates should be generated at
+  runtime, not during installation. The script should also take
+  config file values for certification locations, in case it was
+  adjusted by the user. (bsc#1092281)
+- missing_makefile_dependencies.patch: fix Makefile.am dependencies
+
+-------------------------------------------------------------------

New:
----
  gen_ssl_certs.sh
  missing_makefile_dependencies.patch
  service_init_certs.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sblim-sfcb.spec ++++++
--- /var/tmp/diff_new_pack.Q2kG2N/_old  2018-05-17 18:05:28.215766856 +0200
+++ /var/tmp/diff_new_pack.Q2kG2N/_new  2018-05-17 18:05:28.219766710 +0200
@@ -41,6 +41,7 @@
 Source5:        %{name}-rpmlintrc
 Source6:        susefirewall.conf
 Source7:        README.conf
+Source8:        gen_ssl_certs.sh
 
 # SUSE build service
 Patch1:         0001-Makefile.am-Honor-build-environment.patch
@@ -75,6 +76,9 @@
 Patch23:        0023-Alias-sblim-sfcb-service-to-sfcb-and-sfcbd.patch
 # SLE10's curl is too old
 Patch24:        0024-CURLOPT_POSTREDIR-might-not-be-defined.patch
+# bsc#1092281 - certificates shouldn't be generated during installation.
+Patch25:        service_init_certs.patch
+Patch26:        missing_makefile_dependencies.patch
 
 Provides:       cim-server
 Provides:       cimserver
@@ -165,6 +169,8 @@
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
+%patch26 -p1
 
 export PATCH_GET=0
 
@@ -238,6 +244,7 @@
 # Added NWP 5/14/08 - transition to using cim-schema rpm instead of 
internal-built schema
 ln -sf /usr/share/mof/cim-current $RPM_BUILD_ROOT/%{_datadir}/sfcb/CIM
 install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/etc/pam.d/sfcb
+install -m 0755 %SOURCE8 %{buildroot}%{_datadir}/sfcb/gen_ssl_certs.sh
 rm $RPM_BUILD_ROOT%{_libdir}/sfcb/*.la
 %if 0%{?suse_version} > 1010
 # firewall service definition
@@ -273,6 +280,7 @@
 echo "%{_bindir}/*" >> _pkg_list
 echo "%{_sbindir}/*" >> _pkg_list
 echo "%{_libdir}/sfcb/*.so*" >> _pkg_list
+echo "%{_datadir}/sfcb/gen_ssl_certs.sh" >> _pkg_list
 echo =======================================
 cat _pkg_list
 
@@ -296,7 +304,6 @@
 %post
 test -n "$FIRST_ARG" || FIRST_ARG=$1
 %if 0%{?has_systemd}
-%{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb
 %service_add_post sblim-sfcb.service
 %else
 #removed NWP, placed into init script for first service startup

++++++ gen_ssl_certs.sh ++++++
#!/bin/bash

CERTIFICATE_PATH=/etc/sfcb/clist.pem

# Fetch certificate path from the config file.
CONFIG_PATH=`grep '^sslCertificateFilePath:' /etc/sfcb/sfcb.cfg | sed -e 
's,sslCertificateFilePath:\\s*,,'`

if [ 'x'$CONFIG_PATH != 'x' ]; then
    CERTIFICATE_PATH=$CONFIG_PATH
fi

# Exit early if server certificate exists
if [ -e $CERTIFICATE_PATH ]; then
    exit 0
fi

# Generate server certificates
D=`dirname $CERTIFICATE_PATH`
exec /usr/share/sfcb/genSslCert.sh $D

++++++ missing_makefile_dependencies.patch ++++++
Index: sblim-sfcb-1.4.9/Makefile.am
===================================================================
--- sblim-sfcb-1.4.9.orig/Makefile.am
+++ sblim-sfcb-1.4.9/Makefile.am
@@ -360,6 +360,7 @@ sfcbproc_SOURCES=sfcbproc.c
 
 sfcbinst2mof_SOURCES=sfcbinst2mof.c
 sfcbinst2mof_LDADD = -lsfcFileRepository -lsfcBrokerCore
+sfcbinst2mof_DEPENDENCIES=libsfcFileRepository.la libsfcBrokerCore.la
 
 sfcbtrace_SOURCES=sfcbtrace.c
 sfcbtrace_LDADD = -lsfcBrokerCore
++++++ service_init_certs.patch ++++++
Index: sblim-sfcb-1.4.9/sblim-sfcb.service.pre.in
===================================================================
--- sblim-sfcb-1.4.9.orig/sblim-sfcb.service.pre.in
+++ sblim-sfcb-1.4.9/sblim-sfcb.service.pre.in
@@ -3,6 +3,7 @@ Description=Small Footprint CIM Broker S
 After=syslog.target
 
 [Service]
+ExecStartPre=${exec_prefix}/share/sfcb/gen_ssl_certs.sh
 ExecStart=${exec_prefix}/sbin/sfcbd
 
 [Install]

Reply via email to