dist-git conversion

#2781)

BackupPC.htaccess

@@ -9,9 +9,10 @@
 order deny,allow
 deny from all
 allow from 127.0.0.1
+allow from ::1
 AuthType Basic
 AuthUserFile /etc/BackupPC/apache.users
-AuthName "BackupPC
+AuthName "BackupPC"
 
 require valid-user
 

BackupPC.spec

@@ -6,13 +6,13 @@
 
 Name:           BackupPC
 Version:        3.1.0
-Release:        9%{?dist}
+Release:        13%{?dist}
 Summary:        High-performance backup system
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://backuppc.sourceforge.net/
-Source0:        http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/backuppc/%{name}-%{version}.tar.gz
 Source1:        BackupPC.htaccess
 Source2:        BackupPC.logrotate
 Source3:        BackupPC-README.fedora
@@ -95,8 +95,7 @@ allow httpd_t httpd_sys_content_t:sock_file getattr;
 EOF
 
 cat >%{name}.fc <<EOF
-%{_sysconfdir}/%{name}(/.*)?            gen_context(system_u:object_r:httpd_sys_content_t,s0)
+%{_sysconfdir}/%{name}(/.*)?            gen_context(system_u:object_r:httpd_sys_script_rw_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
@@ -178,11 +177,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
@@ -227,6 +223,19 @@ fi
 %endif
 
 %changelog
+* Mon May 17 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-13
+- Fix for bug #592762
+
+* Sun Feb 28 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-12
+- Add "::1" to the apache config file for default allowed adresses
+- Fix a typo in the apache config file
+
+* Sun Jan 17 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-11
+- Really fix selinux labelling backup directory (bug #525948)
+
+* Fri Jan 15 2010 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-10
+- Fix selinux labelling backup directory (bug #525948)
+
 * Fri Sep 25 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-9
 - Fix security bug (bug #518412)
 

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)