- tor-commits - lists.torproject.org

[tor/master] changelog for bug6043
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit ae75fb13e175ec24cb3bff44150fd2f932aa5385 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 11:49:20 2012 -0400 changelog for bug6043 --- changes/bug6043 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug6043 b/changes/bug6043 new file mode 100644 index 0000000..b88bafb --- /dev/null +++ b/changes/bug6043 @@ -0,0 +1,6 @@ + o Packaging (RPM): + - Our default RPM spec files have been updated to work with mock + and rpmbuild on RHEL/Fedora. They have an updated set of + dependencies and conflicts, a fix for an ancient typo when creating + the "_tor" user, and better instructions. Thanks to Ondrej + Mikle for the patch series; fix for bug 6043.

1 0

[tor/maint-0.2.3] Dependencies for RPM building with mock should work now
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit cf20fac37f78cc1212eaf0dc5260eabf46bcea92 Author: Ondrej Mikle <ondrej.mikle(a)gmail.com> Date: Fri Jun 8 15:41:53 2012 +0200 Dependencies for RPM building with mock should work now --- doc/tor-rpm-creation.txt | 19 ++++++++++++++++++- tor.spec.in | 8 ++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/doc/tor-rpm-creation.txt b/doc/tor-rpm-creation.txt index 3fc6bde..eb22c22 100644 --- a/doc/tor-rpm-creation.txt +++ b/doc/tor-rpm-creation.txt @@ -3,7 +3,7 @@ The process used to create the official rpms is as follows: Download latest stable libevent from -http://www.monkey.org/~provos/libevent/ +http://libevent.org/ The first step of compiling libevent is to configure it as follows: ./configure --enable-static --disable-shared @@ -24,3 +24,20 @@ make dist-rpm You should have at least two, maybe three, rpms. There should be the binary i386.rpm, a src.rpm, and on redhat/centos machines, a debuginfo.rpm. + + +## Instructions for building RPMs for multiple architectures or distributions +## using 'mock' + +Make sure you have mock installed and configured, see following HOWTOs for setup: +https://fedoraproject.org/wiki/How_to_create_an_RPM_package +https://fedoraproject.org/wiki/Using_Mock_to_test_package_builds + +Take the source RPM generated by previous step, and execute mock for every +target architecture (the names come from files in /etc/mock, strip the .cfg +extension in the -r parameter): + +mock --rebuild -r fedora-17-x86_64 tor-X.Y.Z.src.rpm + +(Note: don't build under OpenVZ - it breaks unshare() syscall, which in turn +breaks mock. It could save you several hours.) diff --git a/tor.spec.in b/tor.spec.in index 25557b7..127bf36 100644 --- a/tor.spec.in +++ b/tor.spec.in @@ -109,11 +109,11 @@ Vendor: The Tor Project (https://torproject.org) Packager: Erinn Clark <erinn(a)torproject.org> %if %{is_suse} -Requires: openssl >= 0.9.7 -BuildRequires: openssl-devel >= 0.9.7, rpm >= 4.0, zlib-devel +Requires: openssl >= 0.9.7, libevent >= 1.4.13 +BuildRequires: openssl-devel >= 0.9.7, rpm >= 4.0, zlib-devel, libevent-devel >= 1.4.13, asciidoc %else -Requires: openssl >= 0.9.7 -BuildRequires: openssl-devel >= 0.9.7 +Requires: openssl >= 0.9.7, libevent >= 1.4.13 +BuildRequires: openssl-devel >= 0.9.7, libevent-devel >= 1.4.13, asciidoc %endif %if %{is_fc} BuildRequires: rpm-build >= 4.0

1 0

