Permalink
Browse files

update to GNUnet 0.10.0; still some work to do, FUSE interface untested

  • Loading branch information...
1 parent 681aa97 commit 4e5396206195486edc4ab7904611b9bc120d5cd4 Pascal Stumpf committed Feb 9, 2014
View
@@ -1,6 +1,6 @@
# $OpenBSD$
-V ?= 0.9.5a
+V ?= 0.10.0
CATEGORIES = net
View
@@ -27,37 +27,46 @@ SHARED_LIBS += gnunettransport 0.0 # 0.0
SHARED_LIBS += gnunettransporttesting 0.0 # 0.0
SHARED_LIBS += gnunettun 0.0 # 0.0
SHARED_LIBS += gnunetutil 0.0 # 5.0
-SHARED_LIBS += gnunetlockmanager 0.0 # 0.0
SHARED_LIBS += gnunettestbed 0.0 # 0.0
SHARED_LIBS += gnunetregex 0.0 # 0.0
SHARED_LIBS += gnunetregexblock 0.0 # 1.0
-SHARED_LIBS += gnunetstream 0.0 # 0.0
SHARED_LIBS += gnunetdns 0.0 # 0.0
SHARED_LIBS += gnunetdnsparser 0.0 # 0.0
SHARED_LIBS += gnunetdnsstub 0.0 # 0.0
SHARED_LIBS += gnunetgns 0.0 # 0.0
-SHARED_LIBS += gnunetgns_common 0.0 # 0.0
SHARED_LIBS += gnunetvpn 0.0 # 0.0
+SHARED_LIBS += gnunetconversation 0.0 # 0.0
+SHARED_LIBS += gnunetfriends 0.0 # 0.0
+SHARED_LIBS += gnunetgnsrecord 0.0 # 0.0
+SHARED_LIBS += gnunetidentity 0.0 # 0.0
+SHARED_LIBS += gnunetmicrophone 0.0 # 0.0
+SHARED_LIBS += gnunetnamecache 0.0 # 0.0
+SHARED_LIBS += gnunetrevocation 0.0 # 0.0
+SHARED_LIBS += gnunetset 0.0 # 0.0
+SHARED_LIBS += gnunetspeaker 0.0 # 0.0
+SHARED_LIBS += gnunettestbedlogger 0.0 # 0.0
-WANTLIB += bz2 c crypto curl expat extractor fontconfig freetype
-WANTLIB += gcrypt gpg-error idn ltdl m pthread sqlite3 ssl unistring
-WANTLIB += z ogg pthread-stubs
+WANTLIB += FLAC ICE SM X11 X11-xcb Xext Xi Xtst bz2 c dbus-1 execinfo
+WANTLIB += expat extractor fontconfig freetype gcrypt gdbm gpg-error
+WANTLIB += idn json-c ltdl m ogg opus pthread pthread-stubs pulse
+WANTLIB += sndfile sqlite3 unistring vorbis vorbisenc xcb z
MODULES = devel/gettext
LIB_DEPENDS = devel/libextractor \
- net/curl \
devel/libidn \
security/libgcrypt \
- converters/libunistring
+ converters/libunistring \
+ audio/pulseaudio
USE_GMAKE = Yes
-CONFIGURE_STYLE = gnu
+CONFIGURE_STYLE = autoconf
+AUTOCONF_VERSION = 2.69
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--with-extractor="${LOCALBASE}" \
--without-mysql \
--without-postgres \
- --with-daemon-home-dir=/var/gnunet \
--with-sudo=/usr/bin/sudo
+CONFIGURE_ENV = LDFLAGS="-L${X11BASE}/lib"
LIBTOOL_FLAGS = --tag=disable-static
View
@@ -1,2 +1,2 @@
-SHA256 (gnunet-0.9.5a.tar.gz) = HWAHF+7h+VLiPRkiiIUKZ5SOkuCx3uXZUNERsmcMvtc=
-SIZE (gnunet-0.9.5a.tar.gz) = 7997840
+SHA256 (gnunet-0.10.0.tar.gz) = EbS9tHvgmqv9dFk+oTIAG85E0KfqAgrvzRJyPw9hF38=
+SIZE (gnunet-0.10.0.tar.gz) = 4582331
@@ -1,12 +0,0 @@
-$OpenBSD$
---- configure.orig Tue Feb 5 21:15:46 2013
-+++ configure Wed Aug 28 11:32:29 2013
-@@ -24452,7 +24452,7 @@ done
-
-
- # Checks for headers that are only required on some systems or opional (and where we do NOT abort if they are not there)
--for ac_header in malloc.h malloc/malloc.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h netinet/in_systm.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h ucred.h endian.h sys/endian.h execinfo.h
-+for ac_header in malloc.h malloc/malloc.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h netinet/in_systm.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h sys/ucred.h endian.h sys/endian.h execinfo.h
- do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.ac.orig Sun Feb 9 11:18:59 2014
++++ configure.ac Sun Feb 9 11:19:10 2014
+@@ -570,7 +570,7 @@ AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limit
+
+
+ # Checks for headers that are only required on some systems or opional (and where we do NOT abort if they are not there)
+-AC_CHECK_HEADERS([malloc.h malloc/malloc.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h netinet/in_systm.h netinet/ip.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h ucred.h endian.h sys/endian.h execinfo.h])
++AC_CHECK_HEADERS([malloc.h malloc/malloc.h langinfo.h sys/param.h sys/mount.h sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h fcntl.h libintl.h netdb.h netinet/in.h netinet/in_systm.h netinet/ip.h sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h sys/ucred.h ucred.h endian.h sys/endian.h execinfo.h])
+
+ SAVE_LDFLAGS=$LDFLAGS
+ SAVE_CPPFLAGS=$CPPFLAGS
@@ -1,7 +1,7 @@
$OpenBSD$
---- contrib/Makefile.in.orig Tue Feb 5 21:15:48 2013
-+++ contrib/Makefile.in Wed Aug 28 11:32:29 2013
-@@ -475,7 +475,7 @@ clean-noinstPROGRAMS:
+--- contrib/Makefile.in.orig Tue Dec 24 13:55:01 2013
++++ contrib/Makefile.in Sun Feb 9 11:18:05 2014
+@@ -484,7 +484,7 @@ clean-noinstPROGRAMS:
rm -f $$list
test_gnunet_prefix$(EXEEXT): $(test_gnunet_prefix_OBJECTS) $(test_gnunet_prefix_DEPENDENCIES) $(EXTRA_test_gnunet_prefix_DEPENDENCIES)
@rm -f test_gnunet_prefix$(EXEEXT)
@@ -1,7 +1,7 @@
$OpenBSD$
---- gnunet_config.h.in.orig Tue Feb 5 21:15:48 2013
-+++ gnunet_config.h.in Wed Aug 28 11:32:29 2013
-@@ -515,6 +515,9 @@
+--- gnunet_config.h.in.orig Tue Dec 24 13:55:00 2013
++++ gnunet_config.h.in Sun Feb 9 11:18:05 2014
+@@ -473,6 +473,9 @@
/* Define to 1 if you have the <ucred.h> header file. */
#undef HAVE_UCRED_H
@@ -1,12 +0,0 @@
-$OpenBSD$
---- src/Makefile.in.orig Tue Feb 5 21:15:48 2013
-+++ src/Makefile.in Wed Aug 28 11:32:29 2013
-@@ -357,7 +357,7 @@ top_srcdir = @top_srcdir@
- @HAVE_EXPERIMENTAL_TRUE@EXP_DIR = chat dv consensus sysmon
-
- # All of these currently only work on GNU/Linux
--@LINUX_TRUE@LINUX_DIR = dns exit vpn gns pt
-+LINUX_DIR = dns exit vpn gns pt
- @MINGW_TRUE@MINGW_DIR = dns gns
- @HAVE_MYSQL_TRUE@MYSQL_DIR = mysql
- @HAVE_POSTGRES_TRUE@POSTGRES_DIR = postgres
@@ -2,9 +2,9 @@ $OpenBSD$
WHAT THE ACTUAL FUCK???
---- src/dns/Makefile.in.orig Tue Feb 5 21:15:49 2013
-+++ src/dns/Makefile.in Wed Aug 28 11:32:29 2013
-@@ -523,8 +523,7 @@ libgnunet_plugin_block_dns_la_SOURCES = \
+--- src/dns/Makefile.in.orig Tue Dec 24 13:55:02 2013
++++ src/dns/Makefile.in Sun Feb 9 11:18:05 2014
+@@ -498,8 +498,7 @@ libgnunet_plugin_block_dns_la_SOURCES = \
libgnunet_plugin_block_dns_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la
@@ -1,7 +1,7 @@
$OpenBSD$
---- src/include/platform.h.orig Mon Nov 5 09:53:30 2012
-+++ src/include/platform.h Mon Nov 19 19:05:55 2012
-@@ -159,6 +159,9 @@
+--- src/include/platform.h.orig Tue Dec 24 15:47:55 2013
++++ src/include/platform.h Sun Feb 9 11:18:05 2014
+@@ -164,6 +164,9 @@
#if HAVE_UCRED_H
#include <ucred.h>
#endif
Oops, something went wrong.

0 comments on commit 4e53962

Please sign in to comment.