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

[tlsdate/debian-master] Fixup windows build target for mingw
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 0fa60007a6d49e0c40b44f3c95d7eb6741cb7a38 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 17:49:23 2013 -0700 Fixup windows build target for mingw --- m4/ax_platform.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index baffd1e..1747ca7 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -76,7 +76,7 @@ [TARGET_LINUX="true" AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])]) - AM_CONDITIONAL([BUILD_WIN32],[test "x${TARGET_WINDOWS}" = "xtrue"]) + AM_CONDITIONAL([TARGET_WIN32],[test "x${TARGET_WINDOWS}" = "xtrue"]) AM_CONDITIONAL([TARGET_CYGWIN],[test "x${TARGET_CYGWIN}" = "xtrue"]) AM_CONDITIONAL([TARGET_HAIKU],[test "x${TARGET_HAIKU}" = "xtrue"]) AM_CONDITIONAL([TARGET_OSX],[test "x${TARGET_OSX}" = "xtrue"])

1 0

[tlsdate/debian-master] Update OS support list in INSTALL
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 4c596eb951f127d85f3b05d841336d8db66327e0 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 11:06:45 2013 -0700 Update OS support list in INSTALL --- INSTALL | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index 170ad24..ebe01c4 100644 --- a/INSTALL +++ b/INSTALL @@ -15,7 +15,11 @@ tlsdate should build and work on the following Operating Systems: OpenBSD 5.2 Gentoo 20130413 DragonFly BSD 3.3-DEVELOPMENT + +tlsdate should build and may work on the following Operating Systems: + Cygwin CYGWIN_NT-6.1 1.7.18(0.263/5/3) + Haiku r1alpha4 Please file a bug or email the tlsdate team if you have successfully built or use tlsdate on a platform that is not listed. We are specifically looking for @@ -33,7 +37,6 @@ ports of tlsdate or for tlsdate integration on the following Operating Systems: Currently porting is in progress or partially documented for: Plan9 (with APE) - Haiku Building and install of tlsdate on GNU/Linux and FreeBSD: @@ -115,7 +118,7 @@ On Haiku we must use gcc4: export CC=/boot/develop/abi/x86/gcc4/tools/gcc4.6.3-haiku-121101/bin/gcc export LDFLAGS="$LDFLAGS -lbsd" - ./configure + ./configure # This includes the above exports currently make OpenBSD builds from source and is not yet in the port system:

1 0

