- tor-commits - lists.torproject.org

[tor/master] new changes entry for rend_service_introduce refactoring
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit 0e35e9235e65601bab2b4fd2efd193b0d248b711 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 17:09:20 2012 -0400 new changes entry for rend_service_introduce refactoring --- changes/bug6177 | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/changes/bug6177 b/changes/bug6177 index c900c27..12ab43a 100644 --- a/changes/bug6177 +++ b/changes/bug6177 @@ -1,3 +1,5 @@ - o Minor features: + o Code simplification and refactoring: - Add replaycache_t structure, functions and unit tests, for future use in refactoring rend_service_introduce() for bug 6177. + - Refactor rend_service_introduce() to be more clear to read, improve, + debug, and test. Bug 6177.

1 0

[tor/master] Whitespace tweaks
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit 92f5eaa235ccae17e079f7b52eabac9e66d1e6cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 14:32:20 2012 -0400 Whitespace tweaks --- src/or/rendservice.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 9355ed2..3c5d821 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1182,7 +1182,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, log_info(LD_REND, "%s on circ %d.", err_msg, circuit->_base.n_circ_id); tor_free(err_msg); } - + stage_descr = "early validation"; /* Early validation of pk/ciphertext part */ result = rend_service_validate_intro_early(parsed_req, &err_msg); @@ -1217,7 +1217,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, (int)elapsed); goto err; } - + stage_descr = "decryption"; /* Now try to decrypt it */ result = rend_service_decrypt_intro(parsed_req, intro_key, &err_msg); @@ -1463,11 +1463,14 @@ find_rp_for_intro(const rend_intro_cell_t *intro, } goto err; + } else { + need_free = 1; } - else need_free = 1; - } else if (intro->version == 2) rp = intro->u.v2.extend_info; - else if (intro->version == 3) rp = intro->u.v3.extend_info; - else { + } else if (intro->version == 2) { + rp = intro->u.v2.extend_info; + } else if (intro->version == 3) { + rp = intro->u.v3.extend_info; + } else { if (err_msg_out) { tor_asprintf(&err_msg, "Unknown version %d in INTRODUCE2 cell", @@ -1864,8 +1867,7 @@ rend_service_parse_intro_for_v3( if (intro->u.v3.auth_type != REND_NO_AUTH) { intro->u.v3.auth_len = ntohs(get_uint16(buf + 2)); ts_offset = 4 + intro->u.v3.auth_len; - } - else { + } else { intro->u.v3.auth_len = 0; ts_offset = 2; }

1 0

[tor/master] Remove duplicate code in test_introduce.c
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit 3c304173393cc3133d728dc4ab4848b98024ec9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 14:32:22 2012 -0400 Remove duplicate code in test_introduce.c Two of the do_*_test functions were actually prefixes of the third, which suggests a trivial code elimination step --- src/test/test_introduce.c | 123 ++++++++------------------------------------ 1 files changed, 23 insertions(+), 100 deletions(-) diff --git a/src/test/test_introduce.c b/src/test/test_introduce.c index 5953a28..72ab555 100644 --- a/src/test/test_introduce.c +++ b/src/test/test_introduce.c @@ -248,120 +248,37 @@ static uint8_t v3_basic_auth_test_plaintext[] = static void do_decrypt_test(uint8_t *plaintext, size_t plaintext_len); static void do_early_parse_test(uint8_t *plaintext, size_t plaintext_len); static void do_late_parse_test(uint8_t *plaintext, size_t plaintext_len); +static void do_parse_test(uint8_t *plaintext, size_t plaintext_len, int phase); static ssize_t make_intro_from_plaintext( void *buf, size_t len, crypto_pk_t *key, void **cell_out); -/** Decryption test utility function - */ +#define EARLY_PARSE_ONLY 1 +#define DECRYPT_ONLY 2 +#define ALL_PARSING 3 static void -do_decrypt_test(uint8_t *plaintext, size_t plaintext_len) +do_early_parse_test(uint8_t *plaintext, size_t plaintext_len) { - crypto_pk_t *k = NULL; - int r; - uint8_t *cell = NULL; - size_t cell_len; - rend_intro_cell_t *parsed_req = NULL; - char *err_msg = NULL; - char digest[DIGEST_LEN]; - - /* Get a key */ - k = crypto_pk_new(); - test_assert(k); - if (!k) goto done; - r = crypto_pk_read_private_key_from_string(k, AUTHORITY_SIGNKEY_1, -1); - test_assert(!r); - if (r) goto done; - - /* Get digest for future comparison */ - r = crypto_pk_get_digest(k, digest); - test_assert(r >= 0); - - /* Make a cell out of it */ - r = make_intro_from_plaintext( - plaintext, plaintext_len, - k, (void **)(&cell)); - test_assert(r > 0); - test_assert(cell); - if (!(cell && r > 0)) goto done; - cell_len = r; - - /* Do early parsing */ - parsed_req = rend_service_begin_parse_intro(cell, cell_len, 2, &err_msg); - test_assert(parsed_req); - test_assert(!err_msg); - test_memeq(parsed_req->pk, digest, DIGEST_LEN); - test_assert(parsed_req->ciphertext); - test_assert(parsed_req->ciphertext_len > 0); - - /* Do decryption */ - r = rend_service_decrypt_intro(parsed_req, k, &err_msg); - test_assert(!r); - test_assert(!err_msg); - test_assert(parsed_req->plaintext); - test_assert(parsed_req->plaintext_len > 0); - - done: - tor_free(cell); - crypto_pk_free(k); - rend_service_free_intro(parsed_req); - tor_free(err_msg); + do_parse_test(plaintext, plaintext_len, EARLY_PARSE_ONLY); } -/** Early parsing test utility function - */ - static void -do_early_parse_test(uint8_t *plaintext, size_t plaintext_len) +do_decrypt_test(uint8_t *plaintext, size_t plaintext_len) { - crypto_pk_t *k = NULL; - int r; - uint8_t *cell = NULL; - size_t cell_len; - rend_intro_cell_t *parsed_req = NULL; - char *err_msg = NULL; - char digest[DIGEST_LEN]; - - /* Get a key */ - k = crypto_pk_new(); - test_assert(k); - if (!k) goto done; - r = crypto_pk_read_private_key_from_string(k, AUTHORITY_SIGNKEY_1, -1); - test_assert(!r); - if (r) goto done; - - /* Get digest for future comparison */ - r = crypto_pk_get_digest(k, digest); - test_assert(r >= 0); - - /* Make a cell out of it */ - r = make_intro_from_plaintext( - plaintext, plaintext_len, - k, (void **)(&cell)); - test_assert(r > 0); - test_assert(cell); - if (!(cell && r > 0)) goto done; - cell_len = r; - - /* Do early parsing */ - parsed_req = rend_service_begin_parse_intro(cell, cell_len, 2, &err_msg); - test_assert(parsed_req); - test_memeq(parsed_req->pk, digest, DIGEST_LEN); - test_assert(parsed_req->ciphertext); - test_assert(parsed_req->ciphertext_len > 0); + do_parse_test(plaintext, plaintext_len, DECRYPT_ONLY); +} - done: - tor_free(cell); - crypto_pk_free(k); - rend_service_free_intro(parsed_req); - tor_free(err_msg); +static void +do_late_parse_test(uint8_t *plaintext, size_t plaintext_len) +{ + do_parse_test(plaintext, plaintext_len, ALL_PARSING); } -/** Late parsing test utility function +/** Test utility function: checks that the <b>plaintext_len</b>-byte string at + * <b>plaintext</b> is at least superficially parseable. */ - static void -do_late_parse_test(uint8_t *plaintext, size_t plaintext_len) +do_parse_test(uint8_t *plaintext, size_t plaintext_len, int phase) { crypto_pk_t *k = NULL; int r; @@ -370,7 +287,7 @@ do_late_parse_test(uint8_t *plaintext, size_t plaintext_len) rend_intro_cell_t *parsed_req = NULL; char *err_msg = NULL; char digest[DIGEST_LEN]; - + /* Get a key */ k = crypto_pk_new(); test_assert(k); @@ -400,6 +317,9 @@ do_late_parse_test(uint8_t *plaintext, size_t plaintext_len) test_assert(parsed_req->ciphertext); test_assert(parsed_req->ciphertext_len > 0); + if (phase == EARLY_PARSE_ONLY) + goto done; + /* Do decryption */ r = rend_service_decrypt_intro(parsed_req, k, &err_msg); test_assert(!r); @@ -407,6 +327,9 @@ do_late_parse_test(uint8_t *plaintext, size_t plaintext_len) test_assert(parsed_req->plaintext); test_assert(parsed_req->plaintext_len > 0); + if (phase == DECRYPT_ONLY) + goto done; + /* Do late parsing */ r = rend_service_parse_intro_plaintext(parsed_req, &err_msg); test_assert(!r);

1 0

r25734: {website} remove a mirror at the operator request. (in website/trunk: . include)
by Andrew Lewman 31 Jul '12

31 Jul '12

Author: phobos Date: 2012-07-31 18:31:23 +0000 (Tue, 31 Jul 2012) New Revision: 25734 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: remove a mirror at the operator request. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-07-30 16:39:27 UTC (rev 25733) +++ website/trunk/include/mirrors-table.wmi 2012-07-31 18:31:23 UTC (rev 25734) @@ -18,6 +18,23 @@ <tr> + <td>NL</td> + + <td>Amorphis</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>PT</td> <td>5ª Coluna</td> @@ -52,6 +69,23 @@ <tr> + <td>DK</td> + + <td>Zentrum der Gesundheit</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>EE</td> <td>CyberSIDE</td> @@ -273,6 +307,23 @@ <tr> + <td>FR</td> + + <td>BarkerJr</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://www.oignon.net/dist/">http</a></td> + <td><a href="http://www.oignon.net/">http</a></td> + <td><a href="https://www.oignon.net/dist/">https</a></td> + <td><a href="https://www.oignon.net/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>AT</td> <td>cyberarmy</td> @@ -579,15 +630,15 @@ <tr> - <td>US</td> + <td>SE</td> - <td></td> + <td>homosu</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.umbrellacorporation.org.uk/dist/">http</a></td> - <td><a href="http://torproject.umbrellacorporation.org.uk/">http</a></td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -596,15 +647,15 @@ <tr> - <td>NL</td> + <td>US</td> - <td>Amorphis</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://torproject.umbrellacorporation.org.uk/dist/">http</a></td> + <td><a href="http://torproject.umbrellacorporation.org.uk/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -613,15 +664,15 @@ <tr> - <td>SE</td> + <td>INT</td> - <td>homosu</td> + <td>CoralCDN</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -630,32 +681,15 @@ <tr> - <td>DK</td> - - <td>Zentrum der Gesundheit</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> - <td></td> + <td>searchprivate</td> <td>Up to date</td> <td> - </td> - <td><a href="http://ec2-50-112-70-145.us-west-2.compute.amazonaws.com/mirrors/torproject…">http</a></td> - <td><a href="http://ec2-50-112-70-145.us-west-2.compute.amazonaws.com/mirrors/torproject…">http</a></td> + <td><a href="http://tor.searchprivate.com/dist/">http</a></td> + <td><a href="http://tor.searchprivate.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -668,7 +702,7 @@ <td>[[:bbs:]]</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> @@ -732,23 +766,6 @@ <tr> - <td>FR</td> - - <td>BarkerJr</td> - - <td>Out of date</td> - - <td> - </td> - <td><a href="http://www.oignon.net/dist/">http</a></td> - <td><a href="http://www.oignon.net/">http</a></td> - <td><a href="https://www.oignon.net/dist/">https</a></td> - <td><a href="https://www.oignon.net/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> <td></td> @@ -800,23 +817,6 @@ <tr> - <td>US</td> - - <td>searchprivate</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.searchprivate.com/dist/">http</a></td> - <td><a href="http://tor.searchprivate.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>NL</td> <td></td> @@ -834,23 +834,6 @@ <tr> - <td>INT</td> - - <td>CoralCDN</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IS</td> <td>crypto.is</td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-07-30 16:39:27 UTC (rev 25733) +++ website/trunk/update-mirrors.pl 2012-07-31 18:31:23 UTC (rev 25734) @@ -927,24 +927,6 @@ rsyncDistMirror => "", hiddenServiceMirror => "", }, - mirror064 => { - adminContact => "", - orgName => "", - isoCC => "US", - subRegion => "", - region => "US", - ipv4 => "True", - ipv6 => "False", - loadBalanced => "No", - httpWebsiteMirror => "http://ec2-50-112-70-145.us-west-2.compute.amazonaws.com/mirrors/torproject…", - httpsWebsiteMirror => "", - rsyncWebsiteMirror => "", - ftpWebsiteMirror => "", - httpDistMirror => "http://ec2-50-112-70-145.us-west-2.compute.amazonaws.com/mirrors/torproject…", - httpsDistMirror => "", - rsyncDistMirror => "", - hiddenServiceMirror => "", - }, mirror065 => { adminContact => "", orgName => "",

1 0

[tor/master] 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/master] 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/master] 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/master] 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/master] 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] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit 43b81325b5782ce7986421bdfefae57cd4c8ab81 Merge: 5919e8e ae75fb1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 11:49:32 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' Makefile.am | 33 +++++++++++++-------------- changes/bug6043 | 6 +++++ doc/tor-rpm-creation.txt | 56 +++++++++++++++++++++++++++++++++++---------- tor.spec.in | 27 +++++++++++++--------- 4 files changed, 81 insertions(+), 41 deletions(-)

1 0