Date: Tue, 29 Jul 2014 01:59:17 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363285 - in head/net: despoof despoof/files dgd-lpmud dgd-lpmud/files etherboot gtic/files imapproxy/files iplog/files jwhois jwhois/files lambdamoo/files libnet10 libnet10/files libun... Message-ID: <201407290159.s6T1xH3b054756@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Tue Jul 29 01:59:16 2014 New Revision: 363285 URL: http://svnweb.freebsd.org/changeset/ports/363285 QAT: https://qat.redports.org/buildarchive/r363285/ Log: Rename net/ patch-xy patches to reflect the files they modify. Approve by: portmgr (not really, but one of these is modifying an unstaged port) Added: head/net/despoof/files/patch-Makefile - copied unchanged from r363257, head/net/despoof/files/patch-aa head/net/despoof/files/patch-despoof.c - copied unchanged from r363257, head/net/despoof/files/patch-ab head/net/dgd-lpmud/files/patch-room-south-sforst19.c - copied unchanged from r363257, head/net/dgd-lpmud/files/patch-aa head/net/gtic/files/patch-CONFIG - copied unchanged from r363257, head/net/gtic/files/patch-aa head/net/gtic/files/patch-src_areas.c - copied unchanged from r363257, head/net/gtic/files/patch-ad head/net/gtic/files/patch-src_tic.c - copied unchanged from r363257, head/net/gtic/files/patch-ab head/net/gtic/files/patch-src_toss.c - copied unchanged from r363257, head/net/gtic/files/patch-ac head/net/gtic/files/patch-src_users.c - copied unchanged from r363257, head/net/gtic/files/patch-ae head/net/gtic/files/patch-src_xmalloc.h - copied unchanged from r363257, head/net/gtic/files/patch-af head/net/imapproxy/files/patch-configfile.c - copied unchanged from r363257, head/net/imapproxy/files/patch-aa head/net/imapproxy/files/patch-database.c - copied unchanged from r363257, head/net/imapproxy/files/patch-ab head/net/imapproxy/files/patch-include_defines.h - copied unchanged from r363257, head/net/imapproxy/files/patch-ad head/net/imapproxy/files/patch-network.c_1 - copied unchanged from r363257, head/net/imapproxy/files/patch-ac head/net/imapproxy/files/patch-network.c_2 - copied unchanged from r363257, head/net/imapproxy/files/patch-ae head/net/imapproxy/files/patch-output.c - copied unchanged from r363257, head/net/imapproxy/files/patch-af head/net/iplog/files/patch-example-iplog.conf - copied unchanged from r363257, head/net/iplog/files/patch-aa head/net/iplog/files/patch-iplog.8 - copied unchanged from r363257, head/net/iplog/files/patch-ab head/net/iplog/files/patch-iplog.conf.5 - copied unchanged from r363257, head/net/iplog/files/patch-ac head/net/iplog/files/patch-src_iplog.h - copied unchanged from r363257, head/net/iplog/files/patch-ad head/net/iplog/files/patch-src_iplog_pcap.c - copied unchanged from r363257, head/net/iplog/files/patch-ae head/net/jwhois/files/patch-Makefile.in - copied unchanged from r363257, head/net/jwhois/files/patch-ac head/net/jwhois/files/patch-src_Makefile.in - copied unchanged from r363257, head/net/jwhois/files/patch-ad head/net/jwhois/files/patch-src_cache.c - copied unchanged from r363257, head/net/jwhois/files/patch-ab head/net/lambdamoo/files/patch-config.h.in - copied unchanged from r363257, head/net/lambdamoo/files/patch-aa head/net/libnet10/files/patch-include_libnet.h - copied unchanged from r363257, head/net/libnet10/files/patch-include::libnet.h head/net/libnet10/files/patch-include_libnet_libnet-functions.h - copied unchanged from r363257, head/net/libnet10/files/patch-ac head/net/libunp/files/patch-Make.defines.in - copied unchanged from r363257, head/net/libunp/files/patch-ah head/net/libunp/files/patch-Makerfile.in - copied unchanged from r363257, head/net/libunp/files/patch-aa head/net/libunp/files/patch-configure - copied unchanged from r363257, head/net/libunp/files/patch-af head/net/libunp/files/patch-icmpd_Makefile - copied unchanged from r363257, head/net/libunp/files/patch-ac head/net/libunp/files/patch-intro_Makefile - copied unchanged from r363257, head/net/libunp/files/patch-ab head/net/libunp/files/patch-lib_Makefile - copied unchanged from r363257, head/net/libunp/files/patch-ag head/net/libunp/files/patch-lib_mcast_join.c - copied unchanged from r363257, head/net/libunp/files/patch-as head/net/libunp/files/patch-lib_mcast_leave.c - copied unchanged from r363257, head/net/libunp/files/patch-ar head/net/libunp/files/patch-lib_unp.h - copied unchanged from r363257, head/net/libunp/files/patch-al head/net/libunp/files/patch-lib_unpifi.h - copied unchanged from r363257, head/net/libunp/files/patch-an head/net/libunp/files/patch-lib_unprtt.h - copied unchanged from r363257, head/net/libunp/files/patch-ao head/net/libunp/files/patch-lib_unpthread.h - copied unchanged from r363257, head/net/libunp/files/patch-ap head/net/libunp/files/patch-lib_wrappthread.c - copied unchanged from r363257, head/net/libunp/files/patch-am head/net/libunp/files/patch-lib_wrapsock_r.c - copied unchanged from r363257, head/net/libunp/files/patch-aq head/net/libunp/files/patch-libfree_Makefile - copied unchanged from r363257, head/net/libunp/files/patch-ai head/net/libunp/files/patch-libgai_Makefile - copied unchanged from r363257, head/net/libunp/files/patch-aj head/net/libunp/files/patch-libgai_unp.h - copied unchanged from r363257, head/net/libunp/files/patch-at head/net/libunp/files/patch-libroute_Makefile - copied unchanged from r363257, head/net/libunp/files/patch-ak head/net/libunp/files/patch-ping_Makefile - copied unchanged from r363257, head/net/libunp/files/patch-ad head/net/libunp/files/patch-traceroute_Makefile - copied unchanged from r363257, head/net/libunp/files/patch-ae head/net/lla/files/patch-lla - copied unchanged from r363257, head/net/lla/files/patch-aa head/net/nettest/files/patch-Makefile - copied unchanged from r363257, head/net/nettest/files/patch-aa head/net/nettest/files/patch-nettest.c - copied unchanged from r363257, head/net/nettest/files/patch-ab head/net/nettest/files/patch-nettestd.c - copied unchanged from r363257, head/net/nettest/files/patch-ac head/net/openslp/files/patch-Makefile.in - copied unchanged from r363257, head/net/openslp/files/patch-aa head/net/openslp/files/patch-configure - copied unchanged from r363257, head/net/openslp/files/patch-ac head/net/pipsecd/files/patch-Makefile - copied unchanged from r363257, head/net/pipsecd/files/patch-aa head/net/pipsecd/files/patch-README.port - copied unchanged from r363257, head/net/pipsecd/files/patch-ac head/net/pipsecd/files/patch-pipsecd.sh - copied unchanged from r363257, head/net/pipsecd/files/patch-ad head/net/pipsecd/files/patch-tunip.c - copied unchanged from r363257, head/net/pipsecd/files/patch-ab head/net/pvm/files/patch-src_host.c - copied unchanged from r363257, head/net/pvm/files/patch-ac head/net/pvm/files/patch-xep_Makefile.aimk - copied unchanged from r363257, head/net/pvm/files/patch-ab head/net/queso/files/patch-configure - copied unchanged from r363257, head/net/queso/files/patch-02 head/net/queso/files/patch-tcpip.c - copied unchanged from r363257, head/net/queso/files/patch-01 head/net/rdist6/files/patch-Makefile.local - copied unchanged from r363257, head/net/rdist6/files/patch-ad head/net/rdist6/files/patch-config_os-freebsd2.h - copied unchanged from r363257, head/net/rdist6/files/patch-ag head/net/rdist6/files/patch-src_docmd.c - copied unchanged from r363257, head/net/rdist6/files/patch-ae head/net/rdist6/files/patch-src_filesys-os.c - copied unchanged from r363257, head/net/rdist6/files/patch-aj head/net/rdist6/files/patch-src_rshrcmd.c - copied unchanged from r363257, head/net/rdist6/files/patch-ah head/net/rtptools/files/patch-rtp.h - copied unchanged from r363257, head/net/rtptools/files/patch-ab head/net/rtptools/files/patch-rtpdump.c - copied unchanged from r363257, head/net/rtptools/files/patch-ac head/net/rtptools/files/patch-rtpsend.c - copied unchanged from r363257, head/net/rtptools/files/patch-ad head/net/sbd/files/patch-Makefile - copied unchanged from r363257, head/net/sbd/files/patch-aa head/net/sntop/files/patch-Makefile - copied unchanged from r363257, head/net/sntop/files/patch-aa head/net/tcpshow/files/patch-minHdrDecode - copied unchanged from r363257, head/net/tcpshow/files/patch-01 head/net/tcpshow/files/patch-tcpshow.c - copied unchanged from r363257, head/net/tcpshow/files/patch-02 head/net/tcpview/files/patch-binary-streams - copied unchanged from r363257, head/net/tcpview/files/patch-aa head/net/tcpview/files/patch-pathfix - copied unchanged from r363257, head/net/tcpview/files/patch-ab head/net/thcrut/files/patch-Libnet-1.0.2a_configure - copied unchanged from r363257, head/net/thcrut/files/patch-ab head/net/thcrut/files/patch-configure - copied unchanged from r363257, head/net/thcrut/files/patch-aa head/net/traceroute/files/patch-Makefile - copied unchanged from r363257, head/net/traceroute/files/patch-aa head/net/trafshow3/files/patch-Makefile.in - copied unchanged from r363257, head/net/trafshow3/files/patch-af head/net/trafshow3/files/patch-color.c - copied unchanged from r363257, head/net/trafshow3/files/patch-ac head/net/trafshow3/files/patch-traffic-mask - copied unchanged from r363257, head/net/trafshow3/files/patch-ah head/net/trafshow3/files/patch-util.c - copied unchanged from r363257, head/net/trafshow3/files/patch-ag head/net/xferstats/files/patch-parselog.c - copied unchanged from r363257, head/net/xferstats/files/patch-ac head/net/xferstats/files/patch-xferstats.c - copied unchanged from r363257, head/net/xferstats/files/patch-ab head/net/xferstats/files/patch-xferstats.h - copied unchanged from r363257, head/net/xferstats/files/patch-aa Deleted: head/net/despoof/files/patch-aa head/net/despoof/files/patch-ab head/net/dgd-lpmud/files/patch-aa head/net/gtic/files/patch-aa head/net/gtic/files/patch-ab head/net/gtic/files/patch-ac head/net/gtic/files/patch-ad head/net/gtic/files/patch-ae head/net/gtic/files/patch-af head/net/imapproxy/files/patch-aa head/net/imapproxy/files/patch-ab head/net/imapproxy/files/patch-ac head/net/imapproxy/files/patch-ad head/net/imapproxy/files/patch-ae head/net/imapproxy/files/patch-af head/net/iplog/files/patch-aa head/net/iplog/files/patch-ab head/net/iplog/files/patch-ac head/net/iplog/files/patch-ad head/net/iplog/files/patch-ae head/net/jwhois/files/patch-ab head/net/jwhois/files/patch-ac head/net/jwhois/files/patch-ad head/net/lambdamoo/files/patch-aa head/net/libnet10/files/patch-ac head/net/libnet10/files/patch-include::libnet.h head/net/libunp/files/patch-aa head/net/libunp/files/patch-ab head/net/libunp/files/patch-ac head/net/libunp/files/patch-ad head/net/libunp/files/patch-ae head/net/libunp/files/patch-af head/net/libunp/files/patch-ag head/net/libunp/files/patch-ah head/net/libunp/files/patch-ai head/net/libunp/files/patch-aj head/net/libunp/files/patch-ak head/net/libunp/files/patch-al head/net/libunp/files/patch-am head/net/libunp/files/patch-an head/net/libunp/files/patch-ao head/net/libunp/files/patch-ap head/net/libunp/files/patch-aq head/net/libunp/files/patch-ar head/net/libunp/files/patch-as head/net/libunp/files/patch-at head/net/lla/files/patch-aa head/net/nettest/files/patch-aa head/net/nettest/files/patch-ab head/net/nettest/files/patch-ac head/net/openslp/files/patch-aa head/net/openslp/files/patch-ac head/net/pipsecd/files/patch-aa head/net/pipsecd/files/patch-ab head/net/pipsecd/files/patch-ac head/net/pipsecd/files/patch-ad head/net/pvm/files/patch-ab head/net/pvm/files/patch-ac head/net/queso/files/patch-01 head/net/queso/files/patch-02 head/net/rdist6/files/patch-ad head/net/rdist6/files/patch-ae head/net/rdist6/files/patch-ag head/net/rdist6/files/patch-ah head/net/rdist6/files/patch-aj head/net/rtptools/files/patch-ab head/net/rtptools/files/patch-ac head/net/rtptools/files/patch-ad head/net/sbd/files/patch-aa head/net/sntop/files/patch-aa head/net/tcpshow/files/patch-01 head/net/tcpshow/files/patch-02 head/net/tcpview/files/patch-aa head/net/tcpview/files/patch-ab head/net/thcrut/files/patch-aa head/net/thcrut/files/patch-ab head/net/traceroute/files/patch-aa head/net/trafshow3/files/patch-ac head/net/trafshow3/files/patch-af head/net/trafshow3/files/patch-ag head/net/trafshow3/files/patch-ah head/net/xferstats/files/patch-aa head/net/xferstats/files/patch-ab head/net/xferstats/files/patch-ac Modified: head/net/despoof/Makefile head/net/dgd-lpmud/Makefile head/net/etherboot/Makefile head/net/jwhois/Makefile head/net/libnet10/Makefile head/net/nettest/Makefile head/net/traceroute/Makefile Modified: head/net/despoof/Makefile ============================================================================== --- head/net/despoof/Makefile Tue Jul 29 01:37:42 2014 (r363284) +++ head/net/despoof/Makefile Tue Jul 29 01:59:16 2014 (r363285) @@ -7,7 +7,6 @@ PORTREVISION= 3 CATEGORIES= net security MASTER_SITES= ${MASTER_SITE_PACKETSTORM} MASTER_SITE_SUBDIR= UNIX/misc -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Command-line anti-spoofing detection utility @@ -15,6 +14,7 @@ COMMENT= Command-line anti-spoofing dete BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10 LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config +USES= tar:tgz OPTIONS_DEFINE= DOCS Copied: head/net/despoof/files/patch-Makefile (from r363257, head/net/despoof/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/despoof/files/patch-Makefile Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/despoof/files/patch-aa) @@ -0,0 +1,17 @@ +--- Makefile.orig Sat Sep 2 18:33:10 2000 ++++ Makefile Sat Sep 2 18:35:05 2000 +@@ -1,10 +1,10 @@ + # despoof makefile + # +-CC=gcc +-CFLAGS=-O3 ++CC?=gcc ++CFLAGS?=-O + PROG=despoof +-DEFS=`libnet-config --defines` +-LIBS=-lnet -lpcap ++DEFS=-I${LOCALBASE}/include `libnet-config --defines` ++LIBS=-L${LOCALBASE}/lib -lnet -lpcap + + default: all + Copied: head/net/despoof/files/patch-despoof.c (from r363257, head/net/despoof/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/despoof/files/patch-despoof.c Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/despoof/files/patch-ab) @@ -0,0 +1,11 @@ +--- despoof.c.orig Sat Sep 2 18:34:37 2000 ++++ despoof.c Sat Sep 2 18:34:45 2000 +@@ -150,7 +150,7 @@ + + if (targetaddr == ip->ip_src.s_addr) + { +- if (((inquery == 1) && (icmp->icmp_type == ICMP_ECHOREPLY)) || ((inquery == 2) && (icmp->icmp_type == ICMP_TIMESTAMPREPLY)) || ((inquery == 3) && (sport == ntohs(tcphdr->th_dport)))) ++ if (((inquery == 1) && (icmp->icmp_type == ICMP_ECHOREPLY)) || ((inquery == 2) && (icmp->icmp_type == ICMP_TSTAMPREPLY)) || ((inquery == 3) && (sport == ntohs(tcphdr->th_dport)))) + { + if (ttlval == ip->ip_ttl) + { Modified: head/net/dgd-lpmud/Makefile ============================================================================== --- head/net/dgd-lpmud/Makefile Tue Jul 29 01:37:42 2014 (r363284) +++ head/net/dgd-lpmud/Makefile Tue Jul 29 01:59:16 2014 (r363285) @@ -8,7 +8,6 @@ CATEGORIES= net games MASTER_SITES= ${MASTER_SITE_LOCAL:S|%SUBDIR%|glewis/dgd|} \ http://ftp.dworkin.nl/dgd/lib/ DISTNAME= 2.4.5-for-1.4 -EXTRACT_SUFX= .tgz MAINTAINER= glewis@FreeBSD.org COMMENT= LPmud mudlib, for use with DGD @@ -17,6 +16,7 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/dgd:${POR NO_PACKAGE= May not be used for monetary gain NO_CDROM= ${NO_PACKAGE} +USES= tar:tgz DIST_SUBDIR= dgd WRKSRC= ${WRKDIR}/mud @@ -28,7 +28,7 @@ post-extract: @${CP} ${FILESDIR}/Makefile.bin ${WRKSRC}/Makefile post-patch: - cd ${WRKSRC} && ${FIND} . -name '*.orig' -delete + (cd ${WRKSRC} && ${FIND} . -name '*.orig' -delete) do-configure: ${REINPLACE_CMD} -e "s:%%DATADIR%%:${DATADIR}:" ${WRKSRC}/lpmud.dgd @@ -39,8 +39,8 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/lpmud.dgd ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/ ${MKDIR} ${STAGEDIR}${DATADIR}/lpmud - cd ${WRKSRC}/2.4.5 && ${FIND} . \ - | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}/lpmud + (cd ${WRKSRC}/2.4.5 && ${FIND} . \ + | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}/lpmud) # Install an RC script for dgd-lpmud ${CAT} ${FILESDIR}/dgd-lpmud.sh | ${SED} -e "s:%%PREFIX%%:${PREFIX}:" \ -e "s:%%DATADIR%%:${DATADIR}:" > \ Copied: head/net/dgd-lpmud/files/patch-room-south-sforst19.c (from r363257, head/net/dgd-lpmud/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/dgd-lpmud/files/patch-room-south-sforst19.c Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/dgd-lpmud/files/patch-aa) @@ -0,0 +1,21 @@ +$FreeBSD$ + +*** 2.4.5/room/south/sforst19.c Sun Nov 11 21:45:36 1990 +--- 2.4.5/room/south/sforst19.c Mon Sep 12 21:57:54 1994 +*************** +*** 37,43 **** + + east() + { +! call_other(this_palyer(), "move_player", "east#room/south/sforst16"); + return 1; + } + +--- 37,43 ---- + + east() + { +! call_other(this_player(), "move_player", "east#room/south/sforst16"); + return 1; + } + Modified: head/net/etherboot/Makefile ============================================================================== --- head/net/etherboot/Makefile Tue Jul 29 01:37:42 2014 (r363284) +++ head/net/etherboot/Makefile Tue Jul 29 01:59:16 2014 (r363285) @@ -9,7 +9,7 @@ MASTER_SITES= SF http://etherboot.berlio MAINTAINER= ambrisko@FreeBSD.org COMMENT= Network boot of FreeBSD a.out/ELF kernels (improved netboot) -BROKEN= Installation is intentionnaly broken +BROKEN= Installation is intentionally broken SSP_UNSAFE= yes ONLY_FOR_ARCHS= i386 Copied: head/net/gtic/files/patch-CONFIG (from r363257, head/net/gtic/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gtic/files/patch-CONFIG Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/gtic/files/patch-aa) @@ -0,0 +1,28 @@ +--- CONFIG.orig Mon Jul 6 16:09:40 1998 ++++ CONFIG Sun Mar 5 19:42:04 2000 +@@ -2,7 +2,7 @@ + VERSION = "1.3b" + + # Main configuration file. +-CONFIG = "/etc/gtic/config" ++CONFIG = "${PREFIX}/etc/gtic/config" + + # Path to other configuration files (also see default config file). + CONFIGDIR = "/etc/gtic" +@@ -15,13 +15,13 @@ + GROUP = gtic + + # Name of C compiler. +-CC = gcc ++#CC = gcc + + # Compiler flags. +-CFLAGS=-Wall -g ++#CFLAGS=-Wall -g + + # Defines for gtic's sources use. +-DEFINES = ${OPTS} -DCONFIG=\"${CONFIG}\" -DVERSION=\"${VERSION}\" ++DEFINES += ${OPTS} -DCONFIG=\"${CONFIG}\" -DVERSION=\"${VERSION}\" + + # Compile-time options. + Copied: head/net/gtic/files/patch-src_areas.c (from r363257, head/net/gtic/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gtic/files/patch-src_areas.c Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/gtic/files/patch-ad) @@ -0,0 +1,12 @@ +--- src/areas.c.orig Sun Oct 24 20:16:14 1999 ++++ src/areas.c Sun Oct 24 20:19:15 1999 +@@ -305,9 +305,6 @@ + + /* make a backup copy of areas_file */ + strcpy(new_path,areas_file); +- if(strchr(new_path,'.')) +- strcpy(strrchr(new_path,'.'),".bak"); +- else + strcat(new_path,".bak"); + if(rename(areas_file,new_path)) + l_printf("Warning: unable to move %s to %s",areas_file,new_path); Copied: head/net/gtic/files/patch-src_tic.c (from r363257, head/net/gtic/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gtic/files/patch-src_tic.c Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/gtic/files/patch-ab) @@ -0,0 +1,11 @@ +--- src/tic.c.orig Mon Jul 6 15:39:46 1998 ++++ src/tic.c Sun Sep 12 15:38:14 1999 +@@ -227,7 +227,7 @@ + else if(!strcasecmp(buff,"ReceiptRequest")) continue; /* skip by FSC-0087 */ + else + { +- e_printf("readtic: %s(%d) - %s[%s] - keyword unknown - ignored", ++ l_printf("readtic: %s(%d) - %s[%s] - keyword unknown - ignored", + tlist->name,linecnt,buff,v); + continue; + } Copied: head/net/gtic/files/patch-src_toss.c (from r363257, head/net/gtic/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gtic/files/patch-src_toss.c Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/gtic/files/patch-ac) @@ -0,0 +1,57 @@ +--- src/toss.c.orig Mon Jul 6 16:04:30 1998 ++++ src/toss.c Sun Mar 5 18:35:41 2000 +@@ -316,11 +316,16 @@ + newtic->areadesc=xstrcpy(acur->desc); + + /* make base of outbound file name */ ++#ifndef AMIGA4D + if(utmp->addr.point!=0) + snprintf(ftmp,sizeof(ftmp)-1,"%04x%04x.pnt/%08x", + utmp->addr.net,utmp->addr.node,utmp->addr.point); + else + snprintf(ftmp,sizeof(ftmp)-1,"%04x%04x",utmp->addr.net,utmp->addr.node); ++#else ++ snprintf(ftmp,sizeof(ftmp)-1,"%d.%d.%d.%d", utmp->addr.zone, ++ utmp->addr.net, utmp->addr.node, utmp->addr.point); ++#endif /* AMIGA4D */ + + /* determine queue directory */ + strcpy(qdir,get_outbound(utmp->addr.zone)); strcat(qdir,"/"); +@@ -342,21 +347,28 @@ + outbound/xxxxyyyy.pnt[/gtic_q]/zzzzzzzz.xlo + */ + strcpy(xlo,get_outbound(utmp->addr.zone)); strcat(xlo,"/"); ++#ifndef AMIGA4D + if(utmp->addr.point!=0) + { + snprintf(ftmp,sizeof(ftmp)-1,"%04x%04x.pnt/", + utmp->addr.net,utmp->addr.node); + strcat(xlo,ftmp); + } ++#endif /* AMIGA4D */ + if(mk_bsy==FALSE) + { + strcat(xlo,"gtic_q/"); + mkdirs(xlo,dirmode(outbound_mode)); + } ++#ifndef AMIGA4D + if(newtic->to.point!=0) + snprintf(ftmp,sizeof(ftmp)-1,"%08x",newtic->to.point); + else + snprintf(ftmp,sizeof(ftmp)-1,"%04x%04x",newtic->to.net,newtic->to.node); ++#else ++ snprintf(ftmp,sizeof(ftmp)-1,"%d.%d.%d.%d", newtic->to.zone, ++ newtic->to.net, newtic->to.node, newtic->to.point); ++#endif /* AMIGA4D */ + if(utmp->flags & USER_HOLD) + strcat(ftmp,".hlo"); + else +@@ -873,7 +885,7 @@ + + if(announce_f) + { +- fprintf(announce_f,"AREA: %-15s FILE: %s\n",curarea->name,cur->file); ++ fprintf(announce_f,">AREA: %-15s FILE: %s\n",curarea->name,cur->file); + if(pub_path && pub_url && + strlen(curarea->path)>=strlen(pub_path) && + strncmp(curarea->path,pub_path,strlen(pub_path))==0) Copied: head/net/gtic/files/patch-src_users.c (from r363257, head/net/gtic/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gtic/files/patch-src_users.c Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/gtic/files/patch-ae) @@ -0,0 +1,12 @@ +--- src/users.c.orig Sun Oct 24 20:19:46 1999 ++++ src/users.c Sun Oct 24 20:20:10 1999 +@@ -125,9 +125,6 @@ + + /* make a backup copy of users_file */ + strcpy(new_path,users_file); +- if(strchr(new_path,'.')) +- strcpy(strrchr(new_path,'.'),".bak"); +- else + strcat(new_path,".bak"); + if(rename(users_file,new_path)) + l_printf("Warning: unable to move %s to %s",users_file,new_path); Copied: head/net/gtic/files/patch-src_xmalloc.h (from r363257, head/net/gtic/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gtic/files/patch-src_xmalloc.h Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/gtic/files/patch-af) @@ -0,0 +1,12 @@ +--- src/xmalloc.h.orig Sun Feb 6 10:50:42 2000 ++++ src/xmalloc.h Sun Feb 6 10:51:14 2000 +@@ -1,7 +1,9 @@ + #ifndef __XMALLOC_H + #define __XMALLOC_H + ++#if !defined(__FreeBSD__) + void *xmalloc(size_t size); ++#endif + void xfree(void *ptr); + + #endif Copied: head/net/imapproxy/files/patch-configfile.c (from r363257, head/net/imapproxy/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/imapproxy/files/patch-configfile.c Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/imapproxy/files/patch-aa) @@ -0,0 +1,10 @@ +--- configfile.c.orig Fri Aug 9 15:24:23 2002 ++++ configfile.c Mon Jul 28 11:22:34 2003 +@@ -23,6 +23,7 @@ + #include <string.h> + #include <strings.h> + #include <stdlib.h> ++#include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> Copied: head/net/imapproxy/files/patch-database.c (from r363257, head/net/imapproxy/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/imapproxy/files/patch-database.c Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/imapproxy/files/patch-ab) @@ -0,0 +1,10 @@ +--- database.c.orig Fri Aug 9 15:24:23 2002 ++++ database.c Mon Jul 28 11:22:10 2003 +@@ -24,6 +24,7 @@ + #include <stdlib.h> + #include <stdio.h> + #include <errno.h> ++#include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> Copied: head/net/imapproxy/files/patch-include_defines.h (from r363257, head/net/imapproxy/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/imapproxy/files/patch-include_defines.h Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/imapproxy/files/patch-ad) @@ -0,0 +1,11 @@ +--- include/defines.h.orig Mon Jul 28 12:41:58 2003 ++++ include/defines.h Mon Jul 28 12:42:27 2003 +@@ -45,7 +45,7 @@ + + #define DEFAULT_MAX_REUSE 0 + +-#define DEFAULT_CONFIG_FILE ".imapproxy" ++#define DEFAULT_CONFIG_FILE "/usr/local/etc/imapproxy.conf" + #define VERSION "v0.9-3" + #define PROGNAME "ImapProxy" + #define AUTHOR "Steven Van Acker <imapproxy@kuleuven.net>" Copied: head/net/imapproxy/files/patch-network.c_1 (from r363257, head/net/imapproxy/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/imapproxy/files/patch-network.c_1 Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/imapproxy/files/patch-ac) @@ -0,0 +1,13 @@ +--- network.c.orig Fri Aug 9 15:24:23 2002 ++++ network.c Mon Jul 28 11:21:26 2003 +@@ -20,9 +20,9 @@ + + + #include <stdio.h> ++#include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> +-#include <sys/types.h> + #include <string.h> + #include <netdb.h> + #include <unistd.h> Copied: head/net/imapproxy/files/patch-network.c_2 (from r363257, head/net/imapproxy/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/imapproxy/files/patch-network.c_2 Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/imapproxy/files/patch-ae) @@ -0,0 +1,11 @@ +--- network.c.orig Fri Aug 1 06:34:08 2003 ++++ network.c Fri Aug 1 06:33:23 2003 +@@ -48,7 +48,7 @@ + va_start(v, fmt); + i = vsnprintf(buf, sizeof(buf), fmt, v); + write(s, buf, i); +- va_end(fmt); ++ va_end(v); + } + + /* resolve a hostname to an IP in long notation Copied: head/net/imapproxy/files/patch-output.c (from r363257, head/net/imapproxy/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/imapproxy/files/patch-output.c Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/imapproxy/files/patch-af) @@ -0,0 +1,20 @@ +--- output.c.orig Fri Aug 1 06:34:16 2003 ++++ output.c Fri Aug 1 06:33:29 2003 +@@ -40,7 +40,7 @@ + vsnprintf(buf, sizeof(buf), fmt, v); + //fprintf(stderr,"[DEBUG %d] %s",getpid(),buf); + log(LOG_DEBUG,"[DEBUG %d] %s",getpid(),buf); +- va_end(fmt); ++ va_end(v); + } + } + +@@ -57,7 +57,7 @@ + openlog(PROGNAME, LOG_PID , config_log_facility); + syslog(config_log_facility | level, "%s", buf); + //closelog(); +- va_end(fmt); ++ va_end(v); + } + } + Copied: head/net/iplog/files/patch-example-iplog.conf (from r363257, head/net/iplog/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/iplog/files/patch-example-iplog.conf Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/iplog/files/patch-aa) @@ -0,0 +1,24 @@ +--- example-iplog.conf.orig Mon Jul 3 20:32:42 2000 ++++ example-iplog.conf Tue Jul 4 08:45:51 2000 +@@ -2,7 +2,7 @@ + ** $Id: patch-aa,v 1.3 2000/11/22 07:26:42 ust Exp $ + ** + ** Example iplog configuration file. +-** Edit me and copy me to /etc/iplog.conf ++** Edit me and copy me to %%PREFIX%%/etc/iplog.conf + ** + ** See iplog.conf(5) for details on syntax and a full description + ** of available options. +@@ -33,10 +33,10 @@ + set ignore_dns + + # Listen on eth0 and eth1 +-interface eth0,eth1 ++# interface xl0,xl1 + + # Operate in promiscuous mode and watch the 192.168.0.x network +-promisc 192.168.0.0/24 ++# promisc 192.168.0.0/24 + + /* + ** Ignore DNS traffic from nameservers. Copied: head/net/iplog/files/patch-iplog.8 (from r363257, head/net/iplog/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/iplog/files/patch-iplog.8 Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/iplog/files/patch-ab) @@ -0,0 +1,11 @@ +--- iplog.8.orig Fri Jun 30 22:31:43 2000 ++++ iplog.8 Tue Jul 4 08:05:29 2000 +@@ -355,7 +355,7 @@ + + .SH FILES + .TP +-.B /etc/iplog.conf ++.B %%PREFIX%%/etc/iplog.conf + The + .B iplog + configuration file. Copied: head/net/iplog/files/patch-iplog.conf.5 (from r363257, head/net/iplog/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/iplog/files/patch-iplog.conf.5 Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/iplog/files/patch-ac) @@ -0,0 +1,11 @@ +--- iplog.conf.5.orig Mon Jul 3 20:32:42 2000 ++++ iplog.conf.5 Tue Jul 4 08:05:47 2000 +@@ -19,7 +19,7 @@ + .SH DESCRIPTION + + Upon execution and upon being restarted, iplog reads a list of configuration rules from its configuration file. The default location of this file is +-.B /etc/iplog.conf. ++.B %%PREFIX%%/etc/iplog.conf. + + .SH NOTATION + Throughout this document, required parameters will be denoted by enclosing the parameter in angle brackets <like this>. Copied: head/net/iplog/files/patch-src_iplog.h (from r363257, head/net/iplog/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/iplog/files/patch-src_iplog.h Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/iplog/files/patch-ad) @@ -0,0 +1,11 @@ +--- src/iplog.h.orig Mon Jul 3 16:49:23 2000 ++++ src/iplog.h Tue Jul 4 08:18:35 2000 +@@ -28,7 +28,7 @@ + ** Path of the iplog configuration file. + */ + +-#define CONFFILE "/etc/iplog.conf" ++#define CONFFILE "%%PREFIX%%/etc/iplog.conf" + + /* + ** Making these smaller will probably do bad things. Copied: head/net/iplog/files/patch-src_iplog_pcap.c (from r363257, head/net/iplog/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/iplog/files/patch-src_iplog_pcap.c Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/iplog/files/patch-ae) @@ -0,0 +1,24 @@ +--- src/iplog_pcap.c.orig Mon Jan 1 17:02:14 2001 ++++ src/iplog_pcap.c Mon Aug 27 16:38:50 2001 +@@ -211,6 +211,7 @@ + u_char fstring[1024], *temp, errbuf[PCAP_ERRBUF_SIZE]; + struct bpf_program filt; + u_int i = 0; ++ int b = 1; + + pdata->pd = + pcap_open_live(pdata->name, SNAPLEN, opt_enabled(PROMISC), 0, errbuf); +@@ -229,6 +230,13 @@ + pcap_close(pdata->pd); + return (-1); + } ++ ++#ifdef __FreeBSD__ ++#include <osreldate.h> ++#if __FreeBSD_version >= 420001 ++ ioctl(pcap_fileno(pdata->pd), BIOCIMMEDIATE, &b); ++#endif ++#endif + + #ifdef __linux__ + /* Modified: head/net/jwhois/Makefile ============================================================================== --- head/net/jwhois/Makefile Tue Jul 29 01:37:42 2014 (r363284) +++ head/net/jwhois/Makefile Tue Jul 29 01:59:16 2014 (r363285) @@ -3,14 +3,13 @@ PORTNAME= jwhois PORTVERSION= 4.0 -#PORTREVISION= 0 PORTREVISION= 3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= jwhois MAINTAINER= ports@FreeBSD.org -COMMENT=AImproved WHOIS client capable of selecting server to query +COMMENT= Improved WHOIS client capable of selecting server to query LICENSE= GPLv3 @@ -21,15 +20,9 @@ LDFLAGS+= -L${PREFIX}/lib CONFIGURE_ARGS= --localstatedir=${PREFIX}/var/jwhois OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -PLIST_SUB= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB= NLS="@comment " -.endif +NLS_CONFIGURE_ENABLE= nls INSTALL_TARGET= install-strip Copied: head/net/jwhois/files/patch-Makefile.in (from r363257, head/net/jwhois/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/jwhois/files/patch-Makefile.in Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/jwhois/files/patch-ac) @@ -0,0 +1,11 @@ +--- Makefile.in.dist 2007-07-01 17:58:12.000000000 +0900 ++++ Makefile.in 2008-05-26 13:42:47.000000000 +0900 +@@ -224,7 +224,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + EXTRA_DIST = config.rpath m4/ChangeLog config.rpath include/*.h example/jwhois.conf m4/*.m4 jwhois.spec.in jwhois.spec +-SUBDIRS = m4 doc gl src example po ++SUBDIRS = m4 doc gl src po + AM_CPPFLAGS = -I$(top_srcdir)/gl + LDADD = lib/libgnu.a + ACLOCAL_AMFLAGS = -I m4 -I gl/m4 Copied: head/net/jwhois/files/patch-src_Makefile.in (from r363257, head/net/jwhois/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/jwhois/files/patch-src_Makefile.in Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/jwhois/files/patch-ad) @@ -0,0 +1,10 @@ +--- src/Makefile.in.dist 2007-07-01 17:56:14.000000000 +0900 ++++ src/Makefile.in 2008-05-26 13:46:50.000000000 +0900 +@@ -231,6 +231,7 @@ + -DLOCALEDIR="\"$(localedir)\"" + + jwhois_LDADD = $(top_srcdir)/gl/libgnu.a ++jwhois_LDFLAGS = $(LDFLAGS) $(LTLIBINTL) + AM_CFLAGS = $(jwhois_CFLAGS) + INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl -I$(top_srcdir)/gl + all: all-am Copied: head/net/jwhois/files/patch-src_cache.c (from r363257, head/net/jwhois/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/jwhois/files/patch-src_cache.c Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/jwhois/files/patch-ab) @@ -0,0 +1,11 @@ +--- src/cache.c.dist Sun Dec 19 06:46:53 1999 ++++ src/cache.c Sat Jul 15 22:52:06 2000 +@@ -119,7 +119,7 @@ + jconfig_set(); + j = jconfig_getone("jwhois", "cachefile"); + if (!j) +- cfname = LOCALSTATEDIR "/jwhois.db"; ++ cfname = LOCALSTATEDIR "/jwhois"; + else + cfname = j->value; + Copied: head/net/lambdamoo/files/patch-config.h.in (from r363257, head/net/lambdamoo/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/lambdamoo/files/patch-config.h.in Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/lambdamoo/files/patch-aa) @@ -0,0 +1,28 @@ +--- config.h.in.orig Sun Jul 4 16:45:44 1999 ++++ config.h.in Sun Jul 4 16:45:54 1999 +@@ -163,7 +163,7 @@ + * system provides the named functions. + */ + +-#undef HAVE_CRYPT ++/* #undef HAVE_CRYPT */ + #undef HAVE_MATHERR + #undef HAVE_MKFIFO + #undef HAVE_REMOVE +@@ -257,12 +257,16 @@ + #if INT_MAX == 2147483647 + typedef int int32; + typedef unsigned unsigned32; ++# ifndef INT32_MAX + # define INT32_MAX INT_MAX ++# endif + #else + # if LONG_MAX == 2147483647 + typedef long int int32; + typedef unsigned long unsigned32; ++# ifndef INT32_MAX + # define INT32_MAX LONG_MAX ++# endif + # else + # error I cannot figure out how to express a 32-bit integer on your machine. + # endif Modified: head/net/libnet10/Makefile ============================================================================== --- head/net/libnet10/Makefile Tue Jul 29 01:37:42 2014 (r363284) +++ head/net/libnet10/Makefile Tue Jul 29 01:59:16 2014 (r363285) @@ -36,17 +36,15 @@ post-patch: post-install: ${INSTALL_MAN} ${WRKSRC}/doc/libnet.3 \ ${STAGEDIR}${PREFIX}/man/man3/libnet${PKGNAMESUFFIX}.3 -.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR}/ancillary ${STAGEDIR}${DOCSDIR}/examples .for i in CHANGELOG CHANGELOG-NEWFUNCTIONS COPYING README TODO-1.0 TODO-1.1 - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} .endfor .for i in README.asn.1 README.bpf README.legacy-applications README.libnet-config README.linux README.rawsockets - ${INSTALL_DATA} ${WRKSRC}/doc/Ancillary/${i} ${STAGEDIR}${DOCSDIR}/ancillary/ + ${INSTALL_DATA} ${WRKSRC}/doc/Ancillary/${i} ${STAGEDIR}${DOCSDIR}/ancillary .endfor .for i in libnet-example-1.c libnet-example-2.c libnet-example-3.c libnet-example-4.c - ${INSTALL_DATA} ${WRKSRC}/example/${i} ${STAGEDIR}${DOCSDIR}/examples/ + ${INSTALL_DATA} ${WRKSRC}/example/${i} ${STAGEDIR}${DOCSDIR}/examples .endfor -.endif .include <bsd.port.mk> Copied: head/net/libnet10/files/patch-include_libnet.h (from r363257, head/net/libnet10/files/patch-include::libnet.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libnet10/files/patch-include_libnet.h Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libnet10/files/patch-include::libnet.h) @@ -0,0 +1,15 @@ +--- include/libnet.h.orig Fri Jul 18 15:11:05 2003 ++++ include/libnet.h Fri Jul 18 15:12:16 2003 +@@ -84,9 +84,9 @@ + #define LIBNET_VERSION "1.0.2a" + + #if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN) +-#error "byte order has not been specified, you'll +-need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the +-documentation regarding the libnet-config script." ++#error "byte order has not been specified, you'll" ++"need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the" ++"documentation regarding the libnet-config script." + #endif + + #endif /* __LIBNET_H */ Copied: head/net/libnet10/files/patch-include_libnet_libnet-functions.h (from r363257, head/net/libnet10/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libnet10/files/patch-include_libnet_libnet-functions.h Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libnet10/files/patch-ac) @@ -0,0 +1,11 @@ +--- include/libnet/libnet-functions.h.orig Fri Jun 7 00:31:29 2002 ++++ include/libnet/libnet-functions.h Fri Jun 7 00:31:41 2002 +@@ -74,7 +74,7 @@ + int, /* severity */ + char *, /* error message */ + ... /* varargs */ +- ); ++ ) __printflike(2, 3); + + + /* Copied: head/net/libunp/files/patch-Make.defines.in (from r363257, head/net/libunp/files/patch-ah) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-Make.defines.in Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-ah) @@ -0,0 +1,18 @@ +--- Make.defines.in.orig Thu Jun 12 16:20:21 1997 ++++ Make.defines.in Thu Sep 30 10:13:57 1999 +@@ -17,6 +17,7 @@ + # Following is the main library, built from all the object files + # in the lib/ and libfree/ directories. + LIBUNP_NAME = @LIBUNP_NAME@ ++LIBUNP_THREADSAFE_NAME = @LIBUNP_THREADSAFE_NAME@ + + # Following is the XTI library, built from all the object files + # in the libxti/ directory. +@@ -24,6 +25,7 @@ + + # Following are all the object files to create in the lib/ directory. + LIB_OBJS = @LIB_OBJS@ ++LIB_THREADSAFE_OBJS = @LIB_THREADSAFE_OBJS@ + + # Following are all the object files to create in the libfree/ directory. + LIBFREE_OBJS = @LIBFREE_OBJS@ Copied: head/net/libunp/files/patch-Makerfile.in (from r363257, head/net/libunp/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-Makerfile.in Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-aa) @@ -0,0 +1,18 @@ +--- Makefile.in.orig Fri Apr 11 18:42:26 1997 ++++ Makefile.in Thu Sep 30 09:51:16 1999 +@@ -1,8 +1,13 @@ + include ./Make.defines + ++SUBDIRS = lib libfree libgai libroute ++ + all: +- @echo "Nothing to make in this directory" +- @echo "Please read the README file" ++ PWD=`pwd`; \ ++ for dir in $(SUBDIRS) ; \ ++ do \ ++ cd $$PWD/$$dir && $(MAKE) && cd .. ;\ ++ done + + clean: + rm -f $(CLEANFILES) Copied: head/net/libunp/files/patch-configure (from r363257, head/net/libunp/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-configure Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-af) @@ -0,0 +1,48 @@ +--- configure.orig Thu Jul 10 11:19:39 1997 ++++ configure Thu Sep 30 12:29:28 1999 +@@ -1101,10 +1101,12 @@ + echo "$ac_t""yes" 1>&6 + LIBUNP="$HOME/libunp.a" + LIBUNP_NAME=$HOME/libunp.a ++ LIBUNP_THREADSAFE_NAME=$HOME/libunp_r.a + else + echo "$ac_t""no" 1>&6 + LIBUNP="../libunp.a" + LIBUNP_NAME=../libunp.a ++ LIBUNP_THREADSAFE_NAME=../libunp_r.a + fi + + echo $ac_n "checking for $HOME/libunpxti.a""... $ac_c" 1>&6 +@@ -4288,7 +4290,6 @@ + LIB_OBJS="$LIB_OBJS udp_connect.o" + LIB_OBJS="$LIB_OBJS udp_server.o" + LIB_OBJS="$LIB_OBJS wraplib.o" +-LIB_OBJS="$LIB_OBJS wrapsock.o" + LIB_OBJS="$LIB_OBJS wrapstdio.o" + if test "$ac_cv_header_pthread_h" = yes ; then + LIB_OBJS="$LIB_OBJS wrappthread.o" +@@ -4297,6 +4298,8 @@ + LIB_OBJS="$LIB_OBJS write_fd.o" + LIB_OBJS="$LIB_OBJS writen.o" + LIB_OBJS="$LIB_OBJS writable_timeo.o" ++LIB_THREADSAFE_OBJS="$LIB_OBJS wrapsock_r.o" ++LIB_OBJS="$LIB_OBJS wrapsock.o" + + LIBFREE_OBJS= + +@@ -4514,6 +4517,7 @@ + s%@RANLIB@%$RANLIB%g + s%@CPP@%$CPP%g + s%@LIB_OBJS@%$LIB_OBJS%g ++s%@LIB_THREADSAFE_OBJS@%$LIB_THREADSAFE_OBJS%g + s%@LIBFREE_OBJS@%$LIBFREE_OBJS%g + s%@LIBGAI_OBJS@%$LIBGAI_OBJS%g + s%@LIBROUTE_OBJS@%$LIBROUTE_OBJS%g +@@ -4522,6 +4526,7 @@ + s%@LIBUNP@%$LIBUNP%g + s%@LIBUNPXTI@%$LIBUNPXTI%g + s%@LIBUNP_NAME@%$LIBUNP_NAME%g ++s%@LIBUNP_THREADSAFE_NAME@%$LIBUNP_THREADSAFE_NAME%g + s%@LIBUNPXTI_NAME@%$LIBUNPXTI_NAME%g + + CEOF Copied: head/net/libunp/files/patch-icmpd_Makefile (from r363257, head/net/libunp/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-icmpd_Makefile Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-ac) @@ -0,0 +1,10 @@ +--- icmpd/Makefile.orig Tue Sep 28 11:40:21 1999 ++++ icmpd/Makefile Tue Sep 28 11:40:24 1999 +@@ -1,6 +1,6 @@ + include ../Make.defines + +-OBJS = icmpd.o readable_listen.o readable_conn.o readable_v4.o readable_v6.o ++OBJS = icmpd.o readable_listen.o readable_conn.o readable_v4.o + + PROGS = icmpd udpcli01 + Copied: head/net/libunp/files/patch-intro_Makefile (from r363257, head/net/libunp/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-intro_Makefile Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-ab) @@ -0,0 +1,10 @@ +--- intro/Makefile.orig Tue Sep 28 11:39:20 1999 ++++ intro/Makefile Tue Sep 28 11:39:35 1999 +@@ -2,7 +2,6 @@ + + PROGS = daytimetcpcli daytimetcpcli1 daytimetcpcli2 daytimetcpcli3 \ + daytimetcpsrv daytimetcpsrv1 daytimetcpsrv2 daytimetcpsrv3 \ +- daytimetcpcliv6 daytimetcpsrvv6 \ + byteorder + + all: ${PROGS} Copied: head/net/libunp/files/patch-lib_Makefile (from r363257, head/net/libunp/files/patch-ag) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-lib_Makefile Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-ag) @@ -0,0 +1,20 @@ +--- lib/Makefile.orig Fri Apr 11 17:38:27 1997 ++++ lib/Makefile Thu Sep 30 11:34:21 1999 +@@ -1,8 +1,16 @@ + include ../Make.defines + +-all: ${LIB_OBJS} ++CFLAGS += -I.. -I. ++ ++all: libunp.a libunp_r.a ++ ++libunp.a: ${LIB_OBJS} + ar rv ${LIBUNP_NAME} $? + ${RANLIB} ${LIBUNP_NAME} ++ ++libunp_r.a: ${LIB_THREADSAFE_OBJS} ++ ar rv ${LIBUNP_THREADSAFE_NAME} $? ++ ${RANLIB} ${LIBUNP_THREADSAFE_NAME} + + clean: + rm -f ${PROGS} ${CLEANFILES} Copied: head/net/libunp/files/patch-lib_mcast_join.c (from r363257, head/net/libunp/files/patch-as) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-lib_mcast_join.c Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-as) @@ -0,0 +1,11 @@ +--- lib/mcast_join.c- Tue Feb 8 15:12:14 2000 ++++ lib/mcast_join.c Tue Feb 8 15:12:37 2000 +@@ -56,7 +56,7 @@ + else + mreq6.ipv6mr_interface = 0; + +- return(setsockopt(sockfd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, ++ return(setsockopt(sockfd, IPPROTO_IPV6, IPV6_JOIN_GROUP, + &mreq6, sizeof(mreq6))); + } + #endif Copied: head/net/libunp/files/patch-lib_mcast_leave.c (from r363257, head/net/libunp/files/patch-ar) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-lib_mcast_leave.c Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-ar) @@ -0,0 +1,11 @@ +--- lib/mcast_leave.c- Tue Feb 8 15:10:50 2000 ++++ lib/mcast_leave.c Tue Feb 8 15:05:53 2000 +@@ -23,7 +23,7 @@ + &((struct sockaddr_in6 *) sa)->sin6_addr, + sizeof(struct in6_addr)); + mreq6.ipv6mr_interface = 0; +- return(setsockopt(sockfd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, ++ return(setsockopt(sockfd, IPPROTO_IPV6, IPV6_LEAVE_GROUP, + &mreq6, sizeof(mreq6))); + } + #endif Copied: head/net/libunp/files/patch-lib_unp.h (from r363257, head/net/libunp/files/patch-al) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-lib_unp.h Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-al) @@ -0,0 +1,20 @@ +--- lib/unp.h.orig Sun Sep 14 15:49:59 1997 ++++ lib/unp.h Thu Sep 30 11:12:55 1999 +@@ -4,7 +4,7 @@ + #ifndef __unp_h + #define __unp_h + +-#include "../config.h" /* configuration options for current OS */ ++#include <unp/config.h> /* configuration options for current OS */ + /* "../config.h" is generated by configure */ + + /* If anything changes in the following list of #includes, must change +@@ -197,7 +197,7 @@ + #define max(a,b) ((a) > (b) ? (a) : (b)) + + #ifndef HAVE_ADDRINFO_STRUCT +-# include "../lib/addrinfo.h" ++# include <unp/addrinfo.h> + #endif + + #ifndef HAVE_IF_NAMEINDEX_STRUCT Copied: head/net/libunp/files/patch-lib_unpifi.h (from r363257, head/net/libunp/files/patch-an) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-lib_unpifi.h Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-an) @@ -0,0 +1,11 @@ +--- lib/unpifi.h.orig Thu Sep 30 11:13:10 1999 ++++ lib/unpifi.h Thu Sep 30 11:13:43 1999 +@@ -4,7 +4,7 @@ + #ifndef __unp_ifi_h + #define __unp_ifi_h + +-#include "unp.h" ++#include <unp.h> + #include <net/if.h> + + #define IFI_NAME 16 /* same as IFNAMSIZ in <net/if.h> */ Copied: head/net/libunp/files/patch-lib_unprtt.h (from r363257, head/net/libunp/files/patch-ao) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-lib_unprtt.h Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-ao) @@ -0,0 +1,11 @@ +--- lib/unprtt.h.orig Thu Sep 30 11:13:16 1999 ++++ lib/unprtt.h Thu Sep 30 11:13:37 1999 +@@ -1,7 +1,7 @@ + #ifndef __unp_rtt_h + #define __unp_rtt_h + +-#include "unp.h" ++#include <unp.h> + + struct rtt_info { + float rtt_rtt; /* most recent measured RTT, seconds */ Copied: head/net/libunp/files/patch-lib_unpthread.h (from r363257, head/net/libunp/files/patch-ap) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-lib_unpthread.h Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-ap) @@ -0,0 +1,11 @@ +--- lib/unpthread.h.orig Thu Sep 30 11:13:20 1999 ++++ lib/unpthread.h Thu Sep 30 11:13:41 1999 +@@ -4,7 +4,7 @@ + #ifndef __unp_pthread_h + #define __unp_pthread_h + +-#include "unp.h" ++#include <unp.h> + + void Pthread_create(pthread_t *, const pthread_attr_t *, + void * (*)(void *), void *); Copied: head/net/libunp/files/patch-lib_wrappthread.c (from r363257, head/net/libunp/files/patch-am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-lib_wrappthread.c Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-am) @@ -0,0 +1,20 @@ +--- lib/wrappthread.c.orig Thu Sep 30 11:06:22 1999 ++++ lib/wrappthread.c Thu Sep 30 11:06:34 1999 +@@ -40,17 +40,6 @@ + } + + void +-Pthread_kill(pthread_t tid, int signo) +-{ +- int n; +- +- if ( (n = pthread_kill(tid, signo)) == 0) +- return; +- errno = n; +- err_sys("pthread_kill error"); +-} +- +-void + Pthread_mutexattr_init(pthread_mutexattr_t *attr) + { + int n; Copied: head/net/libunp/files/patch-lib_wrapsock_r.c (from r363257, head/net/libunp/files/patch-aq) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-lib_wrapsock_r.c Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-aq) @@ -0,0 +1,22 @@ +--- lib/wrapsock_r.c.orig Thu Sep 30 12:04:02 1999 ++++ lib/wrapsock_r.c Thu Sep 30 12:04:10 1999 +@@ -97,19 +97,6 @@ + } + /* end Listen */ + +-#ifdef HAVE_POLL +-int +-Poll(struct pollfd *fdarray, unsigned long nfds, int timeout) +-{ +- int n; +- +- if ( (n = poll(fdarray, nfds, timeout)) < 0) +- err_sys("poll error"); +- +- return(n); +-} +-#endif +- + ssize_t + Recv(int fd, void *ptr, size_t nbytes, int flags) + { Copied: head/net/libunp/files/patch-libfree_Makefile (from r363257, head/net/libunp/files/patch-ai) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-libfree_Makefile Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-ai) @@ -0,0 +1,15 @@ +--- libfree/Makefile.orig Fri Oct 3 12:52:41 1997 ++++ libfree/Makefile Thu Sep 30 11:34:21 1999 +@@ -1,8 +1,12 @@ + include ../Make.defines + ++CFLAGS += -I.. ++ + all: ${LIBFREE_OBJS} + ar rv ${LIBUNP_NAME} $? + ${RANLIB} ${LIBUNP_NAME} ++ ar rv ${LIBUNP_THREADSAFE_NAME} $? ++ ${RANLIB} ${LIBUNP_THREADSAFE_NAME} + + clean: + rm -f ${PROGS} ${CLEANFILES} Copied: head/net/libunp/files/patch-libgai_Makefile (from r363257, head/net/libunp/files/patch-aj) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-libgai_Makefile Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-aj) @@ -0,0 +1,16 @@ +--- libgai/Makefile.orig Mon Jun 2 18:03:30 1997 ++++ libgai/Makefile Thu Sep 30 11:34:11 1999 +@@ -6,9 +6,13 @@ + # appear in the book (too much clutter, given the amount of conditional + # testing for all the code in this directory). + ++CFLAGS += -I.. ++ + all: ${LIBGAI_OBJS} + ar rv ${LIBUNP_NAME} $? + ${RANLIB} ${LIBUNP_NAME} ++ ar rv ${LIBUNP_THREADSAFE_NAME} $? ++ ${RANLIB} ${LIBUNP_THREADSAFE_NAME} + + PROGS = testga test1 + Copied: head/net/libunp/files/patch-libgai_unp.h (from r363257, head/net/libunp/files/patch-at) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-libgai_unp.h Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-at) @@ -0,0 +1,18 @@ +Index: libgai/unp.h +diff -u libgai/unp.h.orig libgai/unp.h +--- libgai/unp.h.orig Mon Sep 15 04:49:59 1997 ++++ libgai/unp.h Thu Oct 30 00:31:12 2003 +@@ -58,6 +58,13 @@ + # include <pthread.h> + #endif + ++#ifndef EAI_ADDRFAMILY ++#define EAI_ADDRFAMILY 1 ++#endif ++#ifndef EAI_NODATA ++#define EAI_NODATA 7 ++#endif ++ + /* OSF/1 actually disables recv() and send() in <sys/socket.h> */ + #ifdef __osf__ + #undef recv Copied: head/net/libunp/files/patch-libroute_Makefile (from r363257, head/net/libunp/files/patch-ak) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-libroute_Makefile Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-ak) @@ -0,0 +1,15 @@ +--- libroute/Makefile.orig Thu Jun 12 16:16:47 1997 ++++ libroute/Makefile Thu Sep 30 11:34:21 1999 +@@ -1,8 +1,12 @@ + include ../Make.defines + ++CFLAGS += -I.. ++ + all: ${LIBROUTE_OBJS} + ar rv ${LIBUNP_NAME} $? + ${RANLIB} ${LIBUNP_NAME} ++ ar rv ${LIBUNP_THREADSAFE_NAME} $? ++ ${RANLIB} ${LIBUNP_THREADSAFE_NAME} + + clean: + rm -f ${PROGS} ${CLEANFILES} Copied: head/net/libunp/files/patch-ping_Makefile (from r363257, head/net/libunp/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libunp/files/patch-ping_Makefile Tue Jul 29 01:59:16 2014 (r363285, copy of r363257, head/net/libunp/files/patch-ad) @@ -0,0 +1,12 @@ +--- ping/Makefile.orig Tue Sep 28 11:40:42 1999 ++++ ping/Makefile Tue Sep 28 11:40:53 1999 +@@ -1,7 +1,7 @@ + include ../Make.defines + +-OBJS = main.o proc_v4.o proc_v6.o readloop.o \ +- send_v4.o send_v6.o sig_alrm.o tv_sub.o ++OBJS = main.o proc_v4.o readloop.o \ ++ send_v4.o sig_alrm.o tv_sub.o + PROGS = ping + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407290159.s6T1xH3b054756>