diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2017-12-01 11:19:21 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2017-12-01 11:19:21 +0000 |
| commit | 518b70dd4108df79584e81f65dd54ebd999e920b (patch) | |
| tree | 47f8a6891dfcacb0c6c56ba97ef03bbd99e10cd6 /security/slush | |
| parent | 1d438f1d0d09246186a0a22aa86840cb97dabcc3 (diff) | |
| download | ports-518b70dd4108df79584e81f65dd54ebd999e920b.tar.gz ports-518b70dd4108df79584e81f65dd54ebd999e920b.zip | |
- Switch to options helpers
- Regenerate patches
Notes
Notes:
svn path=/head/; revision=455271
Diffstat (limited to 'security/slush')
| -rw-r--r-- | security/slush/Makefile | 8 | ||||
| -rw-r--r-- | security/slush/files/patch-Makefile.in | 8 | ||||
| -rw-r--r-- | security/slush/files/patch-slush.c | 4 | ||||
| -rw-r--r-- | security/slush/files/patch-slushd.c | 13 |
4 files changed, 17 insertions, 16 deletions
diff --git a/security/slush/Makefile b/security/slush/Makefile index b5a1a3d8bcd7..1387f21ce827 100644 --- a/security/slush/Makefile +++ b/security/slush/Makefile @@ -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 <bsd.port.mk> diff --git a/security/slush/files/patch-Makefile.in b/security/slush/files/patch-Makefile.in index 1055033acfa9..e86ed04fde87 100644 --- a/security/slush/files/patch-Makefile.in +++ b/security/slush/files/patch-Makefile.in @@ -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: diff --git a/security/slush/files/patch-slush.c b/security/slush/files/patch-slush.c index 35bdb47ece44..479ad51d71f0 100644 --- a/security/slush/files/patch-slush.c +++ b/security/slush/files/patch-slush.c @@ -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 <signal.h> #include <string.h> diff --git a/security/slush/files/patch-slushd.c b/security/slush/files/patch-slushd.c index c1f97deabe00..b81fc7a81e2d 100644 --- a/security/slush/files/patch-slushd.c +++ b/security/slush/files/patch-slushd.c @@ -1,4 +1,4 @@ ---- slushd.c +--- slushd.c.orig 1999-05-07 02:24:09 UTC +++ slushd.c @@ -40,11 +40,19 @@ #include <ctype.h> @@ -20,7 +20,7 @@ #include <limits.h> #include <paths.h> #include <sys/types.h> -@@ -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 { |