[tor/maint-0.2.3] Workaround for building EL5 RPMs by specifying rpmbuild-md5. Updated old note about using static libevent when building RPMs.
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit 0e778ac6044f991bdd144a36258df341aa969554 Author: Ondrej Mikle <ondrej.mikle(a)gmail.com> Date: Sat Jun 16 18:38:14 2012 +0200 Workaround for building EL5 RPMs by specifying rpmbuild-md5. Updated old note about using static libevent when building RPMs. --- Makefile.am | 6 +++++- doc/tor-rpm-creation.txt | 35 +++++++++++++++++++++++------------ 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index e25e8ff..29bba71 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,13 +24,17 @@ EXTRA_DIST = \ #install-data-local: # $(INSTALL) -m 755 -d $(LOCALSTATEDIR)/lib/tor +# Allows to override rpmbuild with rpmbuild-md5 from fedora-packager so that +# building for EL5 won't fail on https://bugzilla.redhat.com/show_bug.cgi?id=490613 +RPMBUILD ?= rpmbuild + # Use automake's dist-gzip target to build the tarball dist-rpm: dist-gzip TIMESTAMP=$$(date +"%Y-%m-%d_%H.%M.%S"); \ RPM_BUILD_DIR=$$(mktemp -d "/tmp/tor-rpm-build-$$TIMESTAMP-XXXX"); \ mkdir -p "$$RPM_BUILD_DIR"/{BUILD,RPMS,SOURCES/"tor-$(VERSION)",SPECS,SRPMS}; \ cp -fa "$(distdir).tar.gz" "$$RPM_BUILD_DIR"/SOURCES/; \ - LIBS=-lrt rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec; \ + LIBS=-lrt $(RPMBUILD) -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec; \ cp -fa "$$RPM_BUILD_DIR"/SRPMS/* .; \ cp -fa "$$RPM_BUILD_DIR"/RPMS/* .; \ rm -rf "$$RPM_BUILD_DIR"; \ diff --git a/doc/tor-rpm-creation.txt b/doc/tor-rpm-creation.txt index eb22c22..a88f2e8 100644 --- a/doc/tor-rpm-creation.txt +++ b/doc/tor-rpm-creation.txt @@ -2,18 +2,9 @@ ## The process used to create the official rpms is as follows: -Download latest stable libevent from -http://libevent.org/ - -The first step of compiling libevent is to configure it as follows: -./configure --enable-static --disable-shared - -Complete the "make" and "make install". You will need to be root, -or sudo -s, to complete the "make install". - -Check for a successful universal binary of libevent.a in, by default, -/usr/local/lib by using the following command: - "file /usr/local/lib/libevent.a" +You'll need to install libevent headers, usually located in package named +libevent-devel. Alternatively, you could download latest libevent from +http://libevent.org/ but that shouldn't be necessary. Download and Extract the latest tor source code from https://www.torproject.org/download @@ -25,6 +16,9 @@ make dist-rpm You should have at least two, maybe three, rpms. There should be the binary i386.rpm, a src.rpm, and on redhat/centos machines, a debuginfo.rpm. +This step suffices unless you want to create RPMs for distros other than the +one you used for building. + ## Instructions for building RPMs for multiple architectures or distributions ## using 'mock' @@ -39,5 +33,22 @@ extension in the -r parameter): mock --rebuild -r fedora-17-x86_64 tor-X.Y.Z.src.rpm +Building for EL5 from newer distro (e.g. EL6 or Fedora 17) will fail due to bug +(https://bugzilla.redhat.com/show_bug.cgi?id=490613). +Here's a workaround: + +Before even building the source RPM, install fedora-packager and instruct +the build system to use rpmbuild-md5 like this: + +yum install fedora-packager +export RPMBUILD=rpmbuild-md5 + +Then proceed as usual to create the source RPM and binary RPMs: + +LIBS=-lrt ./configure +make dist-rpm +mock --rebuild -r epel-5-x86_64 tor-X.Y.Z.src.rpm + + (Note: don't build under OpenVZ - it breaks unshare() syscall, which in turn breaks mock. It could save you several hours.)

1 0

