===> Generating patch ===> Viewing diff with more diff -ruN --exclude=CVS /usr/ports/sysutils/su2/Makefile /tmp/gd/su2/Makefile --- /usr/ports/sysutils/su2/Makefile 2012-01-31 13:59:33.000000000 +0400 +++ /tmp/gd/su2/Makefile 2012-01-31 00:59:18.000000000 +0400 @@ -7,23 +7,20 @@ PORTNAME= su2 PORTVERSION= 1.3 +PORTREVISION= 1 CATEGORIES= sysutils security MASTER_SITES= ftp://ftp.ccs.neu.edu/pub/sysadmin/ MAINTAINER= ports@FreeBSD.org COMMENT= An enhanced su, allows users to su with own password + more -NO_CDROM= "Don't sell for profit" +NO_CDROM= Don't sell for profit MAN1= su2.1 PLIST_FILES= bin/su2 .include -.if ${OSVERSION} > 900007 -#BROKEN= fails to build with new utmpx -.endif - post-patch: ${REINPLACE_CMD} -e 's,/etc/super,${PREFIX}/etc/super,g' ${WRKSRC}/su2.man diff -ruN --exclude=CVS /usr/ports/sysutils/su2/files/patch-ad /tmp/gd/su2/files/patch-ad --- /usr/ports/sysutils/su2/files/patch-ad 1970-01-01 03:00:00.000000000 +0300 +++ /tmp/gd/su2/files/patch-ad 2012-01-31 14:02:53.000000000 +0400 @@ -0,0 +1,72 @@ +--- su2.c.orig 2012-01-31 13:59:38.000000000 +0400 ++++ su2.c 2012-01-31 14:02:28.000000000 +0400 +@@ -151,7 +151,12 @@ + #include + #include + #include ++#include ++#if defined(__FreeBSD_version) && __FreeBSD_version > 900007 ++#include ++#else + #include ++#endif + #include + #ifdef IOCTL + #include +@@ -383,7 +388,11 @@ + if (FullTTY == (char *) 0) + FullTTY = "/dev/TTY??"; + ++#if defined(__FreeBSD_version) && __FreeBSD_version > 800007 ++ TTY = strchr (FullTTY + 1, '/') + 1; ++#else + TTY = strrchr (FullTTY, '/') + 1; ++#endif + + Debug (1, "-> FullTTY=\"%s\"\n", FullTTY); + Debug (1, "-> TTY=\"%s\"\n", TTY); +@@ -1315,7 +1324,11 @@ + * Copies name into an internal static buffer. + */ + ++#if defined(__FreeBSD_version) && __FreeBSD_version > 900007 ++#define MAXNAME sizeof(((struct utmpx *)nptr)->ut_user) ++#else + #define MAXNAME sizeof(((struct utmp *)nptr)->ut_name) ++#endif + + #ifdef BROKENCUSERID + char *mycuserid () +@@ -1432,6 +1445,24 @@ + ModifyUtmp (NewUserName) + register char *NewUserName; + { ++#if defined(__FreeBSD_version) && __FreeBSD_version > 900007 ++ struct utmpx ut, *utr; ++ ++ strncpy(ut.ut_line, TTY, sizeof(ut.ut_line)); ++ setutxent(); ++ if ((utr = getutxline(&ut)) == NULL) { ++ endutxent(); ++ (void) fprintf (stderr, "Terminal %s not found\n", ut.ut_line); ++ return (1); ++ } ++ strncpy(utr->ut_user, NewUserName, sizeof(utr->ut_user)); ++ if (pututxline(utr) == NULL) { ++ endutxent(); ++ (void) fprintf (stderr, "pututxline failed\n"); ++ return (1); ++ } ++ endutxent(); ++#else + register int fd; /* /etc/utmp file */ + register int i; /* index */ + #ifdef hpux +@@ -1482,6 +1513,7 @@ + + (void) write (fd, (char *) & Utmp, sizeof (Utmp)); + (void) close (fd); ++#endif + return (0); + } + ===> Done