rpms/tor/F-8 tor.spec,1.17,1.18
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Sun Jul 20 12:57:30 UTC 2008
Author: ensc
Update of /cvs/extras/rpms/tor/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15465
Modified Files:
tor.spec
Log Message:
- updated to 0.2.0.30
- (re)enabled transparent proxy support by workarounding broken
<linux/netfilter_ipv4.h> header
- moved the 'geoip' database to /var/lib/tor-data where it can be
updated periodically
- built with -Wl,--as-needed
Index: tor.spec
===================================================================
RCS file: /cvs/extras/rpms/tor/F-8/tor.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tor.spec 21 Jun 2008 15:21:12 -0000 1.17
+++ tor.spec 20 Jul 2008 12:56:44 -0000 1.18
@@ -10,8 +10,8 @@
%{!?release_func:%global release_func() %1%{?dist}}
Name: tor
-Version: 0.1.2.19
-Release: %release_func 2
+Version: 0.2.0.30
+Release: %release_func 1
Group: System Environment/Daemons
License: BSD
Summary: Anonymizing overlay network for TCP (The onion router)
@@ -27,8 +27,10 @@
Source0: http://tor.eff.org/dist/%name-%version.tar.gz
Source1: http://tor.eff.org/dist/%name-%version.tar.gz.asc
Source2: tor.logrotate
+Source3: update-geoip
+Source4: netfilter-ipv4.h
Patch0: tor-0.1.1.26-setgroups.patch
-Patch1: tor-0.1.2.16-open.patch
+Patch1: tor-0.2.0.30-geoippath.patch
BuildRoot: %_tmppath/%name-%version-%release-root
BuildRequires: libevent-devel openssl-devel transfig ghostscript
@@ -90,7 +92,9 @@
%prep
%setup -q
%patch0 -p1 -b .setgroups
-%patch1 -p1 -b .open
+%patch1 -p1 -b .geoippath
+
+install -p -m0644 %SOURCE3 .
sed -i -e 's!^\(\# *\)\?DataDirectory .*!DataDirectory %homedir/.tor!' src/config/torrc.sample.in
cat <<EOF >>src/config/torrc.sample.in
@@ -98,8 +102,13 @@
User %username
EOF
+mkdir -p linux
+install -p -m0644 %SOURCE4 linux/netfilter_ipv4.h
+
%build
+export ac_cv_header_linux_netfilter_ipv4_h=yes
+export LDFLAGS='-Wl,--as-needed'
%configure
make %{?_smp_mflags}
make -C doc/design-paper tor-design.pdf
@@ -111,11 +120,13 @@
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,}
-mkdir -p $RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%_var/run/%name}
+mkdir -p $RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%_var/run/%name,%_var/lib/tor-data}
install -p -m0755 %SOURCE10 $RPM_BUILD_ROOT%_initrddir/tor
install -p -m0644 %SOURCE2 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/tor
+ln -s %_datadir/tor/geoip $RPM_BUILD_ROOT%_var/lib/tor-data/geoip
+
%pre core
%__fe_groupadd %uid -r %username &>/dev/null || :
@@ -163,6 +174,7 @@
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README ChangeLog
%doc ReleaseNotes
+%doc update-geoip
%dir %_sysconfdir/tor
%config(noreplace) %_sysconfdir/logrotate.d/tor
%attr(0700,%username,%username) %dir %homedir
@@ -170,6 +182,9 @@
%attr(0640,root,%username) %config(noreplace) %_sysconfdir/tor/torrc
%_bindir/*
%_mandir/man1/*
+%_datadir/tor
+%dir %_var/lib/tor-data
+%config(noreplace) %_var/lib/tor-data/geoip
%exclude %_bindir/torify
%exclude %_mandir/man1/torify*
@@ -183,6 +198,14 @@
%changelog
+* Sun Jul 20 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.30-1
+- updated to 0.2.0.30
+- (re)enabled transparent proxy support by workarounding broken
+ <linux/netfilter_ipv4.h> header
+- moved the 'geoip' database to /var/lib/tor-data where it can be
+ updated periodically
+- built with -Wl,--as-needed
+
* Wed Feb 13 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.2.19-2
- added 'missingok' to logrotate script (#429402)
More information about the fedora-extras-commits
mailing list