[tlsdate/debian-master] Remove unused Makefile
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 9145ac5f3114309f24e1d1a0b0c10c7f14201cbb Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 19:32:35 2013 -0700 Remove unused Makefile --- src/Makefile.am | 116 ------------------------------------------------------- 1 file changed, 116 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index cd9802f..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,116 +0,0 @@ -SUBDIRS = compat - -AUTOMAKE_OPTIONS = foreign 1.7 - -# Our main programs -if TARGET_LINUX -bin_PROGRAMS = tlsdate-routeup tlsdate tlsdate-helper \ - tlsdated tlsdated_unittest -endif - -if TARGET_FREEBSD -bin_PROGRAMS = tlsdate tlsdate-helper -endif - -if TARGET_NETBSD -bin_PROGRAMS = tlsdate tlsdate-helper -endif - -if TARGET_BSD -if !TARGET_FREEBSD -if !TARGET_NETBSD -bin_PROGRAMS = tlsdate tlsdate-helper -endif -endif -endif - -if TARGET_OSX -bin_PROGRAMS = tlsdate tlsdate-helper -endif - -AM_CFLAGS = -fvisibility=hidden -if TARGET_LINUX -# Our main program -bin_PROGRAMS = tlsdate-routeup tlsdate tlsdate-helper \ - tlsdated tlsdated_unittest -if !POLARSSL -bin_PROGRAMS = $(bin_PROGRAMS) proxy_bio_unittest -endif -AM_CFLAGS = -fvisibility=hidden -if !POLARSSL -proxy_bio_unittest_SOURCES = proxy-bio.c proxy-bio-unittest.c test-bio.c util.c -proxy_bio_unittest_LDADD = -lssl -lcrypto -endif -tlsdate_routeup_SOURCES = routeup.c util.c -tlsdate_routeup_CFLAGS = $(AM_CFLAGS) -DROUTEUP_MAIN -endif - -tlsdate_SOURCES = tlsdate.c -tlsdate_helper_SOURCES = proxy-bio.c util.c tlsdate-helper.c - -if TARGET_LINUX -tlsdate_helper_LDADD = @SSL_LIBS@ @SSL_LDFLAGS@ -lrt \ - $(top_builddir)/src/compat/libtlsdate_compat.la -endif - -if TARGET_FREEBSD -tlsdate_helper_LDADD = @SSL_LIBS@ @SSL_LDFLAGS@ -lrt \ - $(top_builddir)/src/compat/libtlsdate_compat.la -endif - -if TARGET_NETBSD -tlsdate_helper_LDADD = @SSL_LIBS@ @SSL_LDFLAGS@ -lrt \ - $(top_builddir)/src/compat/libtlsdate_compat.la -endif - -if TARGET_BSD -if !TARGET_FREEBSD -if !TARGET_NETBSD -tlsdate_helper_LDADD = @SSL_LIBS@ @SSL_LDFLAGS@ -lrt \ - $(top_builddir)/src/compat/libtlsdate_compat.la -endif -endif -endif - -if TARGET_OSX -tlsdate_helper_LDADD = @SSL_LIBS@ @SSL_LDFLAGS@ -lrt \ - $(top_builddir)/src/compat/.libs/libtlsdate_compat.dylib -endif - -if TARGET_LINUX -tlsdated_SOURCES = routeup.c tlsdated.c util.c -tlsdated_CFLAGS = $(AM_CFLAGS) -DTLSDATED_MAIN -tlsdated_unittest_SOURCES = routeup.c tlsdated-unittest.c util.c -endif - -if HAVE_ANDROID_SYSTEM -tlsdated_unittest_SOURCES += common/android.c common/fmemopen.c -endif - -if TARGET_NETBSD -tlsdated_unittest_SOURCES += common/android.c common/fmemopen.c -endif - -if TARGET_OSX -tlsdated_SOURCES = routeup.c tlsdated.c util.c -tlsdated_CFLAGS = $(AM_CFLAGS) -DTLSDATED_MAIN -endif - -if TARGET_LINUX -TESTS = tlsdated_unittest -if !POLARSSL -TESTS = $(TESTS) proxy_bio_unittest -endif - -# We're not shipping headers -noinst_HEADERS = tlsdate.h - -if HAVE_ANDROID_SYSTEM -noinst_HEADERS+= common/android.h -noinst_HEADERS+= common/fmemopen.h -endif - -if TARGET_NETBSD -noinst_HEADERS+= common/android.h -noinst_HEADERS+= common/fmemopen.h -endif

1 0

