Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocserv for openSUSE:Factory checked in at 2024-12-08 11:37:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocserv (Old) and /work/SRC/openSUSE:Factory/.ocserv.new.21547 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocserv" Sun Dec 8 11:37:52 2024 rev:26 rq:1228988 version:1.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ocserv/ocserv.changes 2024-08-25 12:10:56.373383597 +0200 +++ /work/SRC/openSUSE:Factory/.ocserv.new.21547/ocserv.changes 2024-12-08 11:38:45.505679513 +0100 @@ -1,0 +2,7 @@ +Sat Nov 30 00:19:36 UTC 2024 - Richard Rahl <rra...@opensuse.org> + +- use https for downloading sources (over ftp) +- actually verify tarballs +- use as many pkgconfig and rubygem names + +------------------------------------------------------------------- Old: ---- gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg New: ---- ocserv.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocserv.spec ++++++ --- /var/tmp/diff_new_pack.ZUMazy/_old 2024-12-08 11:38:47.565765095 +0100 +++ /var/tmp/diff_new_pack.ZUMazy/_new 2024-12-08 11:38:47.581765760 +0100 @@ -16,6 +16,8 @@ # +#!BuildIgnore: pkgconfig(libevent) + Name: ocserv Version: 1.3.0 Release: 0 @@ -23,16 +25,15 @@ License: GPL-2.0-only Group: Productivity/Networking/Security URL: https://ocserv.gitlab.io/www/ -#Git-Clone: https://gitlab.com/openconnect/ocserv.git -Source: ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz -Source1: ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz.sig +Source: https://www.infradead.org/%{name}/download/%{name}-%{version}.tar.xz +Source1: https://www.infradead.org/%{name}/download/%{name}-%{version}.tar.xz.sig Source2: ca.tmpl Source3: server.tmpl Source4: user.tmpl Source5: ocserv-forwarding.sh Source6: ocserv.firewalld.xml Source99: README.SUSE -Source100: gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg +Source100: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x1f42418905d8206aa754ccdc29ee58b996865171#/%{name}.keyring #PATCH-FIX-UPSTREAM marguer...@opensuse.org $LIBSYSTEMD_DAEMON env is not set on openSUSE Patch1: %{name}-enable-systemd.patch #PATCH-FIX-UPSTREAM marguer...@opensuse.org tweak configuration @@ -40,33 +41,37 @@ #PATCH-FIX-OPENSUSE marguer...@opensuse.org leap doesn't have LZ4_compress_default Patch3: %{name}-LZ4_compress_default.patch BuildRequires: autogen -BuildRequires: dbus-1-devel BuildRequires: firewall-macros +BuildRequires: firewalld BuildRequires: freeradius-client-devel BuildRequires: gperf BuildRequires: gpg2 BuildRequires: ipcalc -BuildRequires: libev-devel -#!BuildIgnore: libevent-devel -BuildRequires: /usr/bin/ronn -BuildRequires: libgnutls-devel >= 3.1.10 -BuildRequires: liblz4-devel -BuildRequires: libmaxminddb-devel -BuildRequires: libnl3-devel -BuildRequires: libprotobuf-c-devel -BuildRequires: libseccomp-devel -BuildRequires: libtalloc-devel BuildRequires: libtool -BuildRequires: pam-devel BuildRequires: pkgconfig BuildRequires: protobuf-c -BuildRequires: readline-devel +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(gnutls) >= 3.1.10 +BuildRequires: pkgconfig(libev) +BuildRequires: pkgconfig(liblz4) +BuildRequires: pkgconfig(libmaxminddb) +BuildRequires: pkgconfig(libnl-3.0) BuildRequires: pkgconfig(liboath) +BuildRequires: pkgconfig(libprotobuf-c) +BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(pam) +BuildRequires: pkgconfig(readline) +BuildRequires: pkgconfig(talloc) +BuildRequires: rubygem(ronn-ng) # /usr/bin/certtool for generating certificates Requires: gnutls >= 3.1.10 %{?systemd_requires} +%if 0%{?suse_version} < 1600 +ExclusiveArch: do_not_build +%endif + %description OpenConnect server (ocserv) is an SSL VPN server. Its purpose is to be a secure, small, fast and configurable VPN server. It implements @@ -97,62 +102,59 @@ --disable-rpath \ --enable-local-libopts \ --enable-libopts-install -make V=1 %{?_smp_mflags} +%make_build %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install +%make_install DESTDIR=%{buildroot} -install -Dm 0755 %{SOURCE5} %{buildroot}%{_sbindir}/ocserv-forwarding -install -D -m 644 %{SOURCE6} %{buildroot}%{_prefix}/lib/firewalld/services/ocserv.xml +install -Dm 0755 %{SOURCE5} %{buildroot}%{_sbindir}/%{name}-forwarding +install -D -m 644 %{SOURCE6} %{buildroot}%{_prefix}/lib/firewalld/services/%{name}.xml -install -d %{buildroot}%{_sysconfdir}/ocserv/certificates -install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/ocserv/certificates -install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/ocserv/certificates -install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/ocserv/certificates -install -m 0644 %{SOURCE99} %{buildroot}%{_sysconfdir}/ocserv/ -install -m 0644 doc/sample.config %{buildroot}%{_sysconfdir}/ocserv/ocserv.conf +install -d %{buildroot}%{_sysconfdir}/%{name}/certificates +install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/certificates +install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/certificates +install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}/certificates +install -m 0644 %{SOURCE99} %{buildroot}%{_sysconfdir}/%{name}/ +install -m 0644 doc/sample.config %{buildroot}%{_sysconfdir}/ocserv/%{name}.conf install -m 0644 doc/sample.passwd %{buildroot}%{_sysconfdir}/ocserv/ocpasswd -install -m 0755 doc/scripts/ocserv-script %{buildroot}%{_bindir} +install -m 0755 doc/scripts/%{name}-script %{buildroot}%{_bindir} install -d %{buildroot}%{_unitdir} # if --with-dubs, here should be "standalone" -install -m 0644 doc/systemd/socket-activated/ocserv.socket %{buildroot}%{_unitdir} -install -m 0644 doc/systemd/socket-activated/ocserv.service %{buildroot}%{_unitdir} +install -m 0644 doc/systemd/socket-activated/%{name}.socket %{buildroot}%{_unitdir} +install -m 0644 doc/systemd/socket-activated/%{name}.service %{buildroot}%{_unitdir} -sed -i '/^\[Service\].*/a ExecStopPost=%{_sbindir}/ocserv-forwarding --disable' %{buildroot}%{_unitdir}/ocserv.service -sed -i '/^\[Service\].*/a ExecStartPre=%{_sbindir}/ocserv-forwarding --enable' %{buildroot}%{_unitdir}/ocserv.service +sed -i '/^\[Service\].*/a ExecStopPost=%{_sbindir}/%{name}-forwarding --disable' %{buildroot}%{_unitdir}/%{name}.service +sed -i '/^\[Service\].*/a ExecStartPre=%{_sbindir}/%{name}-forwarding --enable' %{buildroot}%{_unitdir}/%{name}.service %pre -%service_add_pre ocserv.service ocserv.socket +%service_add_pre %{name}.service %{name}.socket %post -%service_add_post ocserv.service ocserv.socket +%service_add_post %{name}.service %{name}.socket %firewalld_reload %preun -%service_del_preun ocserv.service ocserv.socket +%service_del_preun %{name}.service %{name}.socket %postun -%service_del_postun ocserv.service ocserv.socket +%service_del_postun %{name}.service %{name}.socket %files -%defattr(-,root,root) %doc AUTHORS NEWS README.md %license COPYING -%config %{_sysconfdir}/ocserv -%dir %{_prefix}/lib/firewalld -%dir %{_prefix}/lib/firewalld/services -%{_prefix}/lib/firewalld/services/ocserv.xml +%config %{_sysconfdir}/%{name} +%{_prefix}/lib/firewalld/services/%{name}.xml %{_bindir}/occtl %{_bindir}/ocpasswd -%{_bindir}/ocserv-script -%{_libexecdir}/ocserv-fw -%{_sbindir}/ocserv -%{_sbindir}/ocserv-forwarding -%{_sbindir}/ocserv-worker -%{_unitdir}/ocserv.service -%{_unitdir}/ocserv.socket -%{_mandir}/man8/occtl.8%{ext_man} -%{_mandir}/man8/ocpasswd.8%{ext_man} -%{_mandir}/man8/ocserv.8%{ext_man} +%{_bindir}/%{name}-script +%{_libexecdir}/%{name}-fw +%{_sbindir}/%{name} +%{_sbindir}/%{name}-forwarding +%{_sbindir}/%{name}-worker +%{_unitdir}/%{name}.service +%{_unitdir}/%{name}.socket +%{_mandir}/man?/occtl.?%{ext_man} +%{_mandir}/man?/ocpasswd.?%{ext_man} +%{_mandir}/man?/%{name}.?%{ext_man}