head 1.7; access; symbols pkgsrc-2026Q1:1.7.0.130 pkgsrc-2026Q1-base:1.7 pkgsrc-2025Q4:1.7.0.128 pkgsrc-2025Q4-base:1.7 pkgsrc-2025Q3:1.7.0.126 pkgsrc-2025Q3-base:1.7 pkgsrc-2025Q2:1.7.0.124 pkgsrc-2025Q2-base:1.7 pkgsrc-2025Q1:1.7.0.122 pkgsrc-2025Q1-base:1.7 pkgsrc-2024Q4:1.7.0.120 pkgsrc-2024Q4-base:1.7 pkgsrc-2024Q3:1.7.0.118 pkgsrc-2024Q3-base:1.7 pkgsrc-2024Q2:1.7.0.116 pkgsrc-2024Q2-base:1.7 pkgsrc-2024Q1:1.7.0.114 pkgsrc-2024Q1-base:1.7 pkgsrc-2023Q4:1.7.0.112 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.110 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.108 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.106 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.7.0.104 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.7.0.102 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.7.0.100 pkgsrc-2022Q2-base:1.7 pkgsrc-2022Q1:1.7.0.98 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.96 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.94 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.92 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.90 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.88 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.86 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.82 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.62 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.84 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.80 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.78 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.76 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.74 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.72 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.70 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.68 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.66 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.64 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.60 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.58 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.56 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.54 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.52 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.50 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.48 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.46 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.44 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.42 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.40 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.7.0.38 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.7.0.36 pkgsrc-2014Q2-base:1.7 pkgsrc-2014Q1:1.7.0.34 pkgsrc-2014Q1-base:1.7 pkgsrc-2013Q4:1.7.0.32 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.30 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.28 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.26 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.24 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.22 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.20 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.18 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.16 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.14 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.12 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.10 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.8 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.6 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.4 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.2 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.6.0.38 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.36 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.34 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.32 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.30 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.28 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.26 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.24 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.22 pkgsrc-2008Q1:1.6.0.20 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.18 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.16 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.14 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.12 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.10 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.8 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.6 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.4 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.2 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.5.0.24 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.22 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.20 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.18 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.16 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.14 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.12 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.10 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.5.0.6 netbsd-1-6-1-base:1.5 netbsd-1-6:1.5.0.8 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.5.0.4 pkgviews-base:1.5 buildlink2:1.5.0.2 buildlink2-base:1.5 netbsd-1-5-PATCH003:1.5 netbsd-1-5-PATCH001:1.5 netbsd-1-5-RELEASE:1.5 netbsd-1-4-PATCH003:1.5 netbsd-1-4-PATCH002:1.5 comdex-fall-1999:1.5 netbsd-1-4-PATCH001:1.4 netbsd-1-4-RELEASE:1.4 netbsd-1-3-PATCH003:1.3 netbsd-1-3-PATCH002:1.2 FreeBSD-current-1998-02-22:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.7 date 2010.02.04.20.58.45; author heinz; state Exp; branches; next 1.6; 1.6 date 2005.10.04.16.08.40; author tron; state Exp; branches; next 1.5; 1.5 date 99.09.17.18.23.55; author tron; state Exp; branches; next 1.4; 1.4 date 99.02.02.23.00.40; author tron; state Exp; branches; next 1.3; 1.3 date 98.08.07.11.14.09; author agc; state Exp; branches; next 1.2; 1.2 date 98.02.24.00.44.25; author tron; state Exp; branches; next 1.1; 1.1 date 98.02.24.00.20.30; author tron; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 98.02.24.00.20.30; author tron; state Exp; branches; next ; desc @@ 1.7 log @Added support for installation to DESTDIR and LICENSE information. @ text @$NetBSD: patch-aa,v 1.6 2005/10/04 16:08:40 tron Exp $ --- Makefile.orig 1992-09-10 14:59:31.000000000 +0000 +++ Makefile @@@@ -8,10 +8,10 @@@@ ### socket.1 in /usr/local/man/man1/socket.1 ### Make sure the target directories exist before doing a "make install". -INSTALLBASE = /usr/local +INSTALLBASE = ${PREFIX} INSTALLBINPATH = $(INSTALLBASE)/bin INSTALLBINMODE = 755 -INSTALLMANPATH = $(INSTALLBASE)/man +INSTALLMANPATH = $(INSTALLBASE)/$(PKGMANDIR) INSTALLMANMODE = 444 CC = cc CFLAGS = $(SWITCHES) -O @@@@ -81,27 +81,25 @@@@ TAGS: $(PROGSOURCES) $(HEADERS) installtargets: $(INSTALLBINPATH)/$(TARGET) installmanuals $(INSTALLBINPATH)/$(TARGET): $(TARGET) - @@-echo "installing $(TARGET) in $(INSTALLBINPATH)"; \ - if [ -f $(INSTALLBINPATH)/$(TARGET) ] && \ - [ ! -w $(INSTALLBINPATH)/$(TARGET) ]; \ + @@-echo "installing $(TARGET) in $(DESTDIR)$(INSTALLBINPATH)"; \ + if [ -f $(DESTDIR)$(INSTALLBINPATH)/$(TARGET) ] && \ + [ ! -w $(DESTDIR)$(INSTALLBINPATH)/$(TARGET) ]; \ then \ - chmod u+w $(INSTALLBINPATH)/$(TARGET); \ + chmod u+w $(DESTDIR)$(INSTALLBINPATH)/$(TARGET); \ fi; \ - cp $(TARGET) $(INSTALLBINPATH)/$(TARGET); \ - chmod $(INSTALLBINMODE) $(INSTALLBINPATH)/$(TARGET); + $(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(INSTALLBINPATH)/$(TARGET) installmanuals: $(MANUALS) @@-_manuals="$(MAN1)"; \ for i in $$_manuals; \ do \ - echo "installing $$i in $(INSTALLMANPATH)/man1"; \ - if [ -f $(INSTALLMANPATH)/man1/$$i ] && \ - [ ! -w $(INSTALLMANPATH)/man1/$$i ]; \ + echo "installing $$i in $(DESTDIR)$(INSTALLMANPATH)/man1"; \ + if [ -f $(DESTDIR)$(INSTALLMANPATH)/man1/$$i ] && \ + [ ! -w $(DESTDIR)$(INSTALLMANPATH)/man1/$$i ]; \ then \ - chmod u+w $(INSTALLMANPATH)/man1/$$i; \ + chmod u+w $(DESTDIR)$(INSTALLMANPATH)/man1/$$i; \ fi; \ - cp $$i $(INSTALLMANPATH)/man1/$$i; \ - chmod $(INSTALLMANMODE) $(INSTALLMANPATH)/man1/$$i; \ + $(BSD_INSTALL_MAN) $$i $(DESTDIR)$(INSTALLMANPATH)/man1/$$i; \ done doclean: @@@@ -117,7 +115,7 @@@@ install: +install $(ALLTARGETS) clean: +clean $(ALLTARGETS) +all: - @@-if [ -n "$(ALLTARGETS)" ]; \ + @@if [ -n "$(ALLTARGETS)" ]; \ then : ; \ else \ $(MAKE) ALLTARGETS="subsystems targets" MAINTARGET=all \ @@@@ -137,7 +135,7 @@@@ clean: +clean $(ALLTARGETS) fi +install: - @@-if [ -n "$(ALLTARGETS)" ]; \ + @@if [ -n "$(ALLTARGETS)" ]; \ then : ; \ else \ $(MAKE) ALLTARGETS="subsystems installtargets" \ @@@@ -158,7 +156,7 @@@@ clean: +clean $(ALLTARGETS) fi +clean: - @@-if [ -n "$(ALLTARGETS)" ]; \ + @@if [ -n "$(ALLTARGETS)" ]; \ then : ; \ else \ $(MAKE) ALLTARGETS="subsystems doclean" MAINTARGET=clean \ @ 1.6 log @Fix brokeness in the include "Makefile" which continues the build even if compilation fails. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- Makefile.orig 1992-09-10 15:59:31.000000000 +0100 +++ Makefile 2005-10-04 17:07:16.000000000 +0100 @@@@ -8,7 +8,7 @@@@ d13 44 a56 2 INSTALLMANPATH = $(INSTALLBASE)/man @@@@ -117,7 +117,7 @@@@ d65 1 a65 1 @@@@ -137,7 +137,7 @@@@ d74 1 a74 1 @@@@ -158,7 +158,7 @@@@ @ 1.5 log @Add IPv6 support supplied by Feico Dillema in PR pkg/8413. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 1999/02/02 23:00:40 tron Exp $ d3 2 a4 2 --- Makefile.orig Thu Sep 10 16:59:31 1992 +++ Makefile Tue Feb 2 23:52:02 1999 d14 27 @ 1.4 log @Split patches into seperate files and fix compiler warning. @ text @d1 1 a1 1 $NetBSD$ a13 10 @@@@ -43,7 +43,8 @@@@ ### CDC 4680 EP/IX: (I know it *has* setsid(2), but not with bsd43) # SWITCHES = -systype bsd43 -DNOSETSID - +# FreeBSD 2.x (4.4BSD) +SWITCHES=-DHAVE_SYS_PARAM_H -Wall ### It should not be necessary to change anything below this line. ################################################################## @ 1.3 log @Add NetBSD RCS Ids. @ text @d4 1 a4 1 +++ Makefile Tue Feb 24 01:36:50 1998 a23 206 --- README.orig Wed Sep 9 16:45:16 1992 +++ README Wed Aug 14 16:57:58 1996 @@@@ -166,4 +166,4 @@@@ 1000 Berlin 10 Germany - +Juergen Nickelsen --- globals.h.orig Sun Aug 30 21:04:27 1992 +++ globals.h Wed Aug 14 16:57:58 1996 @@@@ -8,6 +8,11 @@@@ */ #include "patchlevel.h" + +#if HAVE_SYS_PARAM_H +# include +#endif + /* globals for socket */ @@@@ -49,4 +54,7 @@@@ extern int crlfflag ; extern int active_socket ; extern char *progname ; -extern char *sys_errlist[], *sys_siglist[] ; + +#if !(defined(BSD) && (BSD >=199306)) + extern char *sys_errlist[], *sys_siglist[] ; +#endif --- io.c.orig Sun Aug 30 19:15:26 1992 +++ io.c Wed Aug 14 16:57:58 1996 @@@@ -16,6 +16,8 @@@@ #endif #include #include +#include +#include #include "globals.h" /* read from from, write to to. select(2) has returned, so input @@@@ -90,7 +92,7 @@@@ /* all IO to and from the socket is handled here. The main part is * a loop around select(2). */ -do_io() +void do_io() { fd_set readfds ; int fdset_width ; --- siglist.c.orig Sun Aug 30 15:50:48 1992 +++ siglist.c Wed Aug 14 16:57:58 1996 @@@@ -32,12 +32,18 @@@@ # endif /* !_NSIG */ #endif /* !NSIG */ -char *sys_siglist[NSIG]; +#if HAVE_SYS_PARAM_H +# include +#endif +#if !(defined(BSD) && (BSD >=199306)) +char *sys_siglist[NSIG]; +#endif extern *malloc (); -initialize_siglist () +void initialize_siglist () { +#if !(defined(BSD) && (BSD >=199306)) register int i; for (i = 0; i < NSIG; i++) @@@@ -219,4 +225,5 @@@@ sprintf (sys_siglist[i], "Unknown Signal #%d", i); } } +#endif /* !(defined(BSD) && (BSD >=199306)) */ } --- socket.1.orig Wed Sep 9 16:38:19 1992 +++ socket.1 Wed Aug 14 16:57:58 1996 @@@@ -158,4 +158,4 @@@@ .SH VERSION This manual page describes Socket\-1.1. .SH AUTHOR -Juergen Nickelsen +Juergen Nickelsen --- socket.c.orig Wed Sep 9 16:14:34 1992 +++ socket.c Wed Aug 14 16:57:59 1996 @@@@ -18,6 +18,8 @@@@ #else #include #endif +#include +#include #include "globals.h" /* global variables */ @@@@ -37,6 +39,8 @@@@ void server A((int port, char *service_name)) ; void handle_server_connection A((void)) ; void client A((char *host, int port, char *service_name)) ; +extern void init_signals A((void)) ; +extern void do_io A((void)) ; int main(argc, argv) int argc ; @@@@ -46,7 +50,7 @@@@ int opt ; /* option character */ int error = 0 ; /* usage error occurred */ extern int optind ; /* from getopt() */ - char *host ; /* name of remote host */ + /* char *host ; */ /* name of remote host */ int port ; /* port number for socket */ char *service_name ; /* name of service for port */ @@@@ -58,7 +62,7 @@@@ /* set up progname for later use */ progname = argv[0] ; - if (cp = strrchr(progname, '/')) progname = cp + 1 ; + if ((cp = strrchr(progname, '/'))) progname = cp + 1 ; /* parse options */ while ((opt = getopt(argc, argv, "bcflp:qrsvw?")) != -1) { @@@@ -185,15 +189,15 @@@@ long norder ; char dotted[20] ; - he = gethostbyaddr(&sa.sin_addr.s_addr, + he = gethostbyaddr((char *)&sa.sin_addr.s_addr, sizeof(sa.sin_addr.s_addr), AF_INET) ; if (!he) { norder = htonl(sa.sin_addr.s_addr) ; sprintf(dotted, "%d.%d.%d.%d", - (norder >> 24) & 0xff, - (norder >> 16) & 0xff, - (norder >> 8) & 0xff, - norder & 0xff) ; + (int)((norder >> 24) & 0xff), + (int)((norder >> 16) & 0xff), + (int)((norder >> 8) & 0xff), + (int)(norder & 0xff)) ; } fprintf(stderr, "connection from %s\n", (he ? he->h_name : dotted)) ; --- socketp.c.orig Sun Aug 9 03:41:42 1992 +++ socketp.c Wed Aug 14 16:57:59 1996 @@@@ -11,10 +11,16 @@@@ #include #include #include +#include #include #include +#include +#include +#include #include "globals.h" +extern int is_number A((char *)); + /* * create a server socket on PORT accepting QUEUE_LENGTH connections */ @@@@ -52,7 +58,7 @@@@ { struct sockaddr_in sa ; struct hostent *hp ; - int a, s ; + int s ; long addr ; @@@@ -76,7 +82,7 @@@@ if ((s = socket(sa.sin_family, SOCK_STREAM, 0)) < 0) { /* get socket */ return -1 ; } - if (connect(s, &sa, sizeof(sa)) < 0) { /* connect */ + if (connect(s, (struct sockaddr *)&sa, sizeof(sa)) < 0) { /* connect */ close(s) ; return -1 ; } --- utils.c.orig Wed Sep 9 16:31:16 1992 +++ utils.c Wed Aug 14 16:57:59 1996 @@@@ -25,8 +25,10 @@@@ #else #include #endif +#include #include "globals.h" +extern void initialize_siglist A((void)) ; /* Signal handler, print message and exit */ SIG_HANDLER_RET exitsig(sig) @@@@ -70,7 +72,7 @@@@ /* set up signal handling. All except TSTP, CONT, CLD, and QUIT * are caught with exitsig(). */ -init_signals() +void init_signals() { int i ; #ifdef SIG_SETMASK /* only with BSD signals */ @ 1.2 log @Make this package work under NetBSD. @ text @d1 2 @ 1.1 log @Initial revision @ text @d2 10 a11 1 +++ Makefile Wed Aug 14 16:57:57 1996 @ 1.1.1.1 log @Initial import of FreeBSD's "socket" port. @ text @@