[tlsdate/debian-master] Start MinGW support
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 63218359eb051fa76bd7788e369bc5c0583f0d64 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 18:44:39 2013 -0700 Start MinGW support --- INSTALL | 1 + autogen.sh | 2 +- configure.ac | 17 +++++++++++++++++ m4/ax_platform.m4 | 4 ++++ src/compat/clock.h | 2 ++ src/compat/include.am | 4 ++++ src/include.am | 28 ++++++++++++++++++++++++++++ 7 files changed, 57 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index ebe01c4..97ca73b 100644 --- a/INSTALL +++ b/INSTALL @@ -37,6 +37,7 @@ ports of tlsdate or for tlsdate integration on the following Operating Systems: Currently porting is in progress or partially documented for: Plan9 (with APE) + MingGW Building and install of tlsdate on GNU/Linux and FreeBSD: diff --git a/autogen.sh b/autogen.sh index 51c926a..efdcacc 100755 --- a/autogen.sh +++ b/autogen.sh @@ -23,7 +23,7 @@ then export WARNINGS fi -if [ $(uname) != "CYGWIN_NT-6.1" ]; +if [ $(uname) = "CYGWIN_NT-6.1" ] || [ $(uname) = "MINGW32_NT-6.1" ]; then WARNINGS="" export WARNINGS diff --git a/configure.ac b/configure.ac index b3e7df1..56f7e27 100644 --- a/configure.ac +++ b/configure.ac @@ -291,6 +291,23 @@ case "$host" in [*], [UNPRIV_GROUP=$with_unpriv_group]) AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) ;; + *-mingw32*) + dnl This is for MINGW32_NT + dnl Check for clock_gettime. Some systems put it into -lc, while + dnl others use -lrt. Try the first and fallback to the latter. + RT_LIB= + AC_CHECK_FUNC([clock_gettime], [:], + [AC_CHECK_LIB([rt], [clock_gettime], [RT_LIB="-lrt"], + [AC_MSG_ERROR([Your system lacks clock_gettime])])]) + AC_SUBST(RT_LIB) + AC_ARG_WITH([unpriv-group], + [AS_HELP_STRING([--with-unpriv-group=<group>], + [Group to drop privs to @<:@default: nogroup@:>@])]) + AS_CASE([$with_unpriv_group], + [""|yes|no], [UNPRIV_GROUP="nogroup"], + [*], [UNPRIV_GROUP=$with_unpriv_group]) + AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) + ;; *-beos*|*-haiku*) dnl This is for BeOS and Haiku; we probably only support Haiku with gcc4 dnl Check for clock_gettime. Some systems put it into -lc, while diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index 6e43ab8..76031d4 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -47,6 +47,9 @@ # define SHUT_RDWR SD_BOTH #endif ])], + [*mingw*], + [TARGET_OS_MINGW="true" + AC_DEFINE([TARGET_OS_MINGW],[1],[Whether we build for MinGW])], [*cygwin*], [TARGET_OS_CYGWIN="true" AC_DEFINE([TARGET_OS_CYGWIN],[1],[Whether we build for Cygwin])], @@ -77,6 +80,7 @@ AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])]) AM_CONDITIONAL([TARGET_WIN32],[test "x${TARGET_OS_WINDOWS}" = "xtrue"]) + AM_CONDITIONAL([TARGET_MINGW],[test "x${TARGET_OS_MINGW}" = "xtrue"]) AM_CONDITIONAL([TARGET_CYGWIN],[test "x${TARGET_OS_CYGWIN}" = "xtrue"]) AM_CONDITIONAL([TARGET_HAIKU],[test "x${TARGET_OS_HAIKU}" = "xtrue"]) AM_CONDITIONAL([TARGET_OSX],[test "x${TARGET_OS_OSX}" = "xtrue"]) diff --git a/src/compat/clock.h b/src/compat/clock.h index e8220bd..727940e 100644 --- a/src/compat/clock.h +++ b/src/compat/clock.h @@ -40,6 +40,8 @@ struct tlsdate_time { struct timespec tp; #elif TARGET_OS_CYGWIN struct timespec tp; +#elif TARGET_OS_MINGW + struct timespec tp; #endif }; diff --git a/src/compat/include.am b/src/compat/include.am index 9623362..55ebb61 100644 --- a/src/compat/include.am +++ b/src/compat/include.am @@ -44,6 +44,10 @@ if TARGET_CYGWIN src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c endif +if TARGET_MINGW +src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c +endif + if TARGET_HAIKU src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c endif diff --git a/src/include.am b/src/include.am index a045759..3168a6c 100644 --- a/src/include.am +++ b/src/include.am @@ -107,6 +107,17 @@ check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif +if TARGET_MINGW +bin_PROGRAMS+= src/tlsdate +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 + if TARGET_HAIKU bin_PROGRAMS+= src/tlsdate bin_PROGRAMS+= src/tlsdate-helper @@ -279,6 +290,19 @@ noinst_PROGRAMS+= src/proxy-bio_unittest endif endif +if TARGET_MINGW +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 +src_proxy_bio_unittest_SOURCES+= src/common/android.c +check_PROGRAMS+= src/proxy-bio_unittest +noinst_PROGRAMS+= src/proxy-bio_unittest +endif +endif + if TARGET_HAIKU if !POLARSSL src_proxy_bio_unittest_LDADD = @SSL_LIBS@ @@ -320,6 +344,7 @@ if !TARGET_FREEBSD if !TARGET_DRAGONFLYBSD if !TARGET_HAIKU if !TARGET_CYGWIN +if !TARGET_MINGW if !TARGET_BSD bin_PROGRAMS+= src/tlsdate bin_PROGRAMS+= src/tlsdate-helper @@ -340,6 +365,7 @@ endif endif endif endif +endif if !POLARSSL if !TARGET_HAIKU @@ -351,6 +377,7 @@ if !TARGET_FREEBSD if !TARGET_DRAGONFLYBSD if !TARGET_HAIKU if !TARGET_CYGWIN +if !TARGET_MINGW if !TARGET_BSD src_proxy_bio_unittest_LDADD = @SSL_LIBS@ src_proxy_bio_unittest_SOURCES = src/proxy-bio.c @@ -371,6 +398,7 @@ endif endif endif endif +endif if !TARGET_OSX check_PROGRAMS+= src/test/proxy-override src/test/return-argc \