[tor/maint-0.2.3] Cleanup of RPM build process - no more .git in tarball, use automake's dist-gzip to create the tarball.
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit 72260cfa680ac1fd77d8859d471f766853ddc063 Author: Ondrej Mikle <ondrej.mikle(a)gmail.com> Date: Fri Jun 15 23:59:35 2012 +0200 Cleanup of RPM build process - no more .git in tarball, use automake's dist-gzip to create the tarball. Signed-off-by: Ondrej Mikle <ondrej.mikle(a)gmail.com> --- Makefile.am | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/Makefile.am b/Makefile.am index a80763d..e25e8ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,23 +24,18 @@ EXTRA_DIST = \ #install-data-local: # $(INSTALL) -m 755 -d $(LOCALSTATEDIR)/lib/tor -# Assume a tarball is in .. for now. -dist-rpm: - RPM_BUILD_DIR="/tmp/tor-rpm-build-$$$$"; \ - rm -rf $$RPM_BUILD_DIR; \ - mkdir $$RPM_BUILD_DIR || exit 1; \ - for subdir in BUILD RPMS SOURCES SPECS SRPMS; do \ - mkdir $$RPM_BUILD_DIR/$$subdir; \ - done; \ - mkdir $$RPM_BUILD_DIR/SOURCES/tor-$(VERSION); \ - cp -R ./ $$RPM_BUILD_DIR/SOURCES/tor-$(VERSION)/; \ - pushd $$RPM_BUILD_DIR/SOURCES/; \ - tar zcf tor-$(VERSION).tar.gz ./; \ - popd; \ - LIBS=-lrt rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec; \ - mv $$RPM_BUILD_DIR/SRPMS/* .; \ - mv $$RPM_BUILD_DIR/RPMS/* .; \ - rm -rf $$RPM_BUILD_DIR +# Use automake's dist-gzip target to build the tarball +dist-rpm: dist-gzip + TIMESTAMP=$$(date +"%Y-%m-%d_%H.%M.%S"); \ + RPM_BUILD_DIR=$$(mktemp -d "/tmp/tor-rpm-build-$$TIMESTAMP-XXXX"); \ + mkdir -p "$$RPM_BUILD_DIR"/{BUILD,RPMS,SOURCES/"tor-$(VERSION)",SPECS,SRPMS}; \ + cp -fa "$(distdir).tar.gz" "$$RPM_BUILD_DIR"/SOURCES/; \ + LIBS=-lrt rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec; \ + cp -fa "$$RPM_BUILD_DIR"/SRPMS/* .; \ + cp -fa "$$RPM_BUILD_DIR"/RPMS/* .; \ + rm -rf "$$RPM_BUILD_DIR"; \ + echo "RPM build finished"; \ + #end of dist-rpm dist: check

1 0

[tor/maint-0.2.3] changelog for bug6043
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit ae75fb13e175ec24cb3bff44150fd2f932aa5385 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 11:49:20 2012 -0400 changelog for bug6043 --- changes/bug6043 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug6043 b/changes/bug6043 new file mode 100644 index 0000000..b88bafb --- /dev/null +++ b/changes/bug6043 @@ -0,0 +1,6 @@ + o Packaging (RPM): + - Our default RPM spec files have been updated to work with mock + and rpmbuild on RHEL/Fedora. They have an updated set of + dependencies and conflicts, a fix for an ancient typo when creating + the "_tor" user, and better instructions. Thanks to Ondrej + Mikle for the patch series; fix for bug 6043.

1 0

[tor/maint-0.2.3] Fixes/beautification of RPM spec. Tiny improvements in RPM build docs.
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit eeb81b5bb1135c1b85fff68da823c10fc4a99965 Author: Ondrej Mikle <ondrej.mikle(a)gmail.com> Date: Thu Jun 21 18:26:05 2012 +0200 Fixes/beautification of RPM spec. Tiny improvements in RPM build docs. --- doc/tor-rpm-creation.txt | 6 ++++-- tor.spec.in | 21 +++++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/doc/tor-rpm-creation.txt b/doc/tor-rpm-creation.txt index a88f2e8..a03891e 100644 --- a/doc/tor-rpm-creation.txt +++ b/doc/tor-rpm-creation.txt @@ -14,14 +14,16 @@ LIBS=-lrt ./configure make dist-rpm You should have at least two, maybe three, rpms. There should be the binary -i386.rpm, a src.rpm, and on redhat/centos machines, a debuginfo.rpm. +(i686|x86_64).rpm, a src.rpm, and on redhat/centos machines, a debuginfo.rpm. +The debuginfo rpms are created if package redhat-rpm-config is installed (case +of redhat distros). This step suffices unless you want to create RPMs for distros other than the one you used for building. ## Instructions for building RPMs for multiple architectures or distributions -## using 'mock' +## using 'mock' on Fedora or RHEL (and clones) Make sure you have mock installed and configured, see following HOWTOs for setup: https://fedoraproject.org/wiki/How_to_create_an_RPM_package diff --git a/tor.spec.in b/tor.spec.in index 5605586..b452c9b 100644 --- a/tor.spec.in +++ b/tor.spec.in @@ -6,7 +6,7 @@ # This should be incremented whenever the spec file changes, but # can drop back to zero at a new Tor version -%define specver 0 +%define specver 1 ## Things users may want to change # @@ -108,17 +108,14 @@ License: 3-clause BSD Vendor: The Tor Project (https://torproject.org) Packager: Erinn Clark <erinn(a)torproject.org> -%if %{is_suse} -Requires: openssl >= 0.9.7, libevent >= 1.4.13 -BuildRequires: openssl-devel >= 0.9.7, rpm >= 4.0, zlib-devel, libevent-devel >= 1.4.13, asciidoc -%else Requires: openssl >= 0.9.7, libevent >= 1.4.13 BuildRequires: openssl-devel >= 0.9.7, libevent-devel >= 1.4.13, asciidoc -%endif -%if %{is_fc} -BuildRequires: rpm-build >= 4.0 + +# Fedora 16 and RHEL 5 have following conflicting packages according to rpm search +%if %{is_rh} Conflicts: tor-core, tor-lsb, tor-upstart %endif + Requires(pre): /usr/bin/id, /bin/date, /bin/sh Requires(pre): %{_sbindir}/useradd, %{_sbindir}/groupadd @@ -287,6 +284,14 @@ exit 0 %attr(0750,%{toruser},%{torgroup}) %dir %{_localstatedir}/log/%{name} %changelog +* Thu Jun 21 2012 Ondrej Mikle <ondrej.mikle(a)gmail.com> +- fixed to work with both rpmbuild and mock on RHEL/Fedora +- removed unnecessary files from rpm such as .git repo +- fixed build dependencies and package conflicts +- fixed creating _tor user on Fedora 17 (ancient typo) +- added/updated build instructions for RPM creation +- confirmed to build and run on EL5, EL6, Fedora 16/17, OpenSuse 12.1 + * Fri Aug 20 2010 Erinn Clark <erinn(a)torproject.org> - add conflicts for Fedora packages - add logic for SuSE since it requires special doc handling

1 0

[tor/maint-0.2.3] Fixed creating _tor user in RPM-based installs.
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit a7fc797edffc3ae6c2813ae354be35a1cd3c175e Author: Ondrej Mikle <ondrej.mikle(a)gmail.com> Date: Sat Jun 16 22:41:59 2012 +0200 Fixed creating _tor user in RPM-based installs. --- tor.spec.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tor.spec.in b/tor.spec.in index 127bf36..5605586 100644 --- a/tor.spec.in +++ b/tor.spec.in @@ -213,7 +213,7 @@ if [ ! -n "`/usr/bin/id -u %{toruser} 2>/dev/null`" ]; then # One would also like to default the UID, but doing that properly would # also require thought. if [ -x %{_sbindir}/nologin ]; then - %{_sbindir}/useradd -r -g %{torgroup} -d% {_localstatedir}/lib/%{name} -s %{_sbindir}/nologin %{toruser} 2> /dev/null + %{_sbindir}/useradd -r -g %{torgroup} -d %{_localstatedir}/lib/%{name} -s %{_sbindir}/nologin %{toruser} 2> /dev/null else %{_sbindir}/useradd -r -g %{torgroup} -d %{_localstatedir}/lib/%{name} -s /bin/false %{toruser} 2> /dev/null fi

1 0

[tor/master] Warn when accounting is used in a way likely to link hidden services
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit 2bd45213c991df62bf184758c5e8222685bda1ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 11:58:55 2012 -0400 Warn when accounting is used in a way likely to link hidden services Fix for 6490. --- changes/bug6490 | 4 ++++ src/or/config.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/changes/bug6490 b/changes/bug6490 new file mode 100644 index 0000000..c92daad --- /dev/null +++ b/changes/bug6490 @@ -0,0 +1,4 @@ + o Minor features: + - Warn when Tor is configured to use accounting in a way that will + link a hidden service to some other hidden service or public + address. Fix for bug 6490. diff --git a/src/or/config.c b/src/or/config.c index 918efd4..a369297 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -594,6 +594,7 @@ static void option_reset(const config_format_t *fmt, or_options_t *options, const config_var_t *var, int use_defaults); static void config_free(const config_format_t *fmt, void *options); static int config_lines_eq(config_line_t *a, config_line_t *b); +static int config_count_key(const config_line_t *a, const char *key); static int option_is_same(const config_format_t *fmt, const or_options_t *o1, const or_options_t *o2, const char *name); @@ -3066,6 +3067,20 @@ config_lines_eq(config_line_t *a, config_line_t *b) return 1; } +/** Return the number of lines in a whose key is key. */ +static int +config_count_key(const config_line_t *a, const char *key) +{ + int n = 0; + while (a) { + if (!strcasecmp(a->key, key)) { + ++n; + } + a = a->next; + } + return n; +} + /** Return true iff the option name has the same value in o1 * and o2. Must not be called for LINELIST_S or OBSOLETE options. */ @@ -3848,6 +3863,20 @@ options_validate(or_options_t *old_options, or_options_t *options, if (accounting_parse_options(options, 1)<0) REJECT("Failed to parse accounting options. See logs for details."); + if (options->AccountingMax) { + if (options->RendConfigLines && server_mode(options)) { + log_warn(LD_CONFIG, "Using accounting with a hidden service and an " + "ORPort is risky: your hidden service(s) and your public " + "address will all turn off at the same time, which may alert " + "observers that they are being run by the same party."); + } else if (config_count_key(options->RendConfigLines, + "HiddenServiceDir") > 1) { + log_warn(LD_CONFIG, "Using accounting with multiple hidden services is " + "risky: they will all turn off at the same time, which may " + "alert observers that they are being run by the same party."); + } + } + if (options->HTTPProxy) { /* parse it now */ if (tor_addr_port_lookup(options->HTTPProxy, &options->HTTPProxyAddr, &options->HTTPProxyPort) < 0)

1 0

[tor/master] Merge branch 'bug6490_v2' into maint-0.2.3
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit aed93f8ad918787ea787061106bcd5289c712823 Merge: d9bd0de 2bd4521 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 10:28:43 2012 -0400 Merge branch 'bug6490_v2' into maint-0.2.3 changes/bug6490 | 4 ++++ src/or/config.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit 5919e8e561d3abb3e74b92ac1b95f05243bb9372 Merge: e6d61ee aed93f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 10:29:34 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6490 | 4 ++++ src/or/config.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-)

1 0