From owner-svn-ports-head@freebsd.org Fri Dec 1 11:19:23 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 56EC2DFC96F; Fri, 1 Dec 2017 11:19:23 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2CD5F7CF5F; Fri, 1 Dec 2017 11:19:23 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB1BJMuc096347; Fri, 1 Dec 2017 11:19:22 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB1BJLEB096343; Fri, 1 Dec 2017 11:19:21 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201712011119.vB1BJLEB096343@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 1 Dec 2017 11:19:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455271 - in head/security/slush: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/security/slush: . files X-SVN-Commit-Revision: 455271 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Dec 2017 11:19:23 -0000 Author: amdmi3 Date: Fri Dec 1 11:19:21 2017 New Revision: 455271 URL: https://svnweb.freebsd.org/changeset/ports/455271 Log: - Switch to options helpers - Regenerate patches Modified: head/security/slush/Makefile head/security/slush/files/patch-Makefile.in head/security/slush/files/patch-slush.c head/security/slush/files/patch-slushd.c Modified: head/security/slush/Makefile ============================================================================== --- head/security/slush/Makefile Fri Dec 1 11:18:55 2017 (r455270) +++ head/security/slush/Makefile Fri Dec 1 11:19:21 2017 (r455271) @@ -19,10 +19,12 @@ USES= ssl OPTIONS_DEFINE= DOCS do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/control.txt ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} ${INSTALL_PROGRAM} ${WRKSRC}/slush ${STAGEDIR}${PREFIX}/bin/slush ${INSTALL_PROGRAM} ${WRKSRC}/slushd ${STAGEDIR}${PREFIX}/sbin/slushd + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/control.txt ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Modified: head/security/slush/files/patch-Makefile.in ============================================================================== --- head/security/slush/files/patch-Makefile.in Fri Dec 1 11:18:55 2017 (r455270) +++ head/security/slush/files/patch-Makefile.in Fri Dec 1 11:19:21 2017 (r455271) @@ -1,6 +1,6 @@ ---- Makefile.in.orig Tue Apr 6 01:05:04 1999 -+++ Makefile.in Sat Jan 29 16:23:51 2000 -@@ -9,8 +9,8 @@ +--- Makefile.in.orig 1999-04-06 08:05:04 UTC ++++ Makefile.in +@@ -9,8 +9,8 @@ MANDIR=/usr/man/man8 CC=@CC@ INSTALL=@INSTALL@ @@ -11,7 +11,7 @@ all: slush slushd -@@ -38,7 +38,7 @@ +@@ -38,7 +38,7 @@ $(MANDIR)/slush.8: slush.8 install: $(SBINDIR)/slushd $(MANDIR)/slush.8 cert: Modified: head/security/slush/files/patch-slush.c ============================================================================== --- head/security/slush/files/patch-slush.c Fri Dec 1 11:18:55 2017 (r455270) +++ head/security/slush/files/patch-slush.c Fri Dec 1 11:19:21 2017 (r455271) @@ -1,5 +1,5 @@ ---- slush.c- Mon Oct 27 06:19:50 2003 -+++ slush.c Mon Oct 27 06:21:46 2003 +--- slush.c.orig 1999-05-07 02:24:09 UTC ++++ slush.c @@ -34,7 +34,10 @@ #include #include Modified: head/security/slush/files/patch-slushd.c ============================================================================== --- head/security/slush/files/patch-slushd.c Fri Dec 1 11:18:55 2017 (r455270) +++ head/security/slush/files/patch-slushd.c Fri Dec 1 11:19:21 2017 (r455271) @@ -1,4 +1,4 @@ ---- slushd.c +--- slushd.c.orig 1999-05-07 02:24:09 UTC +++ slushd.c @@ -40,11 +40,19 @@ #include @@ -20,7 +20,7 @@ #include #include #include -@@ -653,59 +661,42 @@ +@@ -653,59 +661,42 @@ int process_control_word(const char *tok /* exits on error */ void log_uwtmp(struct passwd *pw, struct in_addr *i, char *tty, int is_logout) { @@ -56,15 +56,14 @@ - ut.ut_time = time(NULL); - ut.ut_type = is_logout?DEAD_PROCESS:USER_PROCESS; - ut.ut_pid = getpid(); -- ++ memset(&ut, 0, sizeof ut); ++ gettimeofday(&ut.ut_tv, NULL); ++ strncpy(ut.ut_id, tty, sizeof ut.ut_id); + - strncpy(ut.ut_host, hostname, sizeof(ut.ut_host) - 1); - ut.ut_host[sizeof(ut.ut_host) - 1] = 0; - - memcpy(&ut.ut_addr, i, sizeof(ut.ut_addr)); -+ memset(&ut, 0, sizeof ut); -+ gettimeofday(&ut.ut_tv, NULL); -+ strncpy(ut.ut_id, tty, sizeof ut.ut_id); -+ + if (is_logout) { + ut.ut_type = DEAD_PROCESS; + } else {