Date: Mon, 4 Oct 2004 11:47:17 +0200 (CEST) From: Janos Mohacsi <janos.mohacsi@niif.hu> To: FreeBSD-gnats-submit@FreeBSD.org Cc: krion@FreeBSD.org Subject: ports/72299: [PATCH] net/gnunet-ipv6: [SUMMARIZE CHANGES] Message-ID: <200410040947.i949lH6O066405@skye.ki.iif.hu> Resent-Message-ID: <200410040950.i949oMvs024006@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 72299
>Category: ports
>Synopsis: [PATCH] net/gnunet-ipv6: [SUMMARIZE CHANGES]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 04 09:50:22 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Janos Mohacsi
>Release: FreeBSD 4.10-STABLE i386
>Organization:
NIIF/HUNGARNET
>Environment:
System: FreeBSD skye.ki.iif.hu 4.10-STABLE FreeBSD 4.10-STABLE #8: Fri Sep 17 11:34:29 CEST 2004
>Description:
[DESCRIBE CHANGES]
Compile again
Installs sample gnunet-conf
Installs some documentation
Added file(s):
- files/patch-src_applications_afs_module_Makefile.in
- files/patch-src_applications_afs_tools_Makefile.in
- files/patch-src_applications_chat_Makefile.in
- files/patch-src_applications_dht_tools_Makefile.in
- files/patch-src_applications_stats_Makefile.in
- files/patch-src_applications_tbench_Makefile.in
- files/patch-src_applications_testbed_Makefile.in
- files/patch-src_applications_tracekit_Makefile.in
- files/patch-src_conf_Makefile.in
- files/patch-src_include_gnunet__util.h
- files/patch-src_server_Makefile.in
- files/patch-src_transports_udp6.c
Port maintainer (krion@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
Apply, test, commit :)
>Fix:
--- gnunet-ipv6-0.6.4.patch begins here ---
diff -ruN --exclude=CVS /mirror/ports/net/gnunet.orig/Makefile /mirror/ports/net/gnunet/Makefile
--- /mirror/ports/net/gnunet.orig/Makefile Tue Aug 31 14:23:49 2004
+++ /mirror/ports/net/gnunet/Makefile Mon Oct 4 11:40:29 2004
@@ -3,7 +3,7 @@
# Date created: Mar 23, 2002
# Whom: ijliao
#
-# $FreeBSD: ports/net/gnunet/Makefile,v 1.40 2004/08/29 17:29:51 krion Exp $
+# $FreeBSD: ports/net/gnunet/Makefile,v 1.41 2004/09/18 17:30:48 kris Exp $
#
PORTNAME= gnunet
@@ -33,7 +33,7 @@
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
-CONFIGURE_ARGS= --disable-ltdl-install
+CONFIGURE_ARGS= --disable-ltdl-install --with-crypto
LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITH_GDBM)
@@ -101,5 +101,17 @@
${REINPLACE_CMD} -e \
's|^#include <values.h>|#include <limits.h>|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 <bsd.port.mk>
diff -ruN --exclude=CVS /mirror/ports/net/gnunet.orig/files/patch-src_applications_afs_module_Makefile.in /mirror/ports/net/gnunet/files/patch-src_applications_afs_module_Makefile.in
--- /mirror/ports/net/gnunet.orig/files/patch-src_applications_afs_module_Makefile.in Thu Jan 1 01:00:00 1970
+++ /mirror/ports/net/gnunet/files/patch-src_applications_afs_module_Makefile.in Mon Oct 4 11:40:29 2004
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/applications/afs/module/Makefile.in.orig Fri Oct 1 01:42:15 2004
++++ src/applications/afs/module/Makefile.in Fri Oct 1 01:44:57 2004
+@@ -713,7 +713,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 $@
+ CFLAGS = @CFLAGS@
+ DIST_SOURCES = $(libgnunetafs_database_bdb_la_SOURCES) \
+ $(libgnunetafs_database_directory_la_SOURCES) \
diff -ruN --exclude=CVS /mirror/ports/net/gnunet.orig/files/patch-src_applications_afs_tools_Makefile.in /mirror/ports/net/gnunet/files/patch-src_applications_afs_tools_Makefile.in
--- /mirror/ports/net/gnunet.orig/files/patch-src_applications_afs_tools_Makefile.in Thu Jan 1 01:00:00 1970
+++ /mirror/ports/net/gnunet/files/patch-src_applications_afs_tools_Makefile.in Mon Oct 4 11:40:29 2004
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/applications/afs/tools/Makefile.in.orig Fri Oct 1 01:56:26 2004
++++ src/applications/afs/tools/Makefile.in Fri Oct 1 01:57:39 2004
+@@ -241,7 +241,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 $@
+ CFLAGS = @CFLAGS@
+ DIST_SOURCES = $(gnunet_delete_SOURCES) $(gnunet_directory_SOURCES) \
+ $(gnunet_download_SOURCES) $(gnunet_insert_SOURCES) \
diff -ruN --exclude=CVS /mirror/ports/net/gnunet.orig/files/patch-src_applications_chat_Makefile.in /mirror/ports/net/gnunet/files/patch-src_applications_chat_Makefile.in
--- /mirror/ports/net/gnunet.orig/files/patch-src_applications_chat_Makefile.in Thu Jan 1 01:00:00 1970
+++ /mirror/ports/net/gnunet/files/patch-src_applications_chat_Makefile.in Mon Oct 4 11:40:29 2004
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/applications/chat/Makefile.in.orig Sat Oct 2 17:15:45 2004
++++ src/applications/chat/Makefile.in Sat Oct 2 17:16:11 2004
+@@ -196,7 +196,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 $@
+ CFLAGS = @CFLAGS@
+ DIST_SOURCES = $(libgnunetchat_protocol_la_SOURCES) \
+ $(gnunet_chat_SOURCES)
diff -ruN --exclude=CVS /mirror/ports/net/gnunet.orig/files/patch-src_applications_dht_tools_Makefile.in /mirror/ports/net/gnunet/files/patch-src_applications_dht_tools_Makefile.in
--- /mirror/ports/net/gnunet.orig/files/patch-src_applications_dht_tools_Makefile.in Thu Jan 1 01:00:00 1970
+++ /mirror/ports/net/gnunet/files/patch-src_applications_dht_tools_Makefile.in Mon Oct 4 11:40:29 2004
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/applications/dht/tools/Makefile.in.orig Sat Oct 2 17:57:30 2004
++++ src/applications/dht/tools/Makefile.in Sat Oct 2 17:57:54 2004
+@@ -210,7 +210,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 $@
+ CFLAGS = @CFLAGS@
+ DIST_SOURCES = $(libgnunetdht_api_la_SOURCES) $(gnunet_dht_join_SOURCES) \
+ $(gnunet_dht_query_SOURCES)
diff -ruN --exclude=CVS /mirror/ports/net/gnunet.orig/files/patch-src_applications_stats_Makefile.in /mirror/ports/net/gnunet/files/patch-src_applications_stats_Makefile.in
--- /mirror/ports/net/gnunet.orig/files/patch-src_applications_stats_Makefile.in Thu Jan 1 01:00:00 1970
+++ /mirror/ports/net/gnunet/files/patch-src_applications_stats_Makefile.in Mon Oct 4 11:40:29 2004
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/applications/stats/Makefile.in.orig Sat Oct 2 17:02:35 2004
++++ src/applications/stats/Makefile.in Sat Oct 2 17:03:46 2004
+@@ -171,7 +171,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 $@
+ CFLAGS = @CFLAGS@
+ DIST_SOURCES = $(gnunet_stats_SOURCES)
+ DIST_COMMON = Makefile.am Makefile.in
diff -ruN --exclude=CVS /mirror/ports/net/gnunet.orig/files/patch-src_applications_tbench_Makefile.in /mirror/ports/net/gnunet/files/patch-src_applications_tbench_Makefile.in
--- /mirror/ports/net/gnunet.orig/files/patch-src_applications_tbench_Makefile.in Thu Jan 1 01:00:00 1970
+++ /mirror/ports/net/gnunet/files/patch-src_applications_tbench_Makefile.in Mon Oct 4 11:40:29 2004
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/applications/tbench/Makefile.in.orig Sat Oct 2 17:25:58 2004
++++ src/applications/tbench/Makefile.in Sat Oct 2 17:26:29 2004
+@@ -197,7 +197,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 $@
+ CFLAGS = @CFLAGS@
+ DIST_SOURCES = $(libgnunettbench_protocol_la_SOURCES) \
+ $(gnunet_tbench_SOURCES)
diff -ruN --exclude=CVS /mirror/ports/net/gnunet.orig/files/patch-src_applications_testbed_Makefile.in /mirror/ports/net/gnunet/files/patch-src_applications_testbed_Makefile.in
--- /mirror/ports/net/gnunet.orig/files/patch-src_applications_testbed_Makefile.in Thu Jan 1 01:00:00 1970
+++ /mirror/ports/net/gnunet/files/patch-src_applications_testbed_Makefile.in Mon Oct 4 11:40:29 2004
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/applications/testbed/Makefile.in.orig Sat Oct 2 17:35:28 2004
++++ src/applications/testbed/Makefile.in Sat Oct 2 17:35:49 2004
+@@ -212,7 +212,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 $@
+ CFLAGS = @CFLAGS@
+ DIST_SOURCES = $(libgnunettestbed_protocol_la_SOURCES) \
+ $(gnunet_testbed_SOURCES)
diff -ruN --exclude=CVS /mirror/ports/net/gnunet.orig/files/patch-src_applications_tracekit_Makefile.in /mirror/ports/net/gnunet/files/patch-src_applications_tracekit_Makefile.in
--- /mirror/ports/net/gnunet.orig/files/patch-src_applications_tracekit_Makefile.in Thu Jan 1 01:00:00 1970
+++ /mirror/ports/net/gnunet/files/patch-src_applications_tracekit_Makefile.in Mon Oct 4 11:40:29 2004
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/applications/tracekit/Makefile.in.orig Sat Oct 2 17:46:14 2004
++++ src/applications/tracekit/Makefile.in Sat Oct 2 17:46:50 2004
+@@ -197,7 +197,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 $@
+ CFLAGS = @CFLAGS@
+ DIST_SOURCES = $(libgnunettracekit_protocol_la_SOURCES) \
+ $(gnunet_tracekit_SOURCES)
diff -ruN --exclude=CVS /mirror/ports/net/gnunet.orig/files/patch-src_conf_Makefile.in /mirror/ports/net/gnunet/files/patch-src_conf_Makefile.in
--- /mirror/ports/net/gnunet.orig/files/patch-src_conf_Makefile.in Thu Jan 1 01:00:00 1970
+++ /mirror/ports/net/gnunet/files/patch-src_conf_Makefile.in Mon Oct 4 11:40:29 2004
@@ -0,0 +1,14 @@
+
+$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 @@
+
+
+ gnunet_setup_LDFLAGS = \
+- $(curses_lib)
++ $(curses_lib) $(LTLIBINTL)
+
+
+ gnunet_setup_LDADD = \
diff -ruN --exclude=CVS /mirror/ports/net/gnunet.orig/files/patch-src_include_gnunet__util.h /mirror/ports/net/gnunet/files/patch-src_include_gnunet__util.h
--- /mirror/ports/net/gnunet.orig/files/patch-src_include_gnunet__util.h Thu Jan 1 01:00:00 1970
+++ /mirror/ports/net/gnunet/files/patch-src_include_gnunet__util.h Mon Oct 4 11:40:29 2004
@@ -0,0 +1,34 @@
+
+$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 @@
+ * 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 @@
+ * @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);
+
+
+
diff -ruN --exclude=CVS /mirror/ports/net/gnunet.orig/files/patch-src_server_Makefile.in /mirror/ports/net/gnunet/files/patch-src_server_Makefile.in
--- /mirror/ports/net/gnunet.orig/files/patch-src_server_Makefile.in Thu Jan 1 01:00:00 1970
+++ /mirror/ports/net/gnunet/files/patch-src_server_Makefile.in Mon Oct 4 11:40:29 2004
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/server/Makefile.in.orig Sat Oct 2 22:42:44 2004
++++ src/server/Makefile.in Sat Oct 2 22:43:53 2004
+@@ -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 $@
+ CFLAGS = @CFLAGS@
+ DIST_SOURCES = $(gnunet_peer_info_SOURCES) \
+ $(gnunet_transport_check_SOURCES) $(gnunet_update_SOURCES) \
diff -ruN --exclude=CVS /mirror/ports/net/gnunet.orig/files/patch-src_transports_udp6.c /mirror/ports/net/gnunet/files/patch-src_transports_udp6.c
--- /mirror/ports/net/gnunet.orig/files/patch-src_transports_udp6.c Thu Jan 1 01:00:00 1970
+++ /mirror/ports/net/gnunet/files/patch-src_transports_udp6.c Mon Oct 4 11:40:29 2004
@@ -0,0 +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
+@@ -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));
diff -ruN --exclude=CVS /mirror/ports/net/gnunet.orig/pkg-plist /mirror/ports/net/gnunet/pkg-plist
--- /mirror/ports/net/gnunet.orig/pkg-plist Tue Aug 31 14:23:49 2004
+++ /mirror/ports/net/gnunet/pkg-plist Mon Oct 4 11:40:29 2004
@@ -19,6 +19,7 @@
bin/gnunet-transport-check
bin/gnunet-update
bin/gnunetd
+etc/gnunet.conf-dist
include/gnunet_afs_esed2.h
include/gnunet_core.h
include/gnunet_dht.h
@@ -65,3 +66,7 @@
%%WITH_IPV6%%lib/libgnunettransport_tcp6.so
%%WITH_IPV6%%lib/libgnunettransport_udp6.so
@dirrm share/GNUnet
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/gnunet.user
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- gnunet-ipv6-0.6.4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410040947.i949lH6O066405>