X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=pound.spec;h=f728ae876f1b6f88a0302dc3356259a857e92ff6;hb=1cc2fb9c41885260738d8b36f552699a9e2a8bc5;hp=e2206a3f47a107cf685761974aebf8757e978f55;hpb=9df600c478b188710fd0b456a3fdba4f3a2f33a8;p=packages%2Fpound.git

diff --git a/pound.spec b/pound.spec
index e2206a3..f728ae8 100644
--- a/pound.spec
+++ b/pound.spec
@@ -1,23 +1,34 @@
+%bcond_without	tcmalloc	# tcmalloc allocator
+
+%ifarch x32
+%undefine       with_tcmalloc
+%endif
 Summary:	Pound - reverse-proxy and load-balancer
 Summary(pl.UTF-8):	Pound - reverse-proxy i load-balancer
 Name:		pound
-Version:	2.4.3
+Version:	2.7
 Release:	3
-License:	GPL
+License:	GPL v3
 Group:		Networking/Daemons
 Source0:	http://www.apsis.ch/pound/Pound-%{version}.tgz
-# Source0-md5:	2de4c2ac1023b420b74a1bc08fb93b8a
-Patch0:		%{name}-overquote.patch
-Patch1:		%{name}-hash-UL.patch
-Patch2:		%{name}-logfile.patch
+# Source0-md5:	ec8298aa3e4aee3ffbecdc0639d7f14a
 Source1:	%{name}.cfg
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
+Source4:	%{name}.logrotate
+Source5:	%{name}.tmpfiles
+Patch0:		%{name}-hash-UL.patch
+Patch1:		%{name}-logfile.patch
+Patch2:		%{name}-daemonize.patch
+Patch3:		%{name}-log-notice.patch
+Patch4:		%{name}-man.patch
 URL:		http://www.apsis.ch/pound/
 BuildRequires:	automake
+%{?with_tcmalloc:BuildRequires:	libtcmalloc-devel}
 BuildRequires:	openssl-devel >= 0.9.7d
+BuildRequires:	openssl-tools
 BuildRequires:	pcre-devel
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.644
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
@@ -25,9 +36,11 @@ Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
+Requires:	pcre >= 7.8
 Requires:	rc-scripts
 Provides:	group(pound)
 Provides:	user(pound)
+Conflicts:	logrotate < 3.7-4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/pound
@@ -53,25 +66,34 @@ swobodnego używania, kopiowania i rozdawania.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
 %configure \
-	--with-maxbuf=2048
+	--enable-super \
+	--enable-pcreposix \
+	%{__enable_disable tcmalloc} \
+	--disable-hoard \
+	--with-maxbuf=6144
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8,%{_sysconfdir},/etc/{sysconfig,rc.d/init.d}} \
-	$RPM_BUILD_ROOT{/var/log/{%{name},archive/%{name}},/var/run/%{name}}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8,%{_sysconfdir},/etc/{sysconfig,logrotate.d,rc.d/init.d}} \
+	$RPM_BUILD_ROOT{/var/log/{%{name},archive/%{name}},/var/run/%{name}} \
+	$RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
-install pound    $RPM_BUILD_ROOT%{_sbindir}
-install poundctl $RPM_BUILD_ROOT%{_sbindir}
-install pound.8  $RPM_BUILD_ROOT%{_mandir}/man8
-install poundctl.8 $RPM_BUILD_ROOT%{_mandir}/man8
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+install -p pound $RPM_BUILD_ROOT%{_sbindir}
+install -p poundctl $RPM_BUILD_ROOT%{_sbindir}
+cp -p pound.8  $RPM_BUILD_ROOT%{_mandir}/man8
+cp -p poundctl.8 $RPM_BUILD_ROOT%{_mandir}/man8
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+cp -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,6 +103,13 @@ rm -rf $RPM_BUILD_ROOT
 %useradd -u 200 -d /var/lib/%{name} -g %{name} -c "Pound Daemon" %{name}
 
 %post
+for a in access.log pound.log; do
+	if [ ! -f /var/log/%{name}/$a ]; then
+		touch /var/log/%{name}/$a
+		chown pound:pound /var/log/%{name}/$a
+		chmod 644 /var/log/%{name}/$a
+	fi
+done
 /sbin/chkconfig --add %{name}
 %service %{name} restart "Pound Daemon"
 
@@ -99,12 +128,15 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README FAQ CHANGELOG z*.py
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/pound
+%attr(755,root,root) %{_sbindir}/poundctl
 %dir %{_sysconfdir}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pound.cfg
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %{_mandir}/man8/*
+%{systemdtmpfilesdir}/%{name}.conf
 %dir /var/run/%{name}
 %dir %attr(751,root,root) /var/log/%{name}
 %attr(750,root,root) %dir /var/log/archive/%{name}