diff --git a/.gitignore b/.gitignore index 2b3ac84..b21d0cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /1.4.36.tar.gz +/1.4.40.tar.gz diff --git a/burp.service b/burp.service index 3d65eb8..9cb3ca8 100644 --- a/burp.service +++ b/burp.service @@ -1,10 +1,14 @@ [Unit] -Description=Burp backup server -After=network.target +Description=Burp Backup Server +Documentation=man:burp(1) +After=network.target nss-lookup.target syslog.target local-fs.target remote-fs.target [Service] -Type=notify -ExecStart=/usr/sbin/burp -c /etc/burp/burp-server.conf +Type=forking +EnvironmentFile=-/etc/sysconfig/burp-server +Environment=CONFIG=/etc/burp/burp-server.conf +ExecStart=/usr/sbin/burp -c $CONFIG +Restart=on-failure [Install] WantedBy=multi-user.target diff --git a/burp.spec b/burp.spec index b9b8f7c..4687e6f 100644 --- a/burp.spec +++ b/burp.spec @@ -1,7 +1,8 @@ Name: burp Summary: A network-based backup and restore program -Version: 1.4.36 -Release: 7%{?dist} +Version: 1.4.40 +Release: 1%{?dist} +Group: Backup Server License: AGPLv3 and BSD and GPLv2+ and LGPLv2+ URL: http://burp.grke.org/ Source0: https://github.com/grke/burp/archive/%{version}.tar.gz @@ -13,12 +14,13 @@ BuildRequires: openssl-devel BuildRequires: ncurses-devel BuildRequires: libacl-devel BuildRequires: uthash-devel -Requires: openssl-perl +BuildRequires: yajl-devel %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -BuildRequires: systemd-units +BuildRequires: systemd-units %endif + %description Burp is a network backup and restore program, using client and server. It uses librsync in order to save network traffic and to save on the @@ -26,6 +28,34 @@ amount of space that is used by each backup. It also uses VSS (Volume Shadow Copy Service) to make snapshots when backing up Windows computers. +%package client +Summary: burp backup client +Requires: librsync >= 1.0 +Provides: burp = %{version}-%{release} +Provides: burp-client = %{version}-%{release} + +%description client +Burp is a network backup and restore program, using client and server. +It uses librsync in order to save network traffic and to save on the +amount of space that is used by each backup. +It also uses VSS (Volume Shadow Copy Service) to make snapshots when +backing up Windows computers. + +%package server +Summary: burp backup server +Requires: burp-client%{?_isa} = %{version}-%{release} +Requires: openssl-perl +Provides: burp-server = %{version}-%{release} +Provides: bedup = %{version}-%{release} +Provides: vss_strip = %{version}-%{release} + +%description server +Burp is a network backup and restore program, using client and server. +It uses librsync in order to save network traffic and to save on the +amount of space that is used by each backup. +It also uses VSS (Volume Shadow Copy Service) to make snapshots when +backing up Windows computers. + %prep %setup -q -n %{name}-%{version} @@ -43,32 +73,60 @@ mkdir -p %{buildroot}%{_initddir} install -p -m 0755 %{SOURCE1} %{buildroot}%{_initddir}/%{name} %endif -%files +%files client +%defattr(-,root,root,-) %doc README CHANGELOG DONATIONS TODO CONTRIBUTORS UPGRADING %if 0%{?rhel} <= 6 %doc LICENSE %else %license LICENSE %endif -%{_sbindir}/* -%config(noreplace) /etc/%{name}/burp.conf -%config(noreplace) /etc/%{name}/burp-server.conf -%{_mandir}/man8/* +%config(noreplace) %{_sysconfdir}/burp/burp.conf +%dir %{_sysconfdir}/burp/CA-client +%dir %{_sysconfdir}/burp +%{_sbindir}/burp +%{_sbindir}/burp_ca +%{_mandir}/man8/burp.8* + +%files server +%doc docs/autoupgrade.txt docs/baremetal-windows2008.txt docs/baremetal-windows7.txt +%doc docs/burp_ca.txt docs/debug.txt docs/security-models.txt docs/shuffling.txt +%config(noreplace) %{_sysconfdir}/burp/CA.cnf +%config(noreplace) %{_sysconfdir}/burp/burp-server.conf +%config(noreplace) %{_sysconfdir}/burp/timer_script +%config(noreplace) %{_sysconfdir}/burp/summary_script +%config(noreplace) %{_sysconfdir}/burp/notify_script +%config(noreplace) %{_sysconfdir}/burp/ssl_extra_checks_script +%config(noreplace) %{_sysconfdir}/burp/autoupgrade/server/win32/script +%config(noreplace) %{_sysconfdir}/burp/autoupgrade/server/win64/script +%config(noreplace) %{_sysconfdir}/burp/clientconfdir/incexc/example +%config(noreplace) %{_sysconfdir}/burp/clientconfdir/testclient +%dir %{_sysconfdir}/burp/autoupgrade/server/win32 +%dir %{_sysconfdir}/burp/autoupgrade/server/win64 +%dir %{_sysconfdir}/burp/autoupgrade/server +%dir %{_sysconfdir}/burp/autoupgrade +%dir %{_sysconfdir}/burp/clientconfdir/incexc +%dir %{_sysconfdir}/burp/clientconfdir +%dir %{_localstatedir}/spool/burp %attr(750 root root) +%{_sbindir}/vss_strip +%{_sbindir}/bedup +%{_mandir}/man8/vss_strip.8* +%{_mandir}/man8/bedup.8* +%{_mandir}/man8/burp_ca.8* %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 %{_unitdir}/burp.service %else %{_initddir}/%{name} %endif -%{_sysconfdir}/* -%post +%post server %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 %systemd_post burp.service %else /sbin/chkconfig --add %{name} %endif -%preun +%preun server %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 %systemd_preun burp.service %else @@ -79,11 +137,17 @@ fi %endif %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -%postun +%postun server %systemd_postun_with_restart burp.service %endif + %changelog +* Wed Jul 08 2015 Pierre Bourgin - 1.4.40-1 +- bumped to 1.4.40 +- provides burp-{client,server} packages now. +- rewrite to match EPEL SPEC file (http://pkgs.fedoraproject.org/cgit/burp.git/tree/burp.spec) + * Wed Jun 17 2015 Fedora Release Engineering - 1.4.36-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 22d542a..627ef36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -32a41ec106629a5bb09fcf0d973d95f9 1.4.36.tar.gz +f664501ad80d5a1cf01f10fa70352ce5 1.4.40.tar.gz