October 2013 - tor-commits - lists.torproject.org

[tlsdate/debian-master] Merge pull request #95 from riastradh/implement-fmemopen-with-funopen
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit ca5ca2e0655738be7f308b98eb6b25cbf1896790 Merge: a52417b 07337c5 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 17 18:58:11 2013 -0700 Merge pull request #95 from riastradh/implement-fmemopen-with-funopen Implement fmemopen in terms of funopen where needed and possible. configure.ac | 13 ++-- src/common/fmemopen-funopen.c | 158 +++++++++++++++++++++++++++++++++++++++++ src/common/fmemopen.h | 8 +++ src/conf-unittest.c | 6 ++ src/include.am | 9 +++ 5 files changed, 189 insertions(+), 5 deletions(-)

1 0

[tlsdate/debian-master] Update .travis.yml packages
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit bc044efce9fa017c92e44a35875a03e34f20da99 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 15:59:14 2013 -0700 Update .travis.yml packages --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b4c67a4..95d6a80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,5 +8,5 @@ branches: - master before_install: - sudo apt-get update -qq - - sudo apt-get install -qq autotools-dev debhelper dh-apparmor hardening-wrapper libssl-dev + - sudo apt-get install -qq autotools-dev debhelper dh-apparmor hardening-wrapper libssl-dev autotools automake pkg-config script: ./configure && make && make test

1 0

[tlsdate/debian-master] Add DragonFly BSD in configure.ac
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit bddd9e8a2a0b8e9bbe701d258c329320e02f9a6a Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 20:03:37 2013 -0700 Add DragonFly BSD in configure.ac --- configure.ac | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/configure.ac b/configure.ac index d1649da..1ccaa5a 100644 --- a/configure.ac +++ b/configure.ac @@ -213,6 +213,24 @@ case "$host" in [*], [UNPRIV_GROUP=$with_unpriv_group]) AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) ;; + *dragonfly*) + dnl This is for DragonFly BSD + dnl clock_gettime is either part of libc or unavailable. + AC_CHECK_FUNC([clock_gettime], , + [AC_MSG_ERROR([Your system lacks clock_gettime])]) + dnl If the autoconf goo picks up a compiler that runs in pre-POSIX mode, + dnl the fmemopen prototype is hidden causing the unit tests to segfault. + dnl This can happen if gcc is a symlink to gcc46 and is preferred to clang. + AC_CHECK_FUNC([fmemopen], , + [AC_MSG_WARN([Missing fmemopen, unit tests are likely to segfault. Try CC=clang.])]) + AC_ARG_WITH([unpriv-group], + [AS_HELP_STRING([--with-unpriv-group=<group>], + [Group to drop privs to @<:@default: nobody@:>@])]) + AS_CASE([$with_unpriv_group], + [""|yes|no], [UNPRIV_GROUP="nobody"], + [*], [UNPRIV_GROUP=$with_unpriv_group]) + AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) + ;; *-bsd*) dnl This is a generic catch for BSD variants dnl This likely needs to be tuned to catch all

1 0

[tlsdate/debian-master] This allows us to generate Makefiles on DragonFly BSD
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit cb5fa1ce36cce68d3714be193a474250c4d08009 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 19:59:10 2013 -0700 This allows us to generate Makefiles on DragonFly BSD --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 4f6f639..8981cef 100755 --- a/autogen.sh +++ b/autogen.sh @@ -17,7 +17,7 @@ then export WARNINGS fi -if [ $(uname) = NetBSD ]; +if [ $(uname) = NetBSD ] || [ $(uname) = DragonFly ]; then WARNINGS="" export WARNINGS

1 0

[tlsdate/debian-master] Merge branch 'master' of github.com:ioerror/tlsdate
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 08b3ae69bc91f8c9d56d470d9d2b147ce77a526c Merge: bddd9e8 1eb63c3 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 20:04:52 2013 -0700 Merge branch 'master' of github.com:ioerror/tlsdate configure.ac | 19 +++-- src/common/fmemopen-funopen.c | 158 +++++++++++++++++++++++++++++++++++++++++ src/common/fmemopen.h | 8 +++ src/common/strnlen.c | 19 +++++ src/common/strnlen.h | 8 +++ src/conf-unittest.c | 6 ++ src/conf.c | 2 +- src/include.am | 20 ++++++ src/proxy-bio.c | 6 ++ src/proxy-polarssl.c | 6 ++ src/tlsdate-helper.c | 2 +- 11 files changed, 245 insertions(+), 9 deletions(-)

1 0

[tlsdate/debian-master] Update .travis.yml to reflect correct packages
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 4c0adb0d5e411f43a09ff7b079161f9fc2d64d23 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 20:17:52 2013 -0700 Update .travis.yml to reflect correct packages --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 95d6a80..fd9d2fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,5 +8,5 @@ branches: - master before_install: - sudo apt-get update -qq - - sudo apt-get install -qq autotools-dev debhelper dh-apparmor hardening-wrapper libssl-dev autotools automake pkg-config + - sudo apt-get install -qq autotools-dev dh-apparmor hardening-wrapper libssl-dev autoconf automake pkg-config script: ./configure && make && make test

