2c9270b9b849b2c86ae6301dd722c97757bc9256.patch

@@ -1,45 +0,0 @@
-From 2c9270b9b849b2c86ae6301dd722c97757bc9256 Mon Sep 17 00:00:00 2001
-From: Craig Barratt <19445341+craigbarratt@users.noreply.github.com>
-Date: Fri, 15 Apr 2022 11:45:57 -0700
-Subject: [PATCH] remove erroneous 2nd argument to Data::Dumper; see #466
-
----
- configure.pl                 | 2 +-
- lib/BackupPC/Storage/Text.pm | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.pl b/configure.pl
-index 6826ebcd..d5deef58 100755
---- a/configure.pl
-+++ b/configure.pl
-@@ -668,7 +668,7 @@
-           if ( defined($Conf{CgiUserConfigEdit}{$p}) );
-     }
-     $Conf{CgiUserConfigEdit} = $new;
--    my $d = Data::Dumper->new([$new], [*value]);
-+    my $d = Data::Dumper->new([$new]);
-     $d->Indent(1);
-     $d->Terse(1);
-     $d->Sortkeys(1);
-diff --git a/lib/BackupPC/Storage/Text.pm b/lib/BackupPC/Storage/Text.pm
-index e9df664f..09fcb246 100644
---- a/lib/BackupPC/Storage/Text.pm
-+++ b/lib/BackupPC/Storage/Text.pm
-@@ -422,7 +422,7 @@ sub ConfigFileMerge
-                 my $var = $1;
-                 $skipExpr = "\$fakeVar = $2\n";
-                 if ( exists($newConf->{$var}) ) {
--                    my $d = Data::Dumper->new([$newConf->{$var}], [*value]);
-+                    my $d = Data::Dumper->new([$newConf->{$var}]);
-                     $d->Indent(1);
-                     $d->Terse(1);
-                     $d->Sortkeys(1);
-@@ -454,7 +454,7 @@ sub ConfigFileMerge
-     #
-     foreach my $var ( sort(keys(%$newConf)) ) {
-         next if ( $done->{$var} );
--        my $d = Data::Dumper->new([$newConf->{$var}], [*value]);
-+        my $d = Data::Dumper->new([$newConf->{$var}]);
-         $d->Indent(1);
-         $d->Terse(1);
-         $d->Sortkeys(1);

BackupPC.spec

@@ -10,11 +10,10 @@
 
 Name:           BackupPC
 Version:        4.4.0
-Release:        23%{?dist}
+Release:        3%{?dist}
 Summary:        High-performance backup system
 
-# Automatically converted from old format: GPLv2+ - review is highly recommended.
-License:        GPL-2.0-or-later
+License:        GPLv2+
 URL:            http://backuppc.github.io/backuppc/index.html
 Source0:        https://github.com/backuppc/backuppc/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1:        BackupPC.htaccess
@@ -28,8 +27,6 @@ Source7:        README.RHEL
 Source8:        apache.users
 
 Patch0:         BackupPC-4.1.3-docfix.patch
-# Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2091514
-Patch1:         https://github.com/backuppc/backuppc/commit/2c9270b9b849b2c86ae6301dd722c97757bc9256.patch
 
 BuildRequires:  gcc
 BuildRequires:  perl-generators
@@ -79,6 +76,7 @@ Requires:       perl-Time-modules
 Requires:       samba-client
 Requires:       %{_sbindir}/sendmail
 
+Requires(pre):  shadow-utils
 %if 0%{?_with_systemd}
 Requires(post): shadow-utils
 %{?systemd_requires}
@@ -159,11 +157,6 @@ for m in Net/FTP; do
   sed -i "\@lib/$m@d" configure.pl 
 done
 
-# Create a sysusers.d config file
-cat >backuppc.sysusers.conf <<EOF
-u backuppc - - %{_localstatedir}/lib/%{name} -
-EOF
-
 
 %build
 # Build C wrapper
@@ -226,7 +219,7 @@ install -p -m 0755 systemd/src/init.d/linux-backuppc %{buildroot}%{_initrddir}/b
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
 mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
-mkdir -p %{buildroot}%{_sysconfdir}/%{name}/pc
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}
 
 install -p -m 0644 %{SOURCE1} \
     %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
@@ -245,9 +238,9 @@ install -pm 0755 BackupPC_Admin %{buildroot}%{_libexecdir}/%{name}/
 mkdir -p %{buildroot}%{_datadir}/selinux/packages/%{name}
 install -m 0644 selinux/%{name}.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}.pp
 
-install -m0644 -D backuppc.sysusers.conf %{buildroot}%{_sysusersdir}/backuppc.conf
-
 
+%pre
+%{_sbindir}/useradd -d %{_localstatedir}/lib/%{name} -r -s /sbin/nologin backuppc 2> /dev/null || :
 
 %preun
 %if 0%{?_with_systemd}
@@ -333,72 +326,9 @@ fi
 %attr(4750,backuppc,apache) %{_libexecdir}/%{name}/BackupPC_Admin
 %attr(-,backuppc,root) %{_localstatedir}/lib/%{name}/
 %{_datadir}/selinux/packages/%{name}/%{name}.pp
-%{_sysusersdir}/backuppc.conf
 
 
 %changelog
-* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.0-19
-- Add sysusers.d config file to allow rpm to create users/groups automatically
-
-* Mon Jan 20 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 4.4.0-16
-- convert license to SPDX
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Mar 25 2024 Orion Poplawski <orion@nwra.com> - 4.4.0-14
-- Create and own /etc/BackupPC/pc
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jan 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Aug 23 2022 Richard Shaw <hobbes1069@gmail.com> - 4.4.0-8
-- Add patch to fix #2091514 where saving a configuration change in the web UI
-  would replace {} with () in the config file.
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.0-4
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild