From owner-freebsd-ports Wed May 12 0:20:15 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 560A515D01 for ; Wed, 12 May 1999 00:20:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id AAA22805; Wed, 12 May 1999 00:20:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from dipshit.dis.org (dipshit-inside.dis.org [209.157.93.10]) by hub.freebsd.org (Postfix) with ESMTP id 240CD15267 for ; Wed, 12 May 1999 00:19:02 -0700 (PDT) (envelope-from shipley@dipshit.dis.org) Received: (from root@localhost) by dipshit.dis.org (8.9.2/8.9.1) id AAA19910; Wed, 12 May 1999 00:19:01 -0700 (PDT) (envelope-from shipley) Message-Id: <199905120719.AAA19910@dipshit.dis.org> Date: Wed, 12 May 1999 00:19:01 -0700 (PDT) From: shipleydis.org@dipshit.dis.org Reply-To: shipley@dis.org To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/11663: diff to update slush-0.1.0 -> slush-0.1.1 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 11663 >Category: ports >Synopsis: Update to port libnet >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed May 12 00:20:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Peter Shipley >Release: >Organization: Dis.Org >Environment: ports >Description: update for port net/slush to current version also updates distribution site for src package >How-To-Repeat: -- >Fix: diff -ur slush-old/Makefile slush/Makefile --- slush-old/Makefile Tue May 11 23:26:13 1999 +++ slush/Makefile Tue May 11 23:35:56 1999 @@ -6,11 +6,10 @@ # $Id: Makefile,v 1.2 1999/05/09 17:53:12 steve Exp $ # -DISTNAME= slush-0_1_0 -PKGNAME= slush-0.1.0 +DISTNAME= slush-0.1.1 CATEGORIES= security net -MASTER_SITES= ftp://www.dis.org/pub/Security/ -EXTRACT_SUFX= _tar.gz +MASTER_SITES= http://violet.ibs.com.au/slush/files/ \ + ftp://www.dis.org/pub/Security/ MAINTAINER= shipley@dis.org @@ -27,7 +26,7 @@ BROKEN= does not build .endif -WRKSRC= ${WRKDIR}/slush-0.1.0 +WRKSRC= ${WRKDIR}/slush-0.1.1 .if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES MAKE_ENV+= EXTRA_SSL_LIBS="-lRSAglue -lrsaref" .endif diff -ur slush-old/files/md5 slush/files/md5 --- slush-old/files/md5 Tue May 11 23:26:13 1999 +++ slush/files/md5 Tue May 11 23:36:13 1999 @@ -1 +1 @@ -MD5 (slush-0_1_0_tar.gz) = a2a83e760632e2a0c12a7fdb29603ec3 +MD5 (slush-0.1.1.tar.gz) = 0fb0d298e4dba05ec602d362fdf8f088 diff -ur slush-old/patches/patch-aa slush/patches/patch-aa --- slush-old/patches/patch-aa Tue May 11 23:26:13 1999 +++ slush/patches/patch-aa Tue May 11 23:33:01 1999 @@ -1,7 +1,7 @@ -*** Makefile.in.orig Tue Apr 6 03:05:04 1999 ---- Makefile.in Sun May 9 00:05:44 1999 +*** Makefile.in- Fri May 7 02:00:37 1999 +--- Makefile.in Fri May 7 02:01:05 1999 *************** -*** 9,27 **** +*** 9,16 **** CC=@CC@ INSTALL=@INSTALL@ @@ -10,51 +10,12 @@ all: slush slushd - slushd: slushd.o common.o -! $(CC) $(LDFLAGS) -s -o $@ slushd.o common.o $(LIBS) - - slushd.o: slushd.c common.o - $(CC) -c $(CFLAGS) slushd.c - - slush: slush.o common.o -! $(CC) $(LDFLAGS) -s -o $@ slush.o common.o $(LIBS) - - slush.o: slush.c common.o - $(CC) -c $(CFLAGS) slush.c ---- 9,27 ---- +--- 9,16 ---- CC=@CC@ INSTALL=@INSTALL@ ! CFLAGS=@CFLAGS@ -Wall -DVERSION=\"$(VERSION)\" -I/usr/local/include -! LIBS=@LIBS@ -L/usr/local/lib -lssl -lcrypto $(EXTRA_SSL_LIBS) -lutil +! LIBS=@LIBS@ -L/usr/local/lib -lssl -lcrypto -lRSAglue -lrsaref -lutil all: slush slushd - slushd: slushd.o common.o -! $(CC) -static $(LDFLAGS) -o $@ slushd.o common.o $(LIBS) - - slushd.o: slushd.c common.o - $(CC) -c $(CFLAGS) slushd.c - - slush: slush.o common.o -! $(CC) -static $(LDFLAGS) -o $@ slush.o common.o $(LIBS) - - slush.o: slush.c common.o - $(CC) -c $(CFLAGS) slush.c -*************** -*** 38,44 **** - install: $(SBINDIR)/slushd $(MANDIR)/slush.8 - - cert: -! ssleay req -new -x509 -nodes \ - -out slushd.pem -days 365 -keyout slushd.pem - - clean: ---- 38,44 ---- - install: $(SBINDIR)/slushd $(MANDIR)/slush.8 - - cert: -! openssl req -new -x509 -nodes \ - -out slushd.pem -days 365 -keyout slushd.pem - - clean: diff -ur slush-old/patches/patch-ac slush/patches/patch-ac --- slush-old/patches/patch-ac Tue May 11 23:26:13 1999 +++ slush/patches/patch-ac Tue May 11 23:33:01 1999 @@ -1,5 +1,5 @@ -*** slushd.c.orig Tue Apr 6 05:14:04 1999 ---- slushd.c Sat May 8 23:53:40 1999 +*** slushd.c- Fri May 7 04:04:35 1999 +--- slushd.c Fri May 7 04:06:11 1999 *************** *** 40,46 **** #include @@ -26,6 +26,23 @@ + #ifdef HAVE_UNISTD_H #include /* fork, execvp, exit */ + #endif +*************** +*** 199,205 **** + if (!hosts_access(&request)) + { + syslog(LOG_ERR, "Connection refused from %s:%d", +! inet_ntoa(addr.sin_addr), ntohs(addr.sin_port)); + exit(2); + } + #endif +--- 200,206 ---- + if (!hosts_access(&request)) + { + syslog(LOG_ERR, "Connection refused from %s:%d", +! inen_ntoa(addr.sin_addr), ntohs(addr.sin_port)); + exit(2); + } #endif *************** *** 654,711 **** >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message