dist-git conversion

#2781)

BackupPC.spec

@@ -6,7 +6,7 @@
 
 Name:           BackupPC
 Version:        3.1.0
-Release:        5%{?dist}
+Release:        9%{?dist}
 Summary:        High-performance backup system
 
 Group:          Applications/System
@@ -95,11 +95,9 @@ allow httpd_t httpd_sys_content_t:sock_file getattr;
 EOF
 
 cat >%{name}.fc <<EOF
-%{_sysconfdir}/%{name}                  system_u:object_r:httpd_sys_content_t:s0
-%{_sysconfdir}/%{name}/pc               system_u:object_r:httpd_sys_script_rw_t:s0
-%{_sysconfdir}/%{name}/config.pl        system_u:object_r:httpd_sys_content_t:s0
-%{_sysconfdir}/%{name}/hosts            system_u:object_r:httpd_sys_content_t:s0
-%{_localstatedir}/log/%{name}           system_u:object_r:httpd_sys_content_t:s0
+%{_sysconfdir}/%{name}(/.*)?            gen_context(system_u:object_r:httpd_sys_content_t,s0)
+%{_sysconfdir}/%{name}/pc(/.*)?         gen_context(system_u:object_r:httpd_sys_script_rw_t,s0)
+%{_localstatedir}/log/%{name}(/.*)?     gen_context(system_u:object_r:httpd_sys_content_t,s0)
 EOF
 %endif
 
@@ -152,6 +150,7 @@ sed -i s,$LOGNAME,backuppc,g init.d/linux-backuppc
 
 sed -i 's/^\$Conf{XferMethod}\ =.*/$Conf{XferMethod} = "rsync";/' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
 sed -i 's|^\$Conf{CgiURL}\ =.*|$Conf{CgiURL} = "http://localhost/BackupPC";|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
+sed -i 's|ClientNameAlias           => 1,|ClientNameAlias           => 0,|' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.pl
 
 %if %{useselinux}
      # SElinux 
@@ -179,11 +178,8 @@ fi
 (
      # Install/update Selinux policy
      semodule -i %{_datadir}/selinux/packages/%{name}/%{name}.pp
-     # files owned by RPM
-     fixfiles -R %{name} restore
      # files created by app
      restorecon -R %{_sysconfdir}/%{name}
-     restorecon -R %{_localstatedir}/lib/%{name}
      restorecon -R %{_localstatedir}/log/%{name}
 ) &>/dev/null
 %endif
@@ -228,6 +224,18 @@ fi
 %endif
 
 %changelog
+* Sun Jan 17 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-9
+- Really fix selinux labelling backup directory (bug #525948)
+
+* Fri Jan 15 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-8
+- Fix selinux labelling backup directory (bug #525948)
+
+* Fri Sep 25 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-7
+- Fix security bug (bug #518412)
+
+* Fri Sep 18 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-6
+- Fix SELinux policy module for UserEmailInfo.pl file
+
 * Fri Apr 10 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-5
 - Fix TopDir change (bug #473944)
 

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: BackupPC
-# $Id$
-NAME := BackupPC
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)