Index: head/net/gnunet/Makefile =================================================================== --- head/net/gnunet/Makefile (revision 127189) +++ head/net/gnunet/Makefile (revision 127190) @@ -1,138 +1,137 @@ # ex:ts=8 # Ports collection makefile for: GNUnet # Date created: Mar 23, 2002 # Whom: ijliao # # $FreeBSD$ # PORTNAME= gnunet -PORTVERSION= 0.6.5 -PORTREVISION= 1 +PORTVERSION= 0.6.6 CATEGORIES= net MASTER_SITES= http://www.ovmj.org/GNUnet/download/ \ ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= GNUnet-${PORTVERSION} MAINTAINER= krion@FreeBSD.org COMMENT= An anonymous, distributed, reputation-based network LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 USE_LIBLTDL= yes USE_BZIP2= yes USE_GETOPT_LONG= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnometarget gtk20 lthack USE_INC_LIBTOOL_VER=13 USE_OPENSSL= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" CONFIGURE_ARGS= --disable-ltdl-install --with-crypto LDFLAGS+= -L${LOCALBASE}/lib .if defined(WITH_GDBM) LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm PLIST_SUB+= WITH_GDBM="" .else CONFIGURE_ARGS+= --without-gdbm PLIST_SUB+= WITH_GDBM="@comment " .endif .if defined(WITH_MYSQL) USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql .else CONFIGURE_ARGS+= --without-mysql .endif .if defined(WITH_TDB) LIB_DEPENDS+= tdb.1:${PORTSDIR}/databases/tdb PLIST_SUB+= WITH_TDB="" .else CONFIGURE_ARGS+= --without-tdb PLIST_SUB+= WITH_TDB="@comment " .endif .if defined(WITH_BDB3) LIB_DEPENDS+= db3:${PORTSDIR}/databases/db3 CONFIGURE_ARGS+= --with-bdb=${LOCALBASE} .else CONFIGURE_ARGS+= --without-bdb .endif .if defined(WITH_SQLITE) LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3 CONFIGURE_ARGS+= --with-sqlite PLIST_SUB+= WITH_SQLITE="" .else CONFIGURE_ARGS+= --without-sqlite PLIST_SUB+= WITH_SQLITE="@comment " .endif .if defined(WITH_IPV6) PKGNAMESUFFIX= -ipv6 CONFIGURE_ARGS+= --enable-ipv6 PLIST_SUB+= WITH_IPV6="" .else PLIST_SUB+= WITH_IPV6="@comment " .endif .if defined(WITH_GUILE) LIB_DEPENDS+= guile.15:${PORTSDIR}/lang/guile CONFIGURE_ARGS+= --enable-guile MAN1+= gnunet-download-manager.1 PLIST_SUB+= WITH_GUILE="" .else CONFIGURE_ARGS+= --disable-guile PLIST_SUB+= WITH_GUILE="@comment " .endif MAN1= gnunet-chat.1 gnunet-check.1 gnunet-convert.1 \ gnunet-delete.1 gnunet-directory.1 \ gnunet-download.1 gnunet-gtk.1 gnunet-insert.1 \ gnunet-peer-info.1 gnunet-pseudonym.1 \ gnunet-search.1 gnunet-stats.1 gnunet-tbench.1 \ gnunet-testbed.1 gnunet-tracekit.1 gnunet-transport-check.1 \ gnunet-update.1 gnunetd.1 MAN5= gnunet.conf.5 pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} "You can build GNUnet with the following options:" @${ECHO_MSG} " WITH_MYSQL=yes Turn on MySQL support" @${ECHO_MSG} " WITH_TDB=yes Turn on TDB support" @${ECHO_MSG} " WITH_BDB3=yes Turn on Berkely DB library support" @${ECHO_MSG} " WITH_GDBM=yes Turn on GNU dbm support" @${ECHO_MSG} " WITH_SQLITE=yes Turn on sqlite support" @${ECHO_MSG} " WITH_IPV6=yes Turn on to enable IPv6 support" @${ECHO_MSG} "" post-patch: @${FIND} ${WRKSRC} -name configure | ${XARGS} \ ${REINPLACE_CMD} -e \ 's|-pthread [\$$]CFLAGS|${PTHREAD_CFLAGS} \$$CFLAGS|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' ${REINPLACE_CMD} -e \ 's|^#include |#include |g' \ ${WRKSRC}/src/applications/afs/module/manager.c ${REINPLACE_CMD} -e \ 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/src/include/gnunet_util.h post-install: ${INSTALL_DATA} ${WRKSRC}/contrib/gnunet.root ${PREFIX}/etc/gnunet.conf-dist .ifndef(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/contrib/gnunet.user ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR} .endif .include Property changes on: head/net/gnunet/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.45 \ No newline at end of property +1.46 \ No newline at end of property Index: head/net/gnunet/distinfo =================================================================== --- head/net/gnunet/distinfo (revision 127189) +++ head/net/gnunet/distinfo (revision 127190) @@ -1,2 +1,2 @@ -MD5 (GNUnet-0.6.5.tar.bz2) = 8bca32b55dccdb5bde7bd2b38df9df03 -SIZE (GNUnet-0.6.5.tar.bz2) = 1267839 +MD5 (GNUnet-0.6.6.tar.bz2) = 46db6a3952416f222e10d68ad31e24ed +SIZE (GNUnet-0.6.6.tar.bz2) = 1267600 Property changes on: head/net/gnunet/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.21 \ No newline at end of property +1.22 \ No newline at end of property Index: head/net/gnunet/files/patch-src_applications_afs_module_Makefile.in =================================================================== --- head/net/gnunet/files/patch-src_applications_afs_module_Makefile.in (revision 127189) +++ head/net/gnunet/files/patch-src_applications_afs_module_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/applications/afs/module/Makefile.in.orig +++ src/applications/afs/module/Makefile.in -@@ -203,7 +203,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -1031,7 +1031,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(libgnunetafs_database_bdb_la_SOURCES) \ + DIST_SOURCES = $(libgnunetafs_database_bdb_la_SOURCES) \ $(libgnunetafs_database_directory_la_SOURCES) \ $(libgnunetafs_database_gdbm_la_SOURCES) \ Property changes on: head/net/gnunet/files/patch-src_applications_afs_module_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/gnunet/files/patch-src_applications_afs_tools_Makefile.in =================================================================== --- head/net/gnunet/files/patch-src_applications_afs_tools_Makefile.in (revision 127189) +++ head/net/gnunet/files/patch-src_applications_afs_tools_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/applications/afs/tools/Makefile.in.orig +++ src/applications/afs/tools/Makefile.in -@@ -104,7 +104,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -310,7 +310,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(gnunet_delete_SOURCES) $(gnunet_directory_SOURCES) \ + DIST_SOURCES = $(gnunet_delete_SOURCES) $(gnunet_directory_SOURCES) \ $(gnunet_download_SOURCES) $(gnunet_insert_SOURCES) \ $(gnunet_pseudonym_SOURCES) $(gnunet_search_SOURCES) Property changes on: head/net/gnunet/files/patch-src_applications_afs_tools_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/gnunet/files/patch-src_applications_chat_Makefile.in =================================================================== --- head/net/gnunet/files/patch-src_applications_chat_Makefile.in (revision 127189) +++ head/net/gnunet/files/patch-src_applications_chat_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/applications/chat/Makefile.in.orig +++ src/applications/chat/Makefile.in -@@ -80,7 +80,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -265,7 +265,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(libgnunetchat_protocol_la_SOURCES) $(gnunet_chat_SOURCES) DIST_SOURCES = $(libgnunetchat_protocol_la_SOURCES) \ $(gnunet_chat_SOURCES) + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am Property changes on: head/net/gnunet/files/patch-src_applications_chat_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/gnunet/files/patch-src_applications_dht_tools_Makefile.in =================================================================== --- head/net/gnunet/files/patch-src_applications_dht_tools_Makefile.in (revision 127189) +++ head/net/gnunet/files/patch-src_applications_dht_tools_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/applications/dht/tools/Makefile.in.orig +++ src/applications/dht/tools/Makefile.in -@@ -84,7 +84,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -279,7 +279,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(libgnunetdht_api_la_SOURCES) $(gnunet_dht_join_SOURCES) \ + DIST_SOURCES = $(libgnunetdht_api_la_SOURCES) $(gnunet_dht_join_SOURCES) \ $(gnunet_dht_query_SOURCES) - DIST_SOURCES = $(libgnunetdht_api_la_SOURCES) \ + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am Property changes on: head/net/gnunet/files/patch-src_applications_dht_tools_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/gnunet/files/patch-src_applications_stats_Makefile.in =================================================================== --- head/net/gnunet/files/patch-src_applications_stats_Makefile.in (revision 127189) +++ head/net/gnunet/files/patch-src_applications_stats_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/applications/stats/Makefile.in.orig +++ src/applications/stats/Makefile.in -@@ -71,7 +71,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -240,7 +240,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(gnunet_stats_SOURCES) DIST_SOURCES = $(gnunet_stats_SOURCES) - ETAGS = etags + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + SOURCES = $(gnunet_stats_SOURCES) Property changes on: head/net/gnunet/files/patch-src_applications_stats_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/gnunet/files/patch-src_applications_tbench_Makefile.in =================================================================== --- head/net/gnunet/files/patch-src_applications_tbench_Makefile.in (revision 127189) +++ head/net/gnunet/files/patch-src_applications_tbench_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/applications/tbench/Makefile.in.orig +++ src/applications/tbench/Makefile.in -@@ -81,7 +81,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -266,7 +266,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(libgnunettbench_protocol_la_SOURCES) \ - $(gnunet_tbench_SOURCES) DIST_SOURCES = $(libgnunettbench_protocol_la_SOURCES) \ + $(gnunet_tbench_SOURCES) + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am Property changes on: head/net/gnunet/files/patch-src_applications_tbench_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/gnunet/files/patch-src_applications_testbed_Makefile.in =================================================================== --- head/net/gnunet/files/patch-src_applications_testbed_Makefile.in (revision 127189) +++ head/net/gnunet/files/patch-src_applications_testbed_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/applications/testbed/Makefile.in.orig +++ src/applications/testbed/Makefile.in -@@ -84,7 +84,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -281,7 +281,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \ - $(gnunet_testbed_SOURCES) DIST_SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \ + $(gnunet_testbed_SOURCES) + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am Property changes on: head/net/gnunet/files/patch-src_applications_testbed_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/gnunet/files/patch-src_applications_tracekit_Makefile.in =================================================================== --- head/net/gnunet/files/patch-src_applications_tracekit_Makefile.in (revision 127189) +++ head/net/gnunet/files/patch-src_applications_tracekit_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/applications/tracekit/Makefile.in.orig +++ src/applications/tracekit/Makefile.in -@@ -81,7 +81,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -266,7 +266,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \ - $(gnunet_tracekit_SOURCES) DIST_SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \ + $(gnunet_tracekit_SOURCES) + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am Property changes on: head/net/gnunet/files/patch-src_applications_tracekit_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/gnunet/files/patch-src_conf_Makefile.in =================================================================== --- head/net/gnunet/files/patch-src_conf_Makefile.in (revision 127189) +++ head/net/gnunet/files/patch-src_conf_Makefile.in (revision 127190) @@ -1,14 +1,23 @@ $FreeBSD$ ---- src/conf/Makefile.in.orig Fri Oct 1 01:13:52 2004 -+++ src/conf/Makefile.in Fri Oct 1 01:18:56 2004 -@@ -184,7 +184,7 @@ +--- src/conf/Makefile.in.orig ++++ src/conf/Makefile.in +@@ -253,7 +253,7 @@ gnunet_setup_LDFLAGS = \ - $(curses_lib) + $(curses_lib) $(LTLIBINTL) gnunet_setup_LDADD = \ +@@ -319,7 +319,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ + DIST_SOURCES = $(am__gnunet_setup_SOURCES_DIST) gnunet-win-tool.c + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + SOURCES = $(gnunet_setup_SOURCES) gnunet-win-tool.c Property changes on: head/net/gnunet/files/patch-src_conf_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/net/gnunet/files/patch-src_include_gnunet__util.h =================================================================== --- head/net/gnunet/files/patch-src_include_gnunet__util.h (revision 127189) +++ head/net/gnunet/files/patch-src_include_gnunet__util.h (revision 127190) @@ -1,34 +1,25 @@ $FreeBSD$ ---- src/include/gnunet_util.h.orig Tue Aug 24 17:58:14 2004 -+++ src/include/gnunet_util.h Sat Oct 2 23:25:56 2004 -@@ -628,7 +628,7 @@ +--- src/include/gnunet_util.h.orig ++++ src/include/gnunet_util.h +@@ -637,7 +637,7 @@ * Default names of the configuration files. */ #define DEFAULT_CLIENT_CONFIG_FILE "~/.gnunet/gnunet.conf" -#define DEFAULT_DAEMON_CONFIG_FILE "/etc/gnunet.conf" +#define DEFAULT_DAEMON_CONFIG_FILE "%%PREFIX%%/etc/gnunet.conf" /* *******************API *********************** */ -@@ -1027,8 +1027,8 @@ +@@ -1053,8 +1053,8 @@ * @param ip the IP to check (in network byte order) * @return NO if the IP is not in the list, YES if it it is */ -int checkIP6Listed(const CIDR6Network * list, - const IP6addr * ip); +int checkIP6Listed(CIDR6Network * list, + IP6addr * ip); /** * Parse a network specification. The argument specifies -@@ -1041,7 +1041,7 @@ - * @param routeList a string specifying the forbidden networks - * @return the converted list, NULL if the synatx is flawed - */ --CIDR6Network * parseRoutes6(const char * routeList); -+CIDR6Network * parseRoutes6(char * routeList); - - - Property changes on: head/net/gnunet/files/patch-src_include_gnunet__util.h ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/net/gnunet/files/patch-src_server_Makefile.in =================================================================== --- head/net/gnunet/files/patch-src_server_Makefile.in (revision 127189) +++ head/net/gnunet/files/patch-src_server_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/server/Makefile.in.orig +++ src/server/Makefile.in -@@ -108,7 +108,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -362,7 +362,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(fragmentationtest_SOURCES) $(gnunet_peer_info_SOURCES) \ + DIST_SOURCES = $(fragmentationtest_SOURCES) $(gnunet_peer_info_SOURCES) \ $(gnunet_transport_check_SOURCES) $(gnunet_update_SOURCES) \ $(gnunetd_SOURCES) Property changes on: head/net/gnunet/files/patch-src_server_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/gnunet/files/patch-src_transports_udp6.c =================================================================== --- head/net/gnunet/files/patch-src_transports_udp6.c (revision 127189) +++ head/net/gnunet/files/patch-src_transports_udp6.c (revision 127190) @@ -1,21 +1,21 @@ $FreeBSD$ ---- src/transports/udp6.c.orig Fri Oct 1 01:38:25 2004 -+++ src/transports/udp6.c Fri Oct 1 01:39:15 2004 +--- src/transports/udp6.c.orig ++++ src/transports/udp6.c @@ -275,6 +275,7 @@ #endif /* quick test of the packet, if failed, repeat! */ if (size != ntohs(udp6m.size)) { + char * tmp = MALLOC(INET6_ADDRSTRLEN); LOG(LOG_WARNING, _("Packed received from %s:%d (UDP6) failed format check."), inet_ntop(AF_INET6, @@ -282,6 +283,7 @@ tmp, INET6_ADDRSTRLEN), ntohs(incoming.sin6_port)); + FREE(tmp); goto RETRY; } GNUNET_ASSERT(sizeof(struct in6_addr) == sizeof(IP6addr)); Property changes on: head/net/gnunet/files/patch-src_transports_udp6.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/net-p2p/gnunet/Makefile =================================================================== --- head/net-p2p/gnunet/Makefile (revision 127189) +++ head/net-p2p/gnunet/Makefile (revision 127190) @@ -1,138 +1,137 @@ # ex:ts=8 # Ports collection makefile for: GNUnet # Date created: Mar 23, 2002 # Whom: ijliao # # $FreeBSD$ # PORTNAME= gnunet -PORTVERSION= 0.6.5 -PORTREVISION= 1 +PORTVERSION= 0.6.6 CATEGORIES= net MASTER_SITES= http://www.ovmj.org/GNUnet/download/ \ ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= GNUnet-${PORTVERSION} MAINTAINER= krion@FreeBSD.org COMMENT= An anonymous, distributed, reputation-based network LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 USE_LIBLTDL= yes USE_BZIP2= yes USE_GETOPT_LONG= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnometarget gtk20 lthack USE_INC_LIBTOOL_VER=13 USE_OPENSSL= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" CONFIGURE_ARGS= --disable-ltdl-install --with-crypto LDFLAGS+= -L${LOCALBASE}/lib .if defined(WITH_GDBM) LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm PLIST_SUB+= WITH_GDBM="" .else CONFIGURE_ARGS+= --without-gdbm PLIST_SUB+= WITH_GDBM="@comment " .endif .if defined(WITH_MYSQL) USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql .else CONFIGURE_ARGS+= --without-mysql .endif .if defined(WITH_TDB) LIB_DEPENDS+= tdb.1:${PORTSDIR}/databases/tdb PLIST_SUB+= WITH_TDB="" .else CONFIGURE_ARGS+= --without-tdb PLIST_SUB+= WITH_TDB="@comment " .endif .if defined(WITH_BDB3) LIB_DEPENDS+= db3:${PORTSDIR}/databases/db3 CONFIGURE_ARGS+= --with-bdb=${LOCALBASE} .else CONFIGURE_ARGS+= --without-bdb .endif .if defined(WITH_SQLITE) LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3 CONFIGURE_ARGS+= --with-sqlite PLIST_SUB+= WITH_SQLITE="" .else CONFIGURE_ARGS+= --without-sqlite PLIST_SUB+= WITH_SQLITE="@comment " .endif .if defined(WITH_IPV6) PKGNAMESUFFIX= -ipv6 CONFIGURE_ARGS+= --enable-ipv6 PLIST_SUB+= WITH_IPV6="" .else PLIST_SUB+= WITH_IPV6="@comment " .endif .if defined(WITH_GUILE) LIB_DEPENDS+= guile.15:${PORTSDIR}/lang/guile CONFIGURE_ARGS+= --enable-guile MAN1+= gnunet-download-manager.1 PLIST_SUB+= WITH_GUILE="" .else CONFIGURE_ARGS+= --disable-guile PLIST_SUB+= WITH_GUILE="@comment " .endif MAN1= gnunet-chat.1 gnunet-check.1 gnunet-convert.1 \ gnunet-delete.1 gnunet-directory.1 \ gnunet-download.1 gnunet-gtk.1 gnunet-insert.1 \ gnunet-peer-info.1 gnunet-pseudonym.1 \ gnunet-search.1 gnunet-stats.1 gnunet-tbench.1 \ gnunet-testbed.1 gnunet-tracekit.1 gnunet-transport-check.1 \ gnunet-update.1 gnunetd.1 MAN5= gnunet.conf.5 pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} "You can build GNUnet with the following options:" @${ECHO_MSG} " WITH_MYSQL=yes Turn on MySQL support" @${ECHO_MSG} " WITH_TDB=yes Turn on TDB support" @${ECHO_MSG} " WITH_BDB3=yes Turn on Berkely DB library support" @${ECHO_MSG} " WITH_GDBM=yes Turn on GNU dbm support" @${ECHO_MSG} " WITH_SQLITE=yes Turn on sqlite support" @${ECHO_MSG} " WITH_IPV6=yes Turn on to enable IPv6 support" @${ECHO_MSG} "" post-patch: @${FIND} ${WRKSRC} -name configure | ${XARGS} \ ${REINPLACE_CMD} -e \ 's|-pthread [\$$]CFLAGS|${PTHREAD_CFLAGS} \$$CFLAGS|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' ${REINPLACE_CMD} -e \ 's|^#include |#include |g' \ ${WRKSRC}/src/applications/afs/module/manager.c ${REINPLACE_CMD} -e \ 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/src/include/gnunet_util.h post-install: ${INSTALL_DATA} ${WRKSRC}/contrib/gnunet.root ${PREFIX}/etc/gnunet.conf-dist .ifndef(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/contrib/gnunet.user ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR} .endif .include Property changes on: head/net-p2p/gnunet/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.45 \ No newline at end of property +1.46 \ No newline at end of property Index: head/net-p2p/gnunet/distinfo =================================================================== --- head/net-p2p/gnunet/distinfo (revision 127189) +++ head/net-p2p/gnunet/distinfo (revision 127190) @@ -1,2 +1,2 @@ -MD5 (GNUnet-0.6.5.tar.bz2) = 8bca32b55dccdb5bde7bd2b38df9df03 -SIZE (GNUnet-0.6.5.tar.bz2) = 1267839 +MD5 (GNUnet-0.6.6.tar.bz2) = 46db6a3952416f222e10d68ad31e24ed +SIZE (GNUnet-0.6.6.tar.bz2) = 1267600 Property changes on: head/net-p2p/gnunet/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.21 \ No newline at end of property +1.22 \ No newline at end of property Index: head/net-p2p/gnunet/files/patch-src_applications_afs_module_Makefile.in =================================================================== --- head/net-p2p/gnunet/files/patch-src_applications_afs_module_Makefile.in (revision 127189) +++ head/net-p2p/gnunet/files/patch-src_applications_afs_module_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/applications/afs/module/Makefile.in.orig +++ src/applications/afs/module/Makefile.in -@@ -203,7 +203,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -1031,7 +1031,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(libgnunetafs_database_bdb_la_SOURCES) \ + DIST_SOURCES = $(libgnunetafs_database_bdb_la_SOURCES) \ $(libgnunetafs_database_directory_la_SOURCES) \ $(libgnunetafs_database_gdbm_la_SOURCES) \ Property changes on: head/net-p2p/gnunet/files/patch-src_applications_afs_module_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net-p2p/gnunet/files/patch-src_applications_afs_tools_Makefile.in =================================================================== --- head/net-p2p/gnunet/files/patch-src_applications_afs_tools_Makefile.in (revision 127189) +++ head/net-p2p/gnunet/files/patch-src_applications_afs_tools_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/applications/afs/tools/Makefile.in.orig +++ src/applications/afs/tools/Makefile.in -@@ -104,7 +104,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -310,7 +310,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(gnunet_delete_SOURCES) $(gnunet_directory_SOURCES) \ + DIST_SOURCES = $(gnunet_delete_SOURCES) $(gnunet_directory_SOURCES) \ $(gnunet_download_SOURCES) $(gnunet_insert_SOURCES) \ $(gnunet_pseudonym_SOURCES) $(gnunet_search_SOURCES) Property changes on: head/net-p2p/gnunet/files/patch-src_applications_afs_tools_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net-p2p/gnunet/files/patch-src_applications_chat_Makefile.in =================================================================== --- head/net-p2p/gnunet/files/patch-src_applications_chat_Makefile.in (revision 127189) +++ head/net-p2p/gnunet/files/patch-src_applications_chat_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/applications/chat/Makefile.in.orig +++ src/applications/chat/Makefile.in -@@ -80,7 +80,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -265,7 +265,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(libgnunetchat_protocol_la_SOURCES) $(gnunet_chat_SOURCES) DIST_SOURCES = $(libgnunetchat_protocol_la_SOURCES) \ $(gnunet_chat_SOURCES) + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am Property changes on: head/net-p2p/gnunet/files/patch-src_applications_chat_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net-p2p/gnunet/files/patch-src_applications_dht_tools_Makefile.in =================================================================== --- head/net-p2p/gnunet/files/patch-src_applications_dht_tools_Makefile.in (revision 127189) +++ head/net-p2p/gnunet/files/patch-src_applications_dht_tools_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/applications/dht/tools/Makefile.in.orig +++ src/applications/dht/tools/Makefile.in -@@ -84,7 +84,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -279,7 +279,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(libgnunetdht_api_la_SOURCES) $(gnunet_dht_join_SOURCES) \ + DIST_SOURCES = $(libgnunetdht_api_la_SOURCES) $(gnunet_dht_join_SOURCES) \ $(gnunet_dht_query_SOURCES) - DIST_SOURCES = $(libgnunetdht_api_la_SOURCES) \ + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am Property changes on: head/net-p2p/gnunet/files/patch-src_applications_dht_tools_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net-p2p/gnunet/files/patch-src_applications_stats_Makefile.in =================================================================== --- head/net-p2p/gnunet/files/patch-src_applications_stats_Makefile.in (revision 127189) +++ head/net-p2p/gnunet/files/patch-src_applications_stats_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/applications/stats/Makefile.in.orig +++ src/applications/stats/Makefile.in -@@ -71,7 +71,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -240,7 +240,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(gnunet_stats_SOURCES) DIST_SOURCES = $(gnunet_stats_SOURCES) - ETAGS = etags + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + SOURCES = $(gnunet_stats_SOURCES) Property changes on: head/net-p2p/gnunet/files/patch-src_applications_stats_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net-p2p/gnunet/files/patch-src_applications_tbench_Makefile.in =================================================================== --- head/net-p2p/gnunet/files/patch-src_applications_tbench_Makefile.in (revision 127189) +++ head/net-p2p/gnunet/files/patch-src_applications_tbench_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/applications/tbench/Makefile.in.orig +++ src/applications/tbench/Makefile.in -@@ -81,7 +81,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -266,7 +266,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(libgnunettbench_protocol_la_SOURCES) \ - $(gnunet_tbench_SOURCES) DIST_SOURCES = $(libgnunettbench_protocol_la_SOURCES) \ + $(gnunet_tbench_SOURCES) + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am Property changes on: head/net-p2p/gnunet/files/patch-src_applications_tbench_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net-p2p/gnunet/files/patch-src_applications_testbed_Makefile.in =================================================================== --- head/net-p2p/gnunet/files/patch-src_applications_testbed_Makefile.in (revision 127189) +++ head/net-p2p/gnunet/files/patch-src_applications_testbed_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/applications/testbed/Makefile.in.orig +++ src/applications/testbed/Makefile.in -@@ -84,7 +84,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -281,7 +281,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \ - $(gnunet_testbed_SOURCES) DIST_SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \ + $(gnunet_testbed_SOURCES) + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am Property changes on: head/net-p2p/gnunet/files/patch-src_applications_testbed_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net-p2p/gnunet/files/patch-src_applications_tracekit_Makefile.in =================================================================== --- head/net-p2p/gnunet/files/patch-src_applications_tracekit_Makefile.in (revision 127189) +++ head/net-p2p/gnunet/files/patch-src_applications_tracekit_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/applications/tracekit/Makefile.in.orig +++ src/applications/tracekit/Makefile.in -@@ -81,7 +81,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -266,7 +266,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \ - $(gnunet_tracekit_SOURCES) DIST_SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \ + $(gnunet_tracekit_SOURCES) + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am Property changes on: head/net-p2p/gnunet/files/patch-src_applications_tracekit_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net-p2p/gnunet/files/patch-src_conf_Makefile.in =================================================================== --- head/net-p2p/gnunet/files/patch-src_conf_Makefile.in (revision 127189) +++ head/net-p2p/gnunet/files/patch-src_conf_Makefile.in (revision 127190) @@ -1,14 +1,23 @@ $FreeBSD$ ---- src/conf/Makefile.in.orig Fri Oct 1 01:13:52 2004 -+++ src/conf/Makefile.in Fri Oct 1 01:18:56 2004 -@@ -184,7 +184,7 @@ +--- src/conf/Makefile.in.orig ++++ src/conf/Makefile.in +@@ -253,7 +253,7 @@ gnunet_setup_LDFLAGS = \ - $(curses_lib) + $(curses_lib) $(LTLIBINTL) gnunet_setup_LDADD = \ +@@ -319,7 +319,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ + DIST_SOURCES = $(am__gnunet_setup_SOURCES_DIST) gnunet-win-tool.c + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am + SOURCES = $(gnunet_setup_SOURCES) gnunet-win-tool.c Property changes on: head/net-p2p/gnunet/files/patch-src_conf_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/net-p2p/gnunet/files/patch-src_include_gnunet__util.h =================================================================== --- head/net-p2p/gnunet/files/patch-src_include_gnunet__util.h (revision 127189) +++ head/net-p2p/gnunet/files/patch-src_include_gnunet__util.h (revision 127190) @@ -1,34 +1,25 @@ $FreeBSD$ ---- src/include/gnunet_util.h.orig Tue Aug 24 17:58:14 2004 -+++ src/include/gnunet_util.h Sat Oct 2 23:25:56 2004 -@@ -628,7 +628,7 @@ +--- src/include/gnunet_util.h.orig ++++ src/include/gnunet_util.h +@@ -637,7 +637,7 @@ * Default names of the configuration files. */ #define DEFAULT_CLIENT_CONFIG_FILE "~/.gnunet/gnunet.conf" -#define DEFAULT_DAEMON_CONFIG_FILE "/etc/gnunet.conf" +#define DEFAULT_DAEMON_CONFIG_FILE "%%PREFIX%%/etc/gnunet.conf" /* *******************API *********************** */ -@@ -1027,8 +1027,8 @@ +@@ -1053,8 +1053,8 @@ * @param ip the IP to check (in network byte order) * @return NO if the IP is not in the list, YES if it it is */ -int checkIP6Listed(const CIDR6Network * list, - const IP6addr * ip); +int checkIP6Listed(CIDR6Network * list, + IP6addr * ip); /** * Parse a network specification. The argument specifies -@@ -1041,7 +1041,7 @@ - * @param routeList a string specifying the forbidden networks - * @return the converted list, NULL if the synatx is flawed - */ --CIDR6Network * parseRoutes6(const char * routeList); -+CIDR6Network * parseRoutes6(char * routeList); - - - Property changes on: head/net-p2p/gnunet/files/patch-src_include_gnunet__util.h ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/net-p2p/gnunet/files/patch-src_server_Makefile.in =================================================================== --- head/net-p2p/gnunet/files/patch-src_server_Makefile.in (revision 127189) +++ head/net-p2p/gnunet/files/patch-src_server_Makefile.in (revision 127190) @@ -1,14 +1,14 @@ $FreeBSD$ --- src/server/Makefile.in.orig +++ src/server/Makefile.in -@@ -108,7 +108,7 @@ - $(AM_CFLAGS) $(CFLAGS) +@@ -362,7 +362,7 @@ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_LDFLAGS) $(LDFLAGS) $(LTLIBINTL) -o $@ - SOURCES = $(fragmentationtest_SOURCES) $(gnunet_peer_info_SOURCES) \ + DIST_SOURCES = $(fragmentationtest_SOURCES) $(gnunet_peer_info_SOURCES) \ $(gnunet_transport_check_SOURCES) $(gnunet_update_SOURCES) \ $(gnunetd_SOURCES) Property changes on: head/net-p2p/gnunet/files/patch-src_server_Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net-p2p/gnunet/files/patch-src_transports_udp6.c =================================================================== --- head/net-p2p/gnunet/files/patch-src_transports_udp6.c (revision 127189) +++ head/net-p2p/gnunet/files/patch-src_transports_udp6.c (revision 127190) @@ -1,21 +1,21 @@ $FreeBSD$ ---- src/transports/udp6.c.orig Fri Oct 1 01:38:25 2004 -+++ src/transports/udp6.c Fri Oct 1 01:39:15 2004 +--- src/transports/udp6.c.orig ++++ src/transports/udp6.c @@ -275,6 +275,7 @@ #endif /* quick test of the packet, if failed, repeat! */ if (size != ntohs(udp6m.size)) { + char * tmp = MALLOC(INET6_ADDRSTRLEN); LOG(LOG_WARNING, _("Packed received from %s:%d (UDP6) failed format check."), inet_ntop(AF_INET6, @@ -282,6 +283,7 @@ tmp, INET6_ADDRSTRLEN), ntohs(incoming.sin6_port)); + FREE(tmp); goto RETRY; } GNUNET_ASSERT(sizeof(struct in6_addr) == sizeof(IP6addr)); Property changes on: head/net-p2p/gnunet/files/patch-src_transports_udp6.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property