rpms/tor/EL-5 import.log, NONE, 1.1 netfilter-ipv4.h, NONE, 1.1 tor-0.2.0.32-geoippath.patch, NONE, 1.1 tor-0.2.0.34.tar.gz.asc, NONE, 1.1 update-geoip, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.6, 1.7 tor.logrotate, 1.1, 1.2 tor.lsb, 1.1, 1.2 tor.spec, 1.7, 1.8 tor-0.1.1.26-setgroups.patch, 1.1, NONE
Simon Wesp
cassmodiah at fedoraproject.org
Mon Jun 1 19:57:16 UTC 2009
- Previous message (by thread): rpms/csstidy/devel csstidy-1.4-optflags.patch, NONE, 1.1 csstidy.spec, 1.2, 1.3
- Next message (by thread): rpms/vidalia/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3 vidalia.spec, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cassmodiah
Update of /cvs/pkgs/rpms/tor/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20153/EL-5
Modified Files:
.cvsignore sources tor.logrotate tor.lsb tor.spec
Added Files:
import.log netfilter-ipv4.h tor-0.2.0.32-geoippath.patch
tor-0.2.0.34.tar.gz.asc update-geoip
Removed Files:
tor-0.1.1.26-setgroups.patch
Log Message:
--- NEW FILE import.log ---
tor-0_2_0_34-5_el5:EL-5:tor-0.2.0.34-5.el5.src.rpm:1243885892
--- NEW FILE netfilter-ipv4.h ---
#include <linux/types.h>
#include_next <linux/netfilter_ipv4.h>
tor-0.2.0.32-geoippath.patch:
--- NEW FILE tor-0.2.0.32-geoippath.patch ---
diff -up tor-0.2.0.30/src/or/config.c.~1~ tor-0.2.0.30/src/or/config.c
--- tor-0.2.0.30/src/or/config.c.~1~ 2008-06-19 06:59:43.000000000 +0200
+++ tor-0.2.0.30/src/or/config.c 2008-07-20 13:23:38.000000000 +0200
@@ -202,7 +202,7 @@ static config_var_t _option_vars[] = {
V(GeoIPFile, STRING, "<default>"),
#else
V(GeoIPFile, STRING,
- SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
+ "/var/lib/tor-data" PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
#endif
OBSOLETE("Group"),
V(HardwareAccel, BOOL, "0"),
--- NEW FILE tor-0.2.0.34.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQBJj6QR61qJaiiYi/URArgIAKCyotRCLS9rZMdGhsRmCjSfp4yp7ACg1zBV
a/jUmgRwOcEik4CkS/ytYxg=
=fNda
-----END PGP SIGNATURE-----
--- NEW FILE update-geoip ---
#! /bin/bash
# Copyright (C) 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 3 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
### NOTE: this program is part of the Fedora 'tor' package. Hence, file
### bugreports at http://bugzilla.redhat.com, but *NOT* at upstream tor
### webpage/maillists.
URL=http://ip-to-country.webhosting.info/downloads/ip-to-country.csv.zip
: ${DESTDIR=/var/lib/tor-data}
set -e
d=$(mktemp -d -t tor-geoip.XXXXXX)
trap "rm -rf $d" EXIT
cd $d
wget "$URL"
unzip "$(basename "$URL")"
date=$(stat -c '%Y' ip-to-country.csv)
date=$(date +"%Y%m%dT%H%M%S" -d "1970-01-01 00:00:00 UTC $date seconds")
fname=geoip-$date
test ! -e "$DESTDIR/$fname" || exit 0
cut -d, -f1-3 < ip-to-country.csv | sed 's/"//g' > "$fname"
rm -f "$DESTDIR/$fname"
cp -p "$fname" "$DESTDIR/$fname"
rm -f "$DESTDIR/geoip"
ln -s "$fname" "$DESTDIR/geoip"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tor/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 5 Oct 2006 06:29:54 -0000 1.3
+++ .cvsignore 1 Jun 2009 19:56:45 -0000 1.4
@@ -1 +1 @@
-tor-*.tar.*
+tor-0.2.0.34.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tor/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 17 Dec 2006 12:53:51 -0000 1.6
+++ sources 1 Jun 2009 19:56:45 -0000 1.7
@@ -1,2 +1 @@
-0667df7a1f670bee5163b607aea172ba tor-0.1.1.26.tar.gz
-485823262baf0244453b79bf2ddf13be tor-0.1.1.26.tar.gz.asc
+f20011be23d5a76988233df12c346f41 tor-0.2.0.34.tar.gz
Index: tor.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/tor/EL-5/tor.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tor.logrotate 26 Sep 2006 06:27:27 -0000 1.1
+++ tor.logrotate 1 Jun 2009 19:56:45 -0000 1.2
@@ -2,6 +2,7 @@
delaycompress
notifempty
sharedscripts
+ missingok
postrotate
test ! -f /etc/init.d/tor || /etc/init.d/tor reload >/dev/null 2>/dev/null || :
test ! -f /etc/initng/damon/tor.i || /sbin/ngc --restart daemon/tor >/dev/null 2>/dev/null || :
Index: tor.lsb
===================================================================
RCS file: /cvs/pkgs/rpms/tor/EL-5/tor.lsb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tor.lsb 26 Sep 2006 06:27:27 -0000 1.1
+++ tor.lsb 1 Jun 2009 19:56:45 -0000 1.2
@@ -6,10 +6,11 @@
# description: An Anonymizing overlay network for TCP
#
### BEGIN INIT INFO
-# Default-Stop: 0 1 2 3 4 5 6
-# Short-Description: An Anonymizing overlay network for TCP
-# Description: An Anonymizing overlay network for TCP
-# Required-Start: $network $syslog $remote_fs $local_fs
+# Default-Stop: 0 1 2 6
+# Short-Description: An Anonymizing overlay network for TCP
+# Description: An Anonymizing overlay network for TCP
+# Required-Start: $network $remote_fs $local_fs
+# Should-Start: $syslog $time
### END INIT INFO
. /lib/lsb/init-functions
@@ -36,7 +37,7 @@ start() {
else
log_failure_msg
fi
-
+
return $rc
}
@@ -57,34 +58,25 @@ reload() {
}
status() {
- pids=$(pidofproc "$prog")
- if test -n "$pids"; then
- echo $"$prog is running"
- return 0
- fi
-
- if test -s $pidfile; then
- echo $"$prog is dead and /var/run pid file exists"
- return 1
- fi
-
- if test -f $lockfile; then
- echo $"$prog is dead and /var/lock lock file exists"
- return 2
- fi
+ pidofproc -p "$TOR_PIDFILE" "$prog" >/dev/null 2>&1
+ rc=$?
+ case $rc in
+ (0) echo $"$prog is running";;
+ (1) echo $"program is dead and /var/run pid file exists";;
+ (2) echo $"program is dead and /var/lock lock file exists";;
+ (3) echo $"program is not running";;
+ (4) echo $"program or service status is unknown";;
+ (*) echo $"status $rc of $prog";;
+ esac
- echo $"$prog is not running"
- return 3
+ return $rc
}
case $1 in
- (start)
- start
- ;;
- (stop)
- stop
+ (start|stop|reload|status|restart)
+ $1
;;
- (restart|force-reload)
+ (force-reload)
restart
;;
(condrestart|try-restart)
@@ -92,12 +84,6 @@ case $1 in
restart
fi
;;
- (reload)
- reload
- ;;
- (status)
- status
- ;;
(*)
echo $"Usage: $0 {start|stop|force-reload|reload|try-restart|status}"
exit 3
Index: tor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tor/EL-5/tor.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- tor.spec 24 Jan 2007 07:46:49 -0000 1.7
+++ tor.spec 1 Jun 2009 19:56:45 -0000 1.8
@@ -1,55 +1,54 @@
-## This package understands the following switches:
-%bcond_without fedora
-
-
-%global username toranon
-%global uid 19
-%global homedir %_var/lib/%name
-%global logdir %_var/log/%name
-
-%{!?release_func:%global release_func() %1%{?dist}}
-
-Name: tor
-Version: 0.1.1.26
-Release: %release_func 2
-Group: System Environment/Daemons
-License: BSD
-Summary: Anonymizing overlay network for TCP (The onion router)
-URL: http://tor.eff.org
-Requires: %name-core = %version-%release
-Requires: %name-lsb = %version-%release
+%global username toranon
+%global uid 19
+%global homedir %_var/lib/%name
+%global logdir %_var/log/%name
+
+
+Name: tor
+Version: 0.2.0.34
+Release: 5%{?dist}
+Group: System Environment/Daemons
+License: BSD
+Summary: Anonymizing overlay network for TCP (The onion router)
+URL: http://tor.eff.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: %name-core = %version-%release
+Requires: %name-lsb = %version-%release
%package core
-Summary: Core programs for tor
-Group: System Environment/Daemons
-URL: http://tor.eff.org
-Source0: http://tor.eff.org/dist/%name-%version.tar.gz
-Source1: http://tor.eff.org/dist/%name-%version.tar.gz.asc
-Source2: tor.logrotate
-Patch0: tor-0.1.1.26-setgroups.patch
-BuildRoot: %_tmppath/%name-%version-%release-root
-
-BuildRequires: libevent-devel openssl-devel transfig tetex-latex ghostscript
-BuildRequires: fedora-usermgmt-devel
-Provides: user(%username) = %uid
-Provides: group(%username) = %uid
-Requires: init(%name)
-Requires(pre): /etc/logrotate.d
-Requires(postun): /etc/logrotate.d
+Summary: Core programs for tor
+Group: System Environment/Daemons
+URL: http://tor.eff.org
+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
+Patch1: tor-0.2.0.32-geoippath.patch
+
+
+BuildRequires: libevent-devel openssl-devel transfig ghostscript
+BuildRequires: /usr/bin/latex
+BuildRequires: fedora-usermgmt-devel
+Provides: user(%username) = %uid
+Provides: group(%username) = %uid
+Requires: init(%name)
+Requires(pre): /etc/logrotate.d
+Requires(postun): /etc/logrotate.d
%{?FE_USERADD_REQ}
%package lsb
-Summary: LSB initscripts for tor
-Group: System Environment/Daemons
-Provides: init(%name) = lsb
-Requires: %name-core = %version-%release
-Source10: tor.lsb
-Requires(pre): %name-core
-Requires(postun): lsb-core-noarch %name-core
-Requires(post): lsb-core-noarch
-Requires(preun): lsb-core-noarch
+Summary: LSB initscripts for tor
+Group: System Environment/Daemons
+Provides: init(%name) = lsb
+Requires: %name-core = %version-%release
+Source10: tor.lsb
+Requires(pre): %name-core
+Requires(postun): lsb-core-noarch %name-core
+Requires(post): lsb-core-noarch
+Requires(preun): lsb-core-noarch
%description
@@ -87,7 +86,16 @@ daemon.
%prep
%setup -q
-%patch0 -p1 -b .setgroups
+%patch1 -p1 -b .geoippath
+
+install -p -m0644 %SOURCE3 .
+
+for f in ./doc/website/{tor-doc-win32.html.pt,tor-doc-win32.html.de,tor-doc-server.html.de}
+do
+ iconv -f iso-8859-1 -t utf-8 $f |sed 's|\r||g' > $f.utf8
+ touch -c -r $f $f.utf8
+ mv $f.utf8 $f
+done
sed -i -e 's!^\(\# *\)\?DataDirectory .*!DataDirectory %homedir/.tor!' src/config/torrc.sample.in
cat <<EOF >>src/config/torrc.sample.in
@@ -95,23 +103,30 @@ Group %username
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
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%_sysconfdir/tor/torrc{.sample,}
+make install DESTDIR=%{buildroot}
+mv %{buildroot}%_sysconfdir/tor/torrc{.sample,}
-mkdir -p $RPM_BUILD_ROOT{%_sysconfdir/logrotate.d,%_initrddir,%logdir,%homedir,%_var/run/%name}
+mkdir -p %{buildroot}{%_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
+install -p -m0755 %SOURCE10 %{buildroot}%_initrddir/tor
+install -p -m0644 %SOURCE2 %{buildroot}%_sysconfdir/logrotate.d/tor
+
+ln -s %_datadir/tor/geoip %{buildroot}%_var/lib/tor-data/geoip
%pre core
@@ -119,45 +134,51 @@ install -p -m0644 %SOURCE2 $RPM_BUILD_R
%__fe_useradd %uid -r -s /sbin/nologin -d %homedir -M \
-c 'TOR anonymizing user' -g %username %username &>/dev/null || :
+
%postun core
%__fe_userdel %username &>/dev/null || :
%__fe_groupdel %username &>/dev/null || :
%post lsb
-/usr/lib/lsb/install_initd %_initrddir/tor
+%_libdir/lsb/install_initd %_initrddir/tor
+
%preun lsb
-test "$1" != 0 || {
- %_initrddir/tor stop &>/dev/null || :
- /usr/lib/lsb/remove_initd %_initrddir/tor
-}
+test "$1" != 0 || %_initrddir/tor stop &>/dev/null || :
+test "$1" != 0 || %_libdir/lsb/remove_initd %_initrddir/tor
+
%postun lsb
-test "$1" = 0 || %_initrddir/tor try-restart &>/dev/null
+test "$1" = 0 || env -i %_initrddir/tor try-restart &>/dev/null
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc doc/HACKING doc/TODO
-%doc doc/*.txt
+%doc doc/spec/*.txt
%doc doc/design-paper/tor-design.pdf
+%doc %lang(de) doc/website/*.de
%doc %lang(en) doc/website/*.en
%doc %lang(es) doc/website/*.es
%doc %lang(fr) doc/website/*.fr
%doc %lang(it) doc/website/*.it
+%doc %lang(pl) doc/website/*.pl
%doc %lang(pt) doc/website/*.pt
%doc %lang(ru) doc/website/*.ru
+%doc %lang(zh-cn) doc/website/*.zh-cn
%doc doc/website/*.css
%files core
%defattr(-,root,root,-)
-%doc AUTHORS INSTALL LICENSE README ChangeLog
+%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
@@ -165,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT
%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*
@@ -172,12 +196,98 @@ rm -rf $RPM_BUILD_ROOT
%files lsb
- %defattr(-,root,root,-)
- %config %_initrddir/*
- %attr(0755,%username,%username) %dir %_var/run/%name
+%defattr(-,root,root,-)
+%config %_initrddir/*
+%attr(0755,%username,%username) %dir %_var/run/%name
%changelog
+* Mon Jun 01 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.2.0.34-5
+- Costumize and rebuild for epel (only)
+
+* Wed May 6 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.34-4
+- made it easy to rebuild package in RHEL by adding a 'noarch'
+ conditional to enable/disable noarch subpackages
+
+* Sat Mar 7 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.34-3
+- added -upstart subpackage (-lsb still wins by default as there exists
+ no end-user friendly solution for managing upstart initscripts)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0.34-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 10 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.34-1
+- updated to 0.2.0.34 (SECURITY: fixes DoS vulnerabilities)
+
+* Thu Jan 22 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.33-1
+- updated to 0.2.0.33 (SECURITY: fixed heap-corruption bug)
+
+* Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> - 0.2.0.32-2
+- rebuild with new openssl
+
+* Sun Dec 7 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.32-1
+- updated to 0.2.0.32
+- removed -setgroups patch; supplementary groups are now set upstream
+
+* Sun Jul 20 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.2.0.30-1
+- updated to 0.2.0.30; rediffed patches
+- (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
+
+* Thu Jul 10 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.1.2.19-3
+- rebuild for new libevent
+
+* Wed Feb 13 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.2.19-2
+- added 'missingok' to logrotate script (#429402)
+
+* Tue Feb 12 2008 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.2.19-1
+- updated to 0.1.2.19
+- use file based BR for latex
+- improved 'status' method of initscript to return rc of 'pidofproc'
+ instead of doing further manual tests. Calling 'pidofproc' directly
+ instead of within a subshell should workaround #432254 too.
+
+* Sat Jan 26 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.1.2.18-4
+- Update BuildRequires: tex(latex),
+- BR: texlive-texmf-fonts seems also to be necessary
+
+* Sat Jan 26 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.1.2.18-3
+- Rebuild for new libevent.
+
+* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.1.2.18-2
+- Rebuild for deps
+
+* Tue Oct 30 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.2.18-1
+- updated to 0.1.2.18
+
+* Fri Aug 31 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.2.17-1
+- updated to 0.1.2.17
+
+* Sat Aug 25 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.2.16-2
+- fixed open(2) issue
+
+* Fri Aug 3 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.2.16-1
+- updated to 0.1.2.16 (SECURITY)
+
+* Sat Jul 28 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.2.15-1
+- updated to 0.1.2.15
+
+* Sat May 26 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.2.14-1
+- updated to 0.1.2.14
+
+* Wed Apr 25 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.2.13-1
+- updated to 0.1.2.13
+- minor cleanups; especially in the %%doc section
+
+* Sun Apr 8 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.1.26-4
+- rebuilt for (yet another) new libevent
+
+* Mon Feb 26 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.1.26-3
+- rebuilt for new libevent
+
* Wed Jan 24 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.1.1.26-2
- updated -setgroups patch (#224090, thx to Sami Farin)
--- tor-0.1.1.26-setgroups.patch DELETED ---
- Previous message (by thread): rpms/csstidy/devel csstidy-1.4-optflags.patch, NONE, 1.1 csstidy.spec, 1.2, 1.3
- Next message (by thread): rpms/vidalia/EL-5 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3 vidalia.spec, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list