1 0

[tlsdate/debian-master] Add some TARGET_DRAGONFLYBSD goo to automake
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit b8cdc77514b0cf540bf32fd8a4c0ca28cd4321b4 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 20:28:14 2013 -0700 Add some TARGET_DRAGONFLYBSD goo to automake --- src/compat/include.am | 4 ++++ src/include.am | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/src/compat/include.am b/src/compat/include.am index 4f8cd30..0713c14 100644 --- a/src/compat/include.am +++ b/src/compat/include.am @@ -28,6 +28,10 @@ if TARGET_OPENBSD src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c endif +if TARGET_DRAGONFLYBSD +src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c +endif + if TARGET_BSD if !TARGET_NETBSD if !TARGET_FREEBSD diff --git a/src/include.am b/src/include.am index 7627850..d00f669 100644 --- a/src/include.am +++ b/src/include.am @@ -70,6 +70,16 @@ check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif +if TARGET_DRAGONFLYBSD +bin_PROGRAMS+= src/tlsdate +bin_PROGRAMS+= src/tlsdate-helper + +src_conf_unittest_SOURCES = src/conf.c +src_conf_unittest_SOURCES+= src/conf-unittest.c +check_PROGRAMS+= src/conf_unittest +noinst_PROGRAMS+= src/conf_unittest +endif + if TARGET_BSD if !TARGET_FREEBSD if !TARGET_NETBSD @@ -203,6 +213,18 @@ noinst_PROGRAMS+= src/proxy-bio_unittest endif endif +if TARGET_DRAGONFLYBSD +if !POLARSSL +src_proxy_bio_unittest_LDADD = @SSL_LIBS@ +src_proxy_bio_unittest_SOURCES = src/proxy-bio.c +src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c +src_proxy_bio_unittest_SOURCES+= src/test-bio.c +src_proxy_bio_unittest_SOURCES+= src/util.c +check_PROGRAMS+= src/proxy-bio_unittest +noinst_PROGRAMS+= src/proxy-bio_unittest +endif +endif + if TARGET_BSD if !POLARSSL if !TARGET_FREEBSD

1 0

[tlsdate/debian-master] Finish port of tlsdate to DragonFly BSD; tested on 3.3-DEVELOPMENT
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 88266c5cbbeb3ed9e284913d004bfdf78581a8b3 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 20:45:22 2013 -0700 Finish port of tlsdate to DragonFly BSD; tested on 3.3-DEVELOPMENT --- src/conf.c | 4 ++++ src/include.am | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/conf.c b/src/conf.c index b093676..607f523 100644 --- a/src/conf.c +++ b/src/conf.c @@ -19,6 +19,10 @@ #include "src/common/android.h" // XXX: Dirty hack - make this more generic later #endif +#ifdef TARGET_OS_DRAGONFLYBSD +#include "src/common/android.h" // XXX: Dirty hack - make this more generic later +#endif + #ifdef HAVE_ANDROID #include "src/common/android.h" #endif diff --git a/src/include.am b/src/include.am index d00f669..58e0df0 100644 --- a/src/include.am +++ b/src/include.am @@ -76,6 +76,7 @@ bin_PROGRAMS+= src/tlsdate-helper src_conf_unittest_SOURCES = src/conf.c src_conf_unittest_SOURCES+= src/conf-unittest.c +src_conf_unittest_SOURCES+= src/common/android.c check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif @@ -220,6 +221,7 @@ src_proxy_bio_unittest_SOURCES = src/proxy-bio.c src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c src_proxy_bio_unittest_SOURCES+= src/test-bio.c src_proxy_bio_unittest_SOURCES+= src/util.c +src_proxy_bio_unittest_SOURCES+= src/common/android.c check_PROGRAMS+= src/proxy-bio_unittest noinst_PROGRAMS+= src/proxy-bio_unittest endif

1 0

[tlsdate/debian-master] give DragonFly BSD the sacred timespec
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit e74d26cd1fcceb841b448ea7d37c48c6bbaca5b2 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 20:34:18 2013 -0700 give DragonFly BSD the sacred timespec --- src/compat/clock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compat/clock.h b/src/compat/clock.h index adea7ff..2bcdb2e 100644 --- a/src/compat/clock.h +++ b/src/compat/clock.h @@ -30,7 +30,7 @@ #endif struct tlsdate_time { -#if defined(__linux__) || defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) +#if defined(__linux__) || defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__DragonFly__) struct timespec tp; #elif defined(__APPLE__) mach_timespec_t tp;

1 0

[tlsdate/debian-master] Add note in INSTALL about a wishlist item
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit d8b01015907dc362aad84985720b729f775f0e36 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Thu Apr 18 22:16:20 2013 -0700 Add note in INSTALL about a wishlist item --- INSTALL | 1 + 1 file changed, 1 insertion(+) diff --git a/INSTALL b/INSTALL index 2b01a65..8a13454 100644 --- a/INSTALL +++ b/INSTALL @@ -24,6 +24,7 @@ ports of tlsdate or for tlsdate integration on the following Operating Systems: OpenWRT pfsense OpenVMS + Any of the classic unix systems Currently porting is in progress or partially documented for:

1 0