Accepting request 361424 from home:MargueriteSu:branches:network:vpn

OBS-URL: https://build.opensuse.org/request/show/361424
OBS-URL: https://build.opensuse.org/package/show/network:vpn/ocserv?expand=0&rev=5

ocserv.spec

@@ -16,9 +16,9 @@
 #
 
 Name:           ocserv
-Version:	0.10.10
+Version:	0.10.11
 Release:	0
-License:	GPL-2.0+
+License:	GPL-2.0
 Summary:	OpenConnect VPN Server
 Url:	http://www.infradead.org/ocserv
 Group:	Productivity/Networking/Security
@@ -26,6 +26,8 @@ Source:	ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz
 Source1:	ca.tmpl
 Source2:	server.tmpl
 Source3:	user.tmpl
+Source4:	ocserv.SuSEfirewall
+Source5:	ocserv.sysctl
 Source99:	README.SUSE
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org $LIBSYSTEMD_DAEMON env is not set on openSUSE
 Patch1:	%{name}-enable-systemd.patch
@@ -85,11 +87,14 @@ autoreconf -fiv
 	--disable-rpath \
 	--enable-local-libopts \
 	--enable-libopts-install 	
-make %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot} %{?_smp_mflags}
 
+install -Dm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ocserv
+install -Dm 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysctl.d/60-ocserv.conf
+
 install -d %{buildroot}%{_sysconfdir}/ocserv/certificates
 install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/ocserv/certificates
 install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/ocserv/certificates
@@ -108,20 +113,20 @@ install -m 0644 doc/systemd/socket-activated/ocserv.service %{buildroot}%{_unitd
 %service_add_pre ocserv.service ocserv.socket
 
 %post
-/sbin/ldconfig
 %service_add_post ocserv.service ocserv.socket
 
 %preun
 %service_del_preun ocserv.service ocserv.socket
 
 %postun
-/sbin/ldconfig
 %service_del_postun ocserv.service ocserv.socket
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog LICENSE NEWS README.md COPYING TODO
 %config %{_sysconfdir}/ocserv
+%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ocserv
+%config(noreplace) %{_sysconfdir}/sysctl.d/60-ocserv.conf
 %{_bindir}/occtl
 %{_bindir}/ocpasswd
 %{_bindir}/ocserv-script
@@ -133,3 +138,4 @@ install -m 0644 doc/systemd/socket-activated/ocserv.service %{buildroot}%{_unitd
 %{_mandir}/man8/ocpasswd.8.gz
 %{_mandir}/man8/ocserv.8.gz
 
+%changelog