1 0

[tlsdate/debian-master] Fix Linux builds
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit d691835f2225d1156826634507e654eb96aa3825 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 19:32:09 2013 -0700 Fix Linux builds --- configure.ac | 16 ++++++++-------- m4/ax_platform.m4 | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 56f7e27..182bf08 100644 --- a/configure.ac +++ b/configure.ac @@ -273,6 +273,14 @@ case "$host" in [""|yes|no], [UNPRIV_GROUP="nogroup"], [*], [UNPRIV_GROUP=$with_unpriv_group]) AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) + case "$host" in + *-linux-androideabi) + dnl This is for Android NDK as it is a special case of linux + AC_DEFINE(HAVE_ANDROID,1, [Defined if we are to build for an Android system]) + AC_SUBST(HAVE_ANDROID, [1]) + HAVE_ANDROID="yes" + ;; + esac ;; *-cygwin*) dnl This is for Cygwin @@ -327,14 +335,6 @@ case "$host" in AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) LDFLAGS="$LDFLAGS -lbsd" CC="/boot/develop/abi/x86/gcc4/tools/gcc-4.6.3-haiku-121101/bin/gcc" - case "$host" in - *-linux-androideabi) - dnl This is for Android NDK as it is a special case of linux - AC_DEFINE(HAVE_ANDROID,1, [Defined if we are to build for an Android system]) - AC_SUBST(HAVE_ANDROID, [1]) - HAVE_ANDROID="yes" - ;; - esac ;; esac diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index 76031d4..2d4285c 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -73,10 +73,10 @@ AC_DEFINE([TARGET_OS_BSD],[1],[Whether we are building for some other *BSD])], [*solaris*],[AC_DEFINE([TARGET_OS_SOLARIS],[1],[Whether we are building for Solaris])], [*darwin*], - [TARGET_OSX="true" + [TARGET_OS_OSX="true" AC_DEFINE([TARGET_OS_OSX],[1],[Whether we build for OSX])], [*linux*], - [TARGET_LINUX="true" + [TARGET_OS_LINUX="true" AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])]) AM_CONDITIONAL([TARGET_WIN32],[test "x${TARGET_OS_WINDOWS}" = "xtrue"])

1 0

