Hello community, here is the log from the commit of package tor for openSUSE:Factory checked in at 2014-03-09 20:27:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tor (Old) and /work/SRC/openSUSE:Factory/.tor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tor" Changes: -------- --- /work/SRC/openSUSE:Factory/tor/tor.changes 2014-01-23 15:57:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tor.new/tor.changes 2014-03-09 20:27:18.000000000 +0100 @@ -1,0 +2,22 @@ +Thu Mar 6 08:02:15 UTC 2014 - andreas.stieger@gmx.de + +- tor 0.2.4.21 + Further improves security against potential adversaries who find + breaking 1024-bit crypto doable, and backports several stability + and robustness patches from the 0.2.5 branch. +- Major features (client security): + - When we choose a path for a 3-hop circuit, make sure it contains + at least one relay that supports the NTor circuit extension + handshake. Otherwise, there is a chance that we're building + a circuit that's worth attacking by an adversary who finds + breaking 1024-bit crypto doable, and that chance changes the game + theory. +- Major bugfixes: + - Do not treat streams that fail with reason + END_STREAM_REASON_INTERNAL as indicating a definite circuit failure, + since it could also indicate an ENETUNREACH connection error +- packaging changes: + - remove init script shadowing systemd unit + - general cleanup + +------------------------------------------------------------------- Old: ---- tor-0.2.4.20.tar.gz tor-0.2.4.20.tar.gz.asc New: ---- tor-0.2.4.21.tar.gz tor-0.2.4.21.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tor.spec ++++++ --- /var/tmp/diff_new_pack.cfcWWx/_old 2014-03-09 20:27:19.000000000 +0100 +++ /var/tmp/diff_new_pack.cfcWWx/_new 2014-03-09 20:27:19.000000000 +0100 @@ -17,11 +17,13 @@ %define with_bufferevents 0%{?suse_version} > 1220 - +%define with_systemd 0%{?suse_version} > 1140 +%define toruser %{name} +%define torgroup %{name} +%define home_dir %{_localstatedir}/lib/empty Name: tor -Version: 0.2.4.20 +Version: 0.2.4.21 Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Anonymizing overlay network for TCP (The onion router) License: BSD-3-Clause Group: Productivity/Networking/Security @@ -34,33 +36,30 @@ Source4: tor.tmpfiles # PATCH-FIX-UPSTREAM tor-0.2.2.37-logrotate.patch -- add su to logrotate config to fix W: suse-logrotate-user-writable-log-dir Patch0: tor-0.2.2.37-logrotate.patch -Requires: logrotate BuildRequires: openssl-devel BuildRequires: pwdutils +Requires: logrotate +PreReq(post): %fillup_prereq +BuildRoot: %{_tmppath}/%{name}-%{version}-build # -%if %with_bufferevents -BuildRequires: libevent-devel >= 2.0.13 +%if %{with_bufferevents} +BuildRequires: pkgconfig(libevent) >= 2.0.13 +%endif # with_bufferevents +%if %{?suse_version} > 1210 +BuildRequires: pkgconfig(libevent) %else -%if 0%{?suse_version} > 1100 BuildRequires: libevent-devel -%else -BuildRequires: libevent -%endif %endif - +# %if 0%{?suse_version} >= 1230 BuildRequires: gpg-offline %endif - -%if 0%{?suse_version} > 1140 +# +%if 0%{?with_systemd} BuildRequires: pkgconfig(systemd) %{?systemd_requires} -%define has_systemd 1 %endif - -%define toruser %{name} -%define torgroup %{name} -%define home_dir /var/lib/empty +# %description Tor is a connection-based low-latency anonymous communication system. @@ -86,7 +85,7 @@ for high-stakes anonymity. %prep -%{?gpg_verify: %gpg_verify %{S:1}} +%{?gpg_verify: %gpg_verify %{SOURCE1}} %setup -q %patch0 @@ -94,74 +93,76 @@ %configure \ --with-tor-user=%{toruser} \ --with-tor-group=%{torgroup} \ -%if %with_bufferevents +%if %{with_bufferevents} --enable-bufferevents \ %endif --docdir=%{_docdir}/%{name} -%__make %{?jobs:-j%{jobs}} +make %{?_smp_mflags} %install -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} # missing dirs -%{__install} -d -m 700 \ - %{buildroot}/var/lib/%{name} \ - %{buildroot}/var/tmp/%{name} - -%{__install} -d -m 755 \ - %{buildroot}/var/run/%{name} \ - %{buildroot}/var/log/%{name} \ +install -d -m 700 \ + %{buildroot}%{_localstatedir}/lib/%{name} \ + %{buildroot}%{_localstatedir}/tmp/%{name} + +install -d -m 755 \ + %{buildroot}%{_localstatedir}/run/%{name} \ + %{buildroot}%{_localstatedir}/log/%{name} \ %{buildroot}/%{_sbindir} -%if 0%{?has_systemd} -install -m 644 -D %{S:3} $RPM_BUILD_ROOT/%{_unitdir}/%{name}.service -%{__install} -d -m 0755 %{buildroot}/usr/lib/tmpfiles.d/ -%{__install} -m 0644 %{S:4} %{buildroot}/usr/lib/tmpfiles.d/%{name}.conf +%if 0%{?with_systemd} +install -m 644 -D %{SOURCE3} %{buildroot}/%{_unitdir}/%{name}.service +install -d -m 0755 %{buildroot}%{_libexecdir}/tmpfiles.d/ +install -m 0644 %{SOURCE4} %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf +ln -s -f service %{buildroot}%{_sbindir}/rc%{name} +%else +# init script +install -D -m 755 contrib/suse/tor.sh %{buildroot}/%{_initddir}/%{name} +ln -s -f ../..%{_initddir}/%{name} %{buildroot}%{_sbindir}/rc%{name} %endif # control script -%__install -p -m 755 contrib/torctl %{buildroot}/%{_bindir} +install -p -m 755 contrib/torctl %{buildroot}/%{_bindir} # sample config file -%__install -p -m 644 src/config/torrc.sample %{buildroot}/%{_sysconfdir}/%{name}/torrc.sample - -# init script -%__install -D -m 755 contrib/suse/tor.sh %{buildroot}/%{_initrddir}/%{name} -%{__ln_s} -f ../..%{_initrddir}/%{name} %{buildroot}%{_sbindir}/rc%{name} +install -p -m 644 src/config/torrc.sample %{buildroot}/%{_sysconfdir}/%{name}/torrc.sample # logrotate conf -%__sed -i -e "s|_tor|tor|g" contrib/tor.logrotate -%__install -D -m 644 contrib/tor.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} - -%clean -%__rm -rf "%{buildroot}" +sed -i -e "s|_tor|tor|g" contrib/tor.logrotate +install -D -m 644 contrib/tor.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} %pre getent group %{torgroup} >/dev/null || groupadd -r %{torgroup} getent passwd %{toruser} >/dev/null || useradd -r -g %{torgroup} -d %{home_dir} -s /sbin/false -c "User to ru %{name}" %{toruser} -%if 0%{?has_systemd} +%if 0%{?with_systemd} %service_add_pre tor.service %endif %post -%fillup_and_insserv tor -%if 0%{?has_systemd} +%if 0%{?with_systemd} +%fillup_only %service_add_post tor.service -systemd-tmpfiles --create /usr/lib/tmpfiles.d/tor.conf +systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/tor.conf +%else +%fillup_and_insserv tor %endif %preun -%stop_on_removal tor -%if 0%{?has_systemd} +%if 0%{?with_systemd} %service_del_preun tor.service +%else +%stop_on_removal tor %endif %postun -%restart_on_update tor -%insserv_cleanup -%if 0%{?has_systemd} +%if 0%{?with_systemd} %service_del_postun tor.service +%else +%insserv_cleanup +%restart_on_update tor %endif %files @@ -173,19 +174,20 @@ %{_bindir}/%{name}ify %{_bindir}/%{name}-gencert %{_bindir}/%{name}-resolve -%{_sbindir}/rc%{name} %dir %{_datadir}/%{name} %{_datadir}/%{name}/geoip* -%config %{_initrddir}/%{name} %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name} %dir %attr(0755,root,%{torgroup}) %{_sysconfdir}/%{name} %config(noreplace) %attr(0644,root,%{torgroup}) %{_sysconfdir}/%{name}/* %attr(0700,%{toruser},%{torgroup}) %dir %{_localstatedir}/lib/%{name} %ghost %attr(0750,%{toruser},%{torgroup}) %dir %{_localstatedir}/run/%{name} %attr(0750,%{toruser},%{torgroup}) %dir %{_localstatedir}/log/%{name} -%if 0%{?has_systemd} +%if 0%{?with_systemd} %{_unitdir}/%{name}.service -/usr/lib/tmpfiles.d/%{name}.conf +%{_libexecdir}/tmpfiles.d/%{name}.conf +%else +%config %{_initddir}/%{name} %endif +%{_sbindir}/rc%{name} %changelog ++++++ tor-0.2.4.20.tar.gz -> tor-0.2.4.21.tar.gz ++++++ ++++ 53977 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de