On 08/10/2014 10:40 AM, Nusenu wrote:

Nusenu: While reading fedora's tor.spec [1], I noticed #8368 [2] and the fact that tor includes already a systemd service file but the RPMs do not make use of it yet?

I have looked at the tor.spec files - current one, EPEL one and Fedora one, trying to make up a way to combine it - so that it both supports the old scripts for EL6 and systemd for Fedora.

I don't know that much about systemd, but at least sections like preinstall, postinstall and dependencies would need heavy ifdef-ing. It used to be this way for EL5 support which is now obsoleted since it required more special handling each time until it became unbearable.

If possible, I'd like to avoid the if-defs. Do you perhaps have a tip how to make the spec file "nice" and have it work both with old startup script and systemd? Maybe some patch?

Concerning hardcoded defaults in torctl - yeah, I should find time to fix that. I've already had a branch that was supposed to fix it, but got stuck on Fedora last time (don't remember exactly what wasn't working). I'll try to look at my old patches if they can be reused.

Ondrej

On Tue, Aug 12, 2014 at 6:47 PM, Nusenu < BM-2D8wMEVgGVY76je1WXNPfo8SrpZt5yGHES@bitmessage.ch> wrote:

Ondrej Mikle:

...

If possible, I'd like to avoid the if-defs. Do you perhaps have a tip how to make the spec file "nice" and have it work both with old startup script and systemd? Maybe some patch?

I would not mind having clean separated per-distribution spec files. That way you can basically reuse the complete spec file from the distribution and you would have systemd support without having to think about it - they probably have had their fair amount of testing.

I spent about a day adjusting and merging the Fedora's systemd tor.spec. However, it won't build the git source (e.g. with LIBS=-lrt ./autogen.sh && ./configure && make dist-rpm). There is something missing in the .spec which makes rpmbuild fail on not finding the correct source directory, but I wasn't able to figure why that happens as rpmbuild is quite hard to debug.

Ondrej

On Thu, Aug 14, 2014 at 4:47 PM, Nusenu < BM-2D8wMEVgGVY76je1WXNPfo8SrpZt5yGHES@bitmessage.ch> wrote:

...

...

Ondrej Mikle:

...

If possible, I'd like to avoid the if-defs. Do you perhaps have a tip how to make the spec file "nice" and have it work both with old startup script and systemd? Maybe some patch?

I would not mind having clean separated per-distribution spec files. That way you can basically reuse the complete spec file from the distribution and you would have systemd support without having to think about it - they probably have had their fair amount of testing.

I spent about a day adjusting and merging the Fedora's systemd tor.spec. However, it won't build the git source (e.g. with LIBS=-lrt ./autogen.sh && ./configure && make dist-rpm). There is something missing in the .spec which makes rpmbuild fail on not finding the correct source directory, but I wasn't able to figure why that happens as rpmbuild is quite hard to debug.

I'd like to have a look at your attempts.

Is there something wrong with the rpm-tor git repo?

git clone https://gitweb.torproject.org/user/hiviah/rpm-tor.git Cloning into 'rpm-tor'... fatal: https://gitweb.torproject.org/user/hiviah/rpm-tor.git/info/refs

The url is a bit diferent:

git clone https://git.torproject.org/user/hiviah/rpm-tor.git git checkout rpm-release-0.2.5

This is diff from one of the testing dirs: http://pastie.org/9475746

There's more stuff to be done e.g. in Makefile.am in dist-rpm target (if some files are said as Source in the .spec, Makefile needs to copy them - sorry I have the changes only in generated makefiles for testing).

Ondrej