Compare commits

..

No commits in common. "78a66f5212c41d4e3488b1406f071f4e546f23a9" and "aba18afc48440f2523f0903bd0b6adc8b6ba5f73" have entirely different histories.

4 changed files with 28 additions and 69 deletions

View File

@ -1,24 +0,0 @@
Index: phodav-2.5/data/spice-webdavd.service
===================================================================
--- phodav-2.5.orig/data/spice-webdavd.service
+++ phodav-2.5/data/spice-webdavd.service
@@ -4,6 +4,19 @@ Requires=dbus.service avahi-daemon.servi
After=dbus.service avahi-daemon.service
[Service]
+# added automatically, for details please see
+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
+ProtectSystem=full
+ProtectHome=true
+PrivateDevices=true
+ProtectHostname=true
+ProtectClock=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+# end of automatic additions
Type=simple
EnvironmentFile=-/etc/sysconfig/spice-webdavd
ExecStart=/usr/sbin/spice-webdavd -p 9843 $SPICE_WEBDAVD_EXTRA_ARGS

BIN
phodav-2.2.tar.xz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,28 +1,20 @@
Name: phodav
Version: 3.0
Release: 3
Version: 2.2
Release: 7
Summary: A WebDav server implementation using libsoup
License: LGPLv2+
URL: https://wiki.gnome.org/phodav
Source0: http://download.gnome.org/sources/%{name}/%{version}/%{name}-%{version}.tar.xz
Patch0: harden_spice-webdavd.service.patch
BuildRequires: asciidoc xmlto gcc git-core meson gettext-devel gtk-doc pkgconfig systemd
BuildRequires: pkgconfig(avahi-client)
BuildRequires: pkgconfig(avahi-gobject)
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.44
BuildRequires: pkgconfig(glib-2.0) >= 2.44
BuildRequires: pkgconfig(libsoup-3.0)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(udev)
BuildRequires: systemd-devel systemd-units libsoup-devel avahi-gobject-devel
BuildRequires: intltool asciidoc xmlto avahi-gobject
%description
A WebDAV server implementation using libsoup (RFC 4918).
%package -n libphodav
Summary: A library to serve files with WebDAV
Provides: libphodav-2.0 = 0:%{version}-%{release} libphodav2 = 0:%{version}-%{release}
Obsoletes: libphodav-2.0 <= 0:2.0-3 libphodav2 <= 0:2.0-4 libphodav-1.0 <= 0:0.4-6
%description -n libphodav
This package provides the library of WebDAV server.
@ -30,6 +22,8 @@ This package provides the library of WebDAV server.
%package -n libphodav-devel
Summary: Development files for libphodav
Requires: libphodav = %{version}-%{release}
Provides: libphodav-2.0-devel = 0:%{version}-%{release} libphodav2-devel = 0:%{version}-%{release}
Obsoletes: libphodav-2.0-devel <= 0:2.0-3 libphodav2-devel <= 0:2.0-4 libphodav-1.0-devel <= 0:0.4-6
%description -n libphodav-devel
The libphodav-devel package includes the header files for libphodav.
@ -42,6 +36,12 @@ The chezdav package contains a simple tool allows to share a
particular directory (with optional digest authentication).
The service is announced over mDNS for clients to discover.
%package -n chezdav-help
Summary: Help documentation for the chezdav-help
%description -n chezdav-help
Help documentation for the chezdav-help
%package -n spice-webdavd
Summary: Spice daemon for the DAV channel
Requires: avahi
@ -56,18 +56,16 @@ the Spice virtio channel.
%prep
%autosetup -p1
sed -i 's/PrivateDevices=true/PrivateDevices=false/' data/spice-webdavd.service
sed -i 's/ProtectClock=true/ProtectClock=false/' data/spice-webdavd.service
%build
%meson -Davahi=enabled
%meson_build
%configure --with-avahi
%make_build
%install
%meson_install
%make_install
%delete_la_and_a
%find_lang phodav-3.0 --with-gnome
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcspice-webdavd
%find_lang phodav-2.0 --with-gnome
%post -n libphodav
/sbin/ldconfig
@ -84,45 +82,30 @@ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcspice-webdavd
%postun -n spice-webdavd
%systemd_postun_with_restart spice-webdavd.service
%files -n libphodav -f phodav-3.0.lang
%files -n libphodav -f phodav-2.0.lang
%doc COPYING
%{_libdir}/libphodav-3.0.so.0*
%{_libdir}/libphodav-2.0.so.0*
%files -n libphodav-devel
%dir %{_includedir}/libphodav-3.0/
%{_includedir}/libphodav-3.0/*
%{_libdir}/libphodav-3.0.so
%dir %{_includedir}/libphodav-2.0/
%{_includedir}/libphodav-2.0/*
%{_libdir}/libphodav-2.0.so
%{_libdir}/pkgconfig/*
%{_datadir}/gtk-doc/html/phodav-3.0/*
%{_datadir}/gtk-doc/html/phodav-2.0/*
%files -n chezdav
%{_bindir}/chezdav
%files -n chezdav-help
%{_mandir}/man1/chezdav.1*
%files -n spice-webdavd
%doc COPYING
%{_sbindir}/spice-webdavd
%{_sbindir}/rcspice-webdavd
%{_udevrulesdir}/70-spice-webdavd.rules
/usr/lib/udev/rules.d/70-spice-webdavd.rules
%{_unitdir}/spice-webdavd.service
%changelog
* Wed Mar 22 2023 haolei xuan <haolei.xuan@turbolinux.com.cn> - 3.0-3
- fix issue:I6IJWH
* Fri Mar 03 2023 zhuang li <zhuang.li@turbolinux.com.cn> - 3.0-2
- add sed 3.0-2
* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 3.0-1
- update to 3.0
* Wed Jun 30 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 2.5-1
- Upgrade to 2.5
- Use meson rebuild
* Mon May 31 2021 huanghaitao <huanghaitao8@huawei.com> - 2.2-8
- Completing build dependencies
* Tue Mar 9 2021 lingsheng <lingsheng@huawei.com> - 2.2-7
- Add require avahi for spice-webdavd