--- a/ChangeLog Sat Feb 11 21:22:42 2012 +0000
+++ b/ChangeLog Sat Feb 11 22:10:13 2012 +0000
@@ -2,6 +2,8 @@
* SFEopencity.spec: bump to 0.0.6.4stable
* SFEcmake.spec: bump to 2.8.7
+ * SFEtor.spec: promote
+ * SFEvidalia.spec: initial spec
2012-02-08 Milan Jurik <[email protected]>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEtor.spec Sat Feb 11 22:10:13 2012 +0000
@@ -0,0 +1,140 @@
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+%include Solaris.inc
+
+%define src_name tor
+
+Name: SFEtor
+IPS_Package_Name: network/tor
+Summary: Anonymizing overlay network for TCP (The onion router)
+Version: 0.2.2.35
+URL: http://www.torproject.org/
+Source: %{url}/dist/%{src_name}-%{version}.tar.gz
+Source1: tor.auth_attr
+Source2: tor.prof_attr
+Source3: tor.sh
+Source4: tor.xml
+License: Tor License
+Group: Applications/Internet
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+Requires: %name-root
+BuildRequires: SFEasciidoc
+BuildRequires: SUNWopenssl-include
+Requires: SUNWopenssl-libraries
+BuildRequires: SUNWlibevent
+Requires: SUNWlibevent
+BuildRequires: SFElibevent2-devel
+Requires: SFElibevent2
+
+%description
+Tor is a connection-based low-latency anonymous communication system.
+
+This package provides the "tor" program, which serves as both a client and
+a relay node. Scripts will automatically create a "%{toruser}" user and
+a "%{torgroup}" group, and set tor up to run as a daemon when the system
+is rebooted.
+
+Applications connect to the local Tor proxy using the SOCKS
+protocol. The tor client chooses a path through a set of relays, in
+which each relay knows its predecessor and successor, but no
+others. Traffic flowing down the circuit is unwrapped by a symmetric
+key at each relay, which reveals the downstream relay.
+
+Warnings: Tor does no protocol cleaning. That means there is a danger
+that application protocols and associated programs can be induced to
+reveal information about the initiator. Tor depends on Privoxy or
+similar protocol cleaners to solve this problem. This is alpha code,
+and is even more likely than released code to have anonymity-spoiling
+bugs. The present network is small -- this further reduces the
+strength of the anonymity provided. Tor is not presently suitable
+for high-stakes anonymity.
+
+%package root
+Summary: %{summary} - / filesystem
+SUNW_BaseDir: /
+%include default-depend.inc
+
+%prep
+%setup -q -n %{src_name}-%{version}
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+./configure --prefix=%{_prefix} \
+ --sysconfdir=%{_sysconfdir} \
+ --with-libevent-dir=/usr/gnu \
+ --with-tor-user=tor \
+ --with-tor-group=daemon
+
+make -j$CPUS
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+install -p -m 0755 contrib/torctl %{buildroot}%{_bindir}
+mkdir -p %{buildroot}/etc/security/auth_attr.d/
+cp %{SOURCE1} %{buildroot}/etc/security/auth_attr.d/%{src_name}
+mkdir -p %{buildroot}/etc/security/prof_attr.d/
+cp %{SOURCE2} %{buildroot}/etc/security/prof_attr.d/%{src_name}
+mkdir -p %{buildroot}/lib/svc/method
+cp %{SOURCE3} %{buildroot}/lib/svc/method/%{src_name}
+mkdir -p %{buildroot}%{_localstatedir}/svc/manifest/site
+cp %{SOURCE4} %{buildroot}%{_localstatedir}/svc/manifest/site/%{src_name}.xml
+mkdir -p %{buildroot}%{_localstatedir}/log/%{src_name}
+mkdir -p %{buildroot}%{_localstatedir}/lib/%{src_name}
+
+%clean
+rm -rf %{buildroot}
+
+%pre root
+test -x $BASEDIR/var/lib/postrun/postrun || exit 0
+( echo '/usr/sbin/groupadd daemon';
+ echo '/usr/sbin/useradd -d %{_sysconfdir}/%{src_name} -s /bin/true -g daemon tor';
+) | $BASEDIR/var/lib/postrun/postrun -i -a
+
+%postun root
+test -x $BASEDIR/var/lib/postrun/postrun || exit 0
+( echo '/usr/sbin/userdel tor';
+ echo '/usr/sbin/groupdel daemon';
+) | $BASEDIR/var/lib/postrun/postrun -i -a
+
+%actions
+group groupname="tor"
+user ftpuser=false gcos-field="TOR Reserved UID" username="tor" password=NP group="daemon"
+
+%files
+%defattr (-, root, bin)
+%{_bindir}
+%dir %attr(0755, root, sys) %{_datadir}
+%{_datadir}/%{src_name}
+%dir %attr (0755, root, other) %{_docdir}
+%{_docdir}/%{src_name}
+%{_mandir}
+
+%files root
+%defattr (-, root, sys)
+%{_sysconfdir}/security/auth_attr.d
+%{_sysconfdir}/security/prof_attr.d
+%config(noreplace) %{_sysconfdir}/tor/tor-tsocks.conf
+%{_sysconfdir}/tor/torrc.sample
+%class(manifest) %attr(0444, root, sys) %{_localstatedir}/svc/manifest/site/%{src_name}.xml
+%dir %attr (0755, tor, tor) %{_localstatedir}/log/%{src_name}
+%dir %attr (0755, root, other) %{_localstatedir}/lib
+%dir %attr (0700, daemon, daemon) %{_localstatedir}/lib/tor
+%dir %attr (0755, root, bin) /lib
+%dir %attr (0755, root, bin) /lib/svc
+%dir %attr (0755, root, bin) /lib/svc/method
+%attr (0555, root, bin) /lib/svc/method/%{src_name}.sh
+
+%changelog
+* Sat Feb 11 2012 - Milan Jurik
+- Initial spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEvidalia.spec Sat Feb 11 22:10:13 2012 +0000
@@ -0,0 +1,82 @@
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+
+%include Solaris.inc
+%include stdcxx.inc
+
+%define src_name vidalia
+
+Name: SFEvidalia
+IPS_Package_Name: desktop/security/vidalia
+Summary: The Onion Router GUI
+Version: 0.2.15
+URL: http://www.torproject.org/
+Source: %{url}/dist/%{src_name}/%{src_name}-%{version}.tar.gz
+Patch1: vidalia-01-floor.diff
+Patch2: vidalia-02-max.diff
+License: GPLv2+
+Group: Applications/Internet
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}_%{version}-build
+%include default-depend.inc
+Requires: SFEtor
+BuildRequires: SFEqt-stdcxx-devel
+Requires: SFEqt-stdcxx
+BuildRequires: SFEcmake
+
+%prep
+%setup -q -n %{src_name}-%{version}
+%patch1 -p1
+%patch2 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+export PATH=/usr/stdcxx/bin:$PATH
+export CPPFLAGS="-I/usr/X11/include"
+export CFLAGS="%optflags"
+export CXXFLAGS="%cxx_optflags -library=no%Cstd -I%{stdcxx_include} -I/usr/stdcxx/include"
+export LDFLAGS="%_ldflags -lsocket -lnsl -L%{stdcxx_lib} -R%{stdcxx_lib} -L/usr/stdcxx/lib -R/usr/stdcxx/lib -lstdcxx4 -Wl,-zmuldefs"
+
+mkdir -p build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} .. && make -j$CPUS
+
+%install
+rm -rf %{buildroot}
+cd build && make install DESTDIR=%{buildroot}
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-, root, bin)
+%{_bindir}
+%dir %attr(0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/icons
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/16x16
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/16x16/apps
+%{_datadir}/icons/hicolor/16x16/apps/%{src_name}.png
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/22x22
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/22x22/apps
+%{_datadir}/icons/hicolor/22x22/apps/%{src_name}.png
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32/apps
+%{_datadir}/icons/hicolor/32x32/apps/%{src_name}.png
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/48x48
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/48x48/apps
+%{_datadir}/icons/hicolor/48x48/apps/%{src_name}.png
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/64x64
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/64x64/apps
+%{_datadir}/icons/hicolor/64x64/apps/%{src_name}.png
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/128x128
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/128x128/apps
+%{_datadir}/icons/hicolor/128x128/apps/%{src_name}.png
+%dir %attr (-, root, other) %{_datadir}/applications
+%{_datadir}/applications/%{src_name}.desktop
+
+%changelog
+* Sat Feb 11 2012 - Milan Jurik
+- Initial spec
--- a/experimental/SFEtor.spec Sat Feb 11 21:22:42 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-#
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-%include Solaris.inc
-
-%define src_name tor
-
-Name: SFEtor
-IPS_Package_Name: network/tor
-Version: 0.2.2.34
-Summary: Anonymizing overlay network for TCP (The onion router)
-URL: https://www.torproject.org/
-Group: System Environment/Daemons
-License: 3-clause BSD
-Source: http://www.torproject.org/dist/%{src_name}-%{version}.tar.gz
-Source1: tor.auth_attr
-Source2: tor.prof_attr
-Source3: tor.sh
-Source4: tor.xml
-SUNW_BaseDir: %{_basedir}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%include default-depend.inc
-BuildRequires: SUNWopenssl-include
-Requires: SUNWopenssl-libraries
-BuildRequires: SFElibevent2-devel
-Requires: SFElibevent2
-
-%description
-Tor is a connection-based low-latency anonymous communication system.
-
-This package provides the "tor" program, which serves as both a client and
-a relay node. Scripts will automatically create a "%{toruser}" user and
-a "%{torgroup}" group, and set tor up to run as a daemon when the system
-is rebooted.
-
-Applications connect to the local Tor proxy using the SOCKS
-protocol. The tor client chooses a path through a set of relays, in
-which each relay knows its predecessor and successor, but no
-others. Traffic flowing down the circuit is unwrapped by a symmetric
-key at each relay, which reveals the downstream relay.
-
-Warnings: Tor does no protocol cleaning. That means there is a danger
-that application protocols and associated programs can be induced to
-reveal information about the initiator. Tor depends on Privoxy or
-similar protocol cleaners to solve this problem. This is alpha code,
-and is even more likely than released code to have anonymity-spoiling
-bugs. The present network is small -- this further reduces the
-strength of the anonymity provided. Tor is not presently suitable
-for high-stakes anonymity.
-
-%package root
-Summary: %{summary} - / filesystem
-SUNW_BaseDir: /
-%include default-depend.inc
-
-%prep
-%setup -q -n %{src_name}-%{version}
-
-%build
-CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-if test "x$CPUS" = "x" -o $CPUS = 0; then
- CPUS=1
-fi
-
-export CFLAGS="%optflags"
-export LDFLAGS="%_ldflags"
-./configure --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --with-tor-user=daemon \
- --with-tor-group=daemon \
- --with-libevent-dir=/usr/gnu
-
-make -j$CPUS
-
-%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-
-install -p -m 0755 contrib/torctl %{buildroot}%{_bindir}
-
-install -d 0755 %{buildroot}%{_sysconfdir}/security/auth_attr.d
-install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/security/auth_attr.d/tor
-
-install -d 0755 %{buildroot}%{_sysconfdir}/security/prof_attr.d
-install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/prof_attr.d/tor
-
-install -d 0755 %{buildroot}%/lib/svc/method
-install -m 0755 %{SOURCE3} %{buildroot}/lib/svc/method
-
-install -d 0755 %{buildroot}%/lib/svc/manifest/network
-install -m 0644 %{SOURCE4} %{buildroot}%/lib/svc/manifest/network
-
-install -d 0700 %{buildroot}%{_localstatedir}/lib/tor
-install -d 0755 %{buildroot}%{_localstatedir}/log/tor
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-, root, bin)
-%doc INSTALL LICENSE README ChangeLog doc/HACKING doc/TODO
-%{_bindir}
-%dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/tor
-%dir %attr (0755, root, other) %{_docdir}
-%{_docdir}/tor/*
-%{_mandir}
-
-%files root
-%defattr (-, root, sys)
-%dir %attr (0755, root, sys) %{_sysconfdir}
-%{_sysconfdir}/security
-%{_sysconfdir}/tor
-%dir %attr (0755, root, sys) %{_localstatedir}
-%dir %attr (0755, root, sys) %{_localstatedir}/log
-%dir %attr (0755, daemon, daemon) %{_localstatedir}/log/tor
-%dir %attr (0755, root, other) %{_localstatedir}/lib
-%dir %attr (0700, daemon, daemon) %{_localstatedir}/lib/tor
-%dir %attr (0755, root, bin) /lib
-%dir %attr (0755, root, bin) /lib/svc
-%dir %attr (0755, root, bin) /lib/svc/method
-%attr (0755, root, sys) /lib/svc/method/tor.sh
-%class(manifest) %attr(0444, root, sys) /lib/svc/manifest/network/tor.xml
-
-%changelog
-* Thu Nov 17 2011 - Milan Jurik
-- initial spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/vidalia-01-floor.diff Sat Feb 11 22:10:13 2012 +0000
@@ -0,0 +1,14 @@
+--- vidalia-0.2.15/src/vidalia/network/TorMapImageView.cpp Fri Oct 7 21:16:56 2011
++++ vidalia-0.2.15/src/vidalia/network/TorMapImageView.cpp Sat Feb 11 21:25:00 2012
+@@ -235,1 +235,1 @@
+- lat = floor(longitude * (deg * lerp(abs(int(latitude)), plen))
++ lat = std::floor(longitude * (deg * lerp(abs(int(latitude)), plen))
+@@ -239,1 +239,1 @@
+- lon = floor((height/2) + (lerp(abs(int(latitude)), pdfe) * (height/2))
++ lon = std::floor((height/2) + (lerp(abs(int(latitude)), pdfe) * (height/2))
+@@ -242,1 +242,1 @@
+- lon = floor((height/2) - (lerp(abs(int(latitude)), pdfe) * (height/2))
++ lon = std::floor((height/2) - (lerp(abs(int(latitude)), pdfe) * (height/2))
+@@ -253,1 +253,1 @@
+- int x = int(floor(input / 5));
++ int x = int(std::floor(input / 5));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/vidalia-02-max.diff Sat Feb 11 22:10:13 2012 +0000
@@ -0,0 +1,8 @@
+--- vidalia-0.2.15/src/vidalia/network/ZImageView.cpp Fri Oct 7 21:16:56 2011
++++ vidalia-0.2.15/src/vidalia/network/ZImageView.cpp Sat Feb 11 21:27:08 2012
+@@ -173,2 +173,3 @@
+- float maxw = float(std::max<int>(sRect.width(), iRect.width())) + _padding;
+- float maxh = float(std::max<int>(sRect.height(), iRect.height())) + _padding;
++#define max(a, b) (((a) > (b)) ? (a) : (b))
++ float maxw = float(max(sRect.width(), iRect.width())) + _padding;
++ float maxh = float(max(sRect.height(), iRect.height())) + _padding;