[tlsdate/debian-master] Add basic GNU/Hurd build support
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 2f7224a11eddcc0d515cd168954eaff4b7baa0f8 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 19:57:17 2013 -0700 Add basic GNU/Hurd build support --- INSTALL | 9 +++++---- m4/ax_platform.m4 | 4 ++++ src/compat/clock.h | 4 ++++ src/compat/include.am | 4 ++++ src/include.am | 28 ++++++++++++++++++++++++++-- 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/INSTALL b/INSTALL index 97ca73b..07bdcd9 100644 --- a/INSTALL +++ b/INSTALL @@ -18,21 +18,22 @@ tlsdate should build and work on the following Operating Systems: tlsdate should build and may work on the following Operating Systems: - Cygwin CYGWIN_NT-6.1 1.7.18(0.263/5/3) + Win32 with Cygwin CYGWIN_NT-6.1 1.7.18(0.263/5/3 + Win32 with MinGW Haiku r1alpha4 + GNU/Hurd GNU-Mach 1.3.99-486-dbg/Hurd-0.3 Please file a bug or email the tlsdate team if you have successfully built or use tlsdate on a platform that is not listed. We are specifically looking for ports of tlsdate or for tlsdate integration on the following Operating Systems: - Win32 (MinGW or otherwise) + Windows native OpenWRT pfsense OpenVMS Irix - GNU/Hurd Minix - Any of the classic unix systems + Any of the other classic unix systems Currently porting is in progress or partially documented for: diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index 2d4285c..e5baba5 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -75,6 +75,9 @@ [*darwin*], [TARGET_OS_OSX="true" AC_DEFINE([TARGET_OS_OSX],[1],[Whether we build for OSX])], + [*gnu*], + [TARGET_OS_GNUHURD="true" + AC_DEFINE([TARGET_OS_GNUHURD],[1],[Whether we build for GNU/Hurd])], [*linux*], [TARGET_OS_LINUX="true" AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])]) @@ -84,6 +87,7 @@ AM_CONDITIONAL([TARGET_CYGWIN],[test "x${TARGET_OS_CYGWIN}" = "xtrue"]) AM_CONDITIONAL([TARGET_HAIKU],[test "x${TARGET_OS_HAIKU}" = "xtrue"]) AM_CONDITIONAL([TARGET_OSX],[test "x${TARGET_OS_OSX}" = "xtrue"]) + AM_CONDITIONAL([TARGET_GNUHURD],[test "x${TARGET_OS_GNUHURD}" = "xtrue"]) AM_CONDITIONAL([TARGET_LINUX],[test "x${TARGET_OS_LINUX}" = "xtrue"]) AM_CONDITIONAL([TARGET_FREEBSD],[test "x${TARGET_OS_FREEBSD}" = "xtrue"]) AM_CONDITIONAL([TARGET_NETBSD],[test "x${TARGET_OS_NETBSD}" = "xtrue"]) diff --git a/src/compat/clock.h b/src/compat/clock.h index 727940e..15f3223 100644 --- a/src/compat/clock.h +++ b/src/compat/clock.h @@ -42,6 +42,10 @@ struct tlsdate_time { struct timespec tp; #elif TARGET_OS_MINGW struct timespec tp; +#elif TARGET_OS_GNUHURD + struct timespec tp; +#else + struct timespec tp; #endif }; diff --git a/src/compat/include.am b/src/compat/include.am index 55ebb61..55b6218 100644 --- a/src/compat/include.am +++ b/src/compat/include.am @@ -40,6 +40,10 @@ endif endif endif +if TARGET_GNUHURD +src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c +endif + if TARGET_CYGWIN src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c endif diff --git a/src/include.am b/src/include.am index 3168a6c..f724f39 100644 --- a/src/include.am +++ b/src/include.am @@ -96,6 +96,17 @@ endif endif endif +if TARGET_GNUHURD +bin_PROGRAMS+= src/tlsdate +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 + if TARGET_CYGWIN bin_PROGRAMS+= src/tlsdate bin_PROGRAMS+= src/tlsdate-helper @@ -277,6 +288,19 @@ endif endif endif +if TARGET_GNUHURD +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 +src_proxy_bio_unittest_SOURCES+= src/common/android.c +check_PROGRAMS+= src/proxy-bio_unittest +noinst_PROGRAMS+= src/proxy-bio_unittest +endif +endif + if TARGET_CYGWIN if !POLARSSL src_proxy_bio_unittest_LDADD = @SSL_LIBS@ @@ -335,7 +359,6 @@ endif # This is our explicit target list # We do not attempt to build with PolarSSL if !POLARSSL -if !TARGET_HAIKU if !TARGET_LINUX if !TARGET_OSX if !TARGET_OPENBSD @@ -343,6 +366,7 @@ if !TARGET_NETBSD if !TARGET_FREEBSD if !TARGET_DRAGONFLYBSD if !TARGET_HAIKU +if !TARGET_GNUHURD if !TARGET_CYGWIN if !TARGET_MINGW if !TARGET_BSD @@ -368,7 +392,6 @@ endif endif if !POLARSSL -if !TARGET_HAIKU if !TARGET_LINUX if !TARGET_OSX if !TARGET_OPENBSD @@ -376,6 +399,7 @@ if !TARGET_NETBSD if !TARGET_FREEBSD if !TARGET_DRAGONFLYBSD if !TARGET_HAIKU +if !TARGET_GNUHURD if !TARGET_CYGWIN if !TARGET_MINGW if !TARGET_BSD

1 0

[tlsdate/debian-master] add configure magic for GNU/kFreeBSD
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 5840f8c983fd0f07169d9aacb8f14215ef2154a5 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 23:18:38 2013 -0700 add configure magic for GNU/kFreeBSD --- configure.ac | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/configure.ac b/configure.ac index ca81844..14aead5 100644 --- a/configure.ac +++ b/configure.ac @@ -184,6 +184,24 @@ case "$host" in [*], [UNPRIV_GROUP=$with_unpriv_group]) AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) ;; + *kfreebsd*-gnu*) + dnl This is for Debian GNU/kFreeBSD + 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_ERROR([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]) + ;; *-netbsd*) dnl This is for NetBSD dnl clock_gettime is either part of libc or unavailable.

1 0

[tlsdate/debian-master] Allow for generic builds when we do not explicitly support the OS
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit b5bcf7626db282e859307609bb8ffdfafe43584d Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 11:39:54 2013 -0700 Allow for generic builds when we do not explicitly support the OS --- src/include.am | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/src/include.am b/src/include.am index 0ec38b2..a045759 100644 --- a/src/include.am +++ b/src/include.am @@ -308,6 +308,70 @@ if HAVE_ANDROID noinst_HEADERS+= src/common/android.h endif +# This is our explicit target list +# We do not attempt to build with PolarSSL +if !POLARSSL +if !TARGET_HAIKU +if !TARGET_LINUX +if !TARGET_OSX +if !TARGET_OPENBSD +if !TARGET_NETBSD +if !TARGET_FREEBSD +if !TARGET_DRAGONFLYBSD +if !TARGET_HAIKU +if !TARGET_CYGWIN +if !TARGET_BSD +bin_PROGRAMS+= src/tlsdate +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 +endif +endif +endif +endif +endif +endif +endif +endif +endif +endif + +if !POLARSSL +if !TARGET_HAIKU +if !TARGET_LINUX +if !TARGET_OSX +if !TARGET_OPENBSD +if !TARGET_NETBSD +if !TARGET_FREEBSD +if !TARGET_DRAGONFLYBSD +if !TARGET_HAIKU +if !TARGET_CYGWIN +if !TARGET_BSD +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 +src_proxy_bio_unittest_SOURCES+= src/common/android.c +check_PROGRAMS+= src/proxy-bio_unittest +noinst_PROGRAMS+= src/proxy-bio_unittest +endif +endif +endif +endif +endif +endif +endif +endif +endif +endif +endif + if !TARGET_OSX check_PROGRAMS+= src/test/proxy-override src/test/return-argc \ src/test/rotate src/test/sleep-wrap

1 0

[tlsdate/debian-master] fork clock-linux.c for GNU/Hurd
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 691d6f0b8712ce24e826bd39e6beddd51e403c71 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 22:06:48 2013 -0700 fork clock-linux.c for GNU/Hurd --- src/compat/clock-hurd.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/src/compat/clock-hurd.c b/src/compat/clock-hurd.c new file mode 100644 index 0000000..3d62068 --- /dev/null +++ b/src/compat/clock-hurd.c @@ -0,0 +1,59 @@ +/* Copyright (c) 2012, David Goulet <dgoulet(a)ev0ke.net> + * Jacob Appelbaum + * Copyright (c) 2012, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file clock-linux.c + * \brief Contains clock primitives for GNU/Linux OS + **/ + +#include "config.h" + +#include <assert.h> + +#include "src/compat/clock.h" + +/** + * Get current real time value and store it into time. + * + * @param time where the current time is stored + * @return clock_gettime syscall return value + */ +int clock_get_real_time(struct tlsdate_time *time) +{ + /* Safety net */ + assert(time); + + return clock_gettime(CLOCK_REALTIME, &time->tp); +} + +/** + * Set current real time clock using time. + * + * @param time where the current time to set is stored + * @return clock_settime syscall return value + */ +int clock_set_real_time(const struct tlsdate_time *time) +{ + /* Safety net */ + assert(time); + + return clock_settime(CLOCK_REALTIME, &time->tp); +} + +/** + * Init a tlsdate_time structure. + * + * @param sec is the seconds + * @param nsec is the nanoseconds + */ +void clock_init_time(struct tlsdate_time *time, time_t sec, + long nsec) +{ + /* Safety net */ + assert(time); + + time->tp.tv_sec = sec; + time->tp.tv_nsec = nsec; +}

1 0

[tlsdate/debian-master] Add GNU/Hurd configure extras for -ltr
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit e69e044fe47e75e9b0793ab5f601a7f368da5733 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Apr 24 23:16:58 2013 -0700 Add GNU/Hurd configure extras for -ltr --- configure.ac | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/configure.ac b/configure.ac index 182bf08..ca81844 100644 --- a/configure.ac +++ b/configure.ac @@ -282,6 +282,25 @@ case "$host" in ;; esac ;; + *-gnu0.*) + dnl This is a generic catch for GNU/Hurd variants + dnl This likely needs to be tuned to catch all + 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_ERROR([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]) + ;; *-cygwin*) dnl This is for Cygwin dnl Check for clock_gettime. Some systems put it into -lc, while

1 0