Index: head/net/freebsd-uucp/Makefile =================================================================== --- head/net/freebsd-uucp/Makefile (revision 433531) +++ head/net/freebsd-uucp/Makefile (revision 433532) @@ -1,105 +1,88 @@ # Created by: Kris Kennaway # $FreeBSD$ PORTNAME= freebsd-uucp DISTVERSIONPREFIX= r -DISTVERSION= 1_07_3 -PORTREVISION= 3 +DISTVERSION= 1_07_4 CATEGORIES= net comms ipv6 PKGNAMESUFFIX?= ${PAM_SUFFIX}${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org COMMENT= FreeBSD-modified Taylor UUCP (unix-to-unix copy program) +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/uucp/COPYING + USES= fakeroot USE_GITHUB= yes GH_ACCOUNT= dinoex PKGMESSAGE= ${WRKDIR}/pkg-message INFO= uucp VARLOG= uucp/common_sources/policy.h uucp/uucico/uucico.8 \ uucp/uucp/uucp.1 uucp/uux/uux.1 uucp/uuxqt/uuxqt.8 FIXME= etc/periodic/daily/340.uucp etc/periodic/daily/410.status-uucp \ etc/periodic/weekly/300.uucp # fix errros for -std=iso9899:1999 in FreeBSD 5.1 MAKE_ENV+= CSTD=gnu99 OPTIONS_DEFINE=PAM ENCRYPTED_PASSWORDS VAR_LOG OPTIONS_DEFAULT= OPTIONS_SUB= yes NO_OPTIONS_SORT=yes ENCRYPTED_PASSWORDS_DESC= use encrypted passwords in etc/uucp/sys VAR_LOG_DESC= put logfiles into /var/log .include .if ${PORT_OPTIONS:MPAM} PAM_SUFFIX= -pam MAKE_ENV+= WITH_PAM=${WITH_PAM} .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 110000 MAKE_ENV+= MINUSLPAM=-lpam .endif -CONFLICTS?= freebsd-uucp-1.* -.else -CONFLICTS?= freebsd-uucp-pam-1.* .endif .if ${PORT_OPTIONS:MENCRYPTED_PASSWORDS} MAKE_ENV+= WITH_ENCRYPTED_PASSWORDS=1 .endif -post-extract: - ${REINPLACE_CMD} -e 's|doc ||' ${WRKSRC}/uucp/Makefile - ${REINPLACE_CMD} -e 's|VERSION=.*|VERSION=${PORTVERSION}|' \ - ${WRKSRC}/uucp/common_sources/configure \ - ${WRKSRC}/uucp/Makefile.inc - ${REINPLACE_CMD} -e 's|(owner)|(uucpowner)|' \ - ${WRKSRC}/uucp/uustat/Makefile - ${REINPLACE_CMD} -e 's|0770|0750|' ${WRKSRC}/local.mtree - ${REINPLACE_CMD} -e 's|getline (|get_line (|g' \ - ${WRKSRC}/uucp/libuucp/getlin.c - do-configure: + ${REINPLACE_CMD} -e 's|doc ||' ${WRKSRC}/uucp/Makefile ${REINPLACE_CMD} -e "s=/usr/local/=${PREFIX}/=" \ ${FIXME:S,^,${WRKSRC}/,} .if ${PORT_OPTIONS:MVAR_LOG} ${REINPLACE_CMD} \ -e "s=/var/spool/uucp/Log=/var/log/uucp/Log=" \ -e "s=/var/spool/uucp/Debug=/var/log/uucp/Debug=" \ -e "s=/var/spool/uucp/Stats=/var/log/uucp/Stats=" \ ${VARLOG:S,^,${WRKSRC}/,} - @${ECHO_CMD} " .." >> ${WRKSRC}/uucp.mtree - @${ECHO_CMD} "/set uname=root gname=wheel mode=0755" \ - >> ${WRKSRC}/uucp.mtree - @${ECHO_CMD} " log" >> ${WRKSRC}/uucp.mtree - @${ECHO_CMD} "/set uname=uucp gname=uucp mode=0775" \ - >> ${WRKSRC}/uucp.mtree - @${ECHO_CMD} " uucp" >> ${WRKSRC}/uucp.mtree - @${ECHO_CMD} " .." >> ${WRKSRC}/uucp.mtree .endif .if ${PORT_OPTIONS:MENCRYPTED_PASSWORDS} ${REINPLACE_CMD} \ -e "s=HAVE_ENCRYPTED_PASSWORDS.*=HAVE_ENCRYPTED_PASSWORDS 1=" \ ${WRKSRC}/uucp/common_sources/policy.h .endif @${CAT} ${MASTERDIR}/pkg-message > ${WRKDIR}/pkg-message .if ${PORT_OPTIONS:MPAM} @${ECHO_MSG} "" >> ${WRKDIR}/pkg-message @${ECHO_MSG} "Add this lines to your pam.conf:" >> ${WRKDIR}/pkg-message @${CAT} ${FILESDIR}/uucp-pam.conf >> ${WRKDIR}/pkg-message .endif (cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} \ ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} configure) pre-install: - ${MKDIR} ${STAGEDIR}/var + ${MKDIR} ${STAGEDIR}/var ${STAGEDIR}${PREFIX}/etc/mtree + ${INSTALL_DATA} ${WRKSRC}/etc/mtree/uucp-var.mtree \ + ${STAGEDIR}${PREFIX}/etc/mtree/uucp-var.mtree + ${INSTALL_DATA} ${WRKSRC}/etc/mtree/uucp-local.mtree \ + ${STAGEDIR}${PREFIX}/etc/mtree/uucp-local.mtree post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree ${STAGEDIR}${PREFIX}/info - ${INSTALL_DATA} ${WRKSRC}/uucp.mtree ${STAGEDIR}${PREFIX}/etc/mtree/uucp-var.mtree - ${INSTALL_DATA} ${WRKSRC}/local.mtree ${STAGEDIR}${PREFIX}/etc/mtree/uucp-local.mtree + ${MKDIR} ${STAGEDIR}${PREFIX}/info ${INSTALL_DATA} ${WRKSRC}/uucp/doc/uucp.info ${STAGEDIR}${PREFIX}/info/ .include Index: head/net/freebsd-uucp/distinfo =================================================================== --- head/net/freebsd-uucp/distinfo (revision 433531) +++ head/net/freebsd-uucp/distinfo (revision 433532) @@ -1,2 +1,3 @@ -SHA256 (dinoex-freebsd-uucp-r1_07_3_GH0.tar.gz) = 0fba2c87f23e9ba337c907e615500f926b8b54d4d445de954470b5f521d4542a -SIZE (dinoex-freebsd-uucp-r1_07_3_GH0.tar.gz) = 949411 +TIMESTAMP = 1486446112 +SHA256 (dinoex-freebsd-uucp-r1_07_4_GH0.tar.gz) = a9159977215487f869074c4a7377710e3b4f0aff5fe9b27410cbc9980ff3c9e3 +SIZE (dinoex-freebsd-uucp-r1_07_4_GH0.tar.gz) = 949854 Index: head/net/freebsd-uucp/files/patch-uucpd.c =================================================================== --- head/net/freebsd-uucp/files/patch-uucpd.c (revision 433531) +++ head/net/freebsd-uucp/files/patch-uucpd.c (nonexistent) @@ -1,90 +0,0 @@ ---- uucpd/uucpd.c.orig 2007-09-10 10:57:58.000000000 +0200 -+++ uucpd/uucpd.c 2010-01-26 22:03:02.000000000 +0100 -@@ -73,7 +73,11 @@ - #include - #include - #include -+#if __FreeBSD_version >= 900007 -+#include -+#else - #include -+#endif - #include - - #include "pathnames.h" -@@ -110,11 +114,13 @@ - - #endif /* USE_PAM */ - -+#if __FreeBSD_version < 900007 - #if (MAXLOGNAME-1) > UT_NAMESIZE - #define LOGNAMESIZE UT_NAMESIZE - #else - #define LOGNAMESIZE (MAXLOGNAME-1) - #endif -+#endif - - #define SCPYN(a, b) strncpy(a, b, sizeof (a)) - -@@ -196,7 +202,11 @@ - } while (user[0] == '\0'); - - /* truncate username to LOGNAMESIZE characters */ -+#if __FreeBSD_version >= 900007 -+ user[sizeof user - 1] = '\0'; -+#else - user[LOGNAMESIZE] = '\0'; -+#endif - - /* always ask for passwords to deter account guessing */ - printf("Password: "); fflush(stdout); -@@ -468,11 +478,24 @@ - { - int status; - pid_t pid; -+#if __FreeBSD_version >= 900007 -+ struct utmpx ut; -+#else - char line[32]; -+#endif - - while ((pid=wait((int *)&status)) > 0) { -+#if __FreeBSD_version >= 900007 -+ memset(&ut, 0, sizeof ut); -+ ut.ut_type = DEAD_PROCESS; -+ gettimeofday(&ut.ut_tv, NULL); -+ ut.ut_pid = pid; -+ snprintf(ut.ut_id, sizeof ut.ut_id, "%xuucp", pid); -+ pututxline(&ut); -+#else - sprintf(line, "uucp%ld", (long)pid); - logwtmp(line, "", ""); -+#endif - } - } - -@@ -481,6 +504,18 @@ - */ - void dologin(struct passwd *pw, struct sockaddr *sin) - { -+#if __FreeBSD_version >= 900007 -+ struct utmpx ut; -+ -+ memset(&ut, 0, sizeof ut); -+ ut.ut_type = USER_PROCESS; -+ gettimeofday(&ut.ut_tv, NULL); -+ ut.ut_pid = getpid(); -+ snprintf(ut.ut_id, sizeof ut.ut_id, "%xuucp", ut.ut_pid); -+ SCPYN(ut.ut_user, pw->pw_name); -+ realhostname_sa(ut.ut_host, sizeof ut.ut_host, sin, sin->sa_len); -+ pututxline(&ut); -+#else - char line[32]; - char remotehost[UT_HOSTSIZE + 1]; - int f; -@@ -503,4 +539,5 @@ - (void) close(f); - } - logwtmp(line, pw->pw_name, remotehost); -+#endif - } Property changes on: head/net/freebsd-uucp/files/patch-uucpd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/freebsd-uucp/files/patch-uuto.in =================================================================== --- head/net/freebsd-uucp/files/patch-uuto.in (revision 433531) +++ head/net/freebsd-uucp/files/patch-uuto.in (nonexistent) @@ -1,9 +0,0 @@ ---- uucp/uuto/uuto.in.orig 2003-06-14 05:04:15.000000000 +0100 -+++ uucp/uuto/uuto.in 2009-01-10 09:47:01.000000000 +0000 -@@ -55,4 +55,4 @@ - *) ;; - esac - --exec @BINDIR@/uucp -t -R -c $* -+exec @BINDIR@/uucp -t -R -c "$@" - Property changes on: head/net/freebsd-uucp/files/patch-uuto.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/freebsd-uucp/files/patch-Makefile =================================================================== --- head/net/freebsd-uucp/files/patch-Makefile (revision 433531) +++ head/net/freebsd-uucp/files/patch-Makefile (nonexistent) @@ -1,35 +0,0 @@ ---- Makefile.orig 2003-06-17 08:08:21.000000000 +0200 -+++ Makefile 2013-11-17 10:23:16.000000000 +0100 -@@ -1,21 +1,21 @@ - PREFIX?= /usr/local - - all: uucp uucpd etc -- cd uucp && make all -- cd uucpd && make all -- cd etc && make all -+ (cd uucp && ${MAKE} all) -+ (cd uucpd && ${MAKE} all) -+ (cd etc && ${MAKE} all) - - install: uucp uucpd etc -- mtree -deU -f uucp.mtree -p /var -- mtree -deU -f local.mtree -p ${PREFIX} -- cd uucp && make install -- cd uucpd && make install -- cd etc && make install -+ mtree -deU -f uucp.mtree -p ${DESTDIR}/var -+ mtree -deU -f local.mtree -p ${DESTDIR}${PREFIX} -+ (cd uucp && ${MAKE} install) -+ (cd uucpd && ${MAKE} install) -+ (cd etc && ${MAKE} install) - - clean: uucp uucpd etc -- cd uucp && make clean -- cd uucpd && make clean -- cd etc && make clean -+ (cd uucp && ${MAKE} clean) -+ (cd uucpd && ${MAKE} clean) -+ (cd etc && ${MAKE} clean) - rm -f uucp/common_sources/config.cache \ - uucp/common_sources/config.log \ - uucp/common_sources/config.status \ Property changes on: head/net/freebsd-uucp/files/patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/freebsd-uucp/files/patch-uucp-sample-Makefile =================================================================== --- head/net/freebsd-uucp/files/patch-uucp-sample-Makefile (revision 433531) +++ head/net/freebsd-uucp/files/patch-uucp-sample-Makefile (nonexistent) @@ -1,10 +0,0 @@ ---- uucp/sample/Makefile.orig 2002-07-22 07:02:07.000000000 +0200 -+++ uucp/sample/Makefile 2013-11-17 13:31:15.000000000 +0100 -@@ -12,6 +12,6 @@ - - install: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 440 ${FILES} \ -- ${PREFIX}/etc/uucp -+ ${DESTDIR}${PREFIX}/etc/uucp - - .include Property changes on: head/net/freebsd-uucp/files/patch-uucp-sample-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/freebsd-uucp/pkg-plist =================================================================== --- head/net/freebsd-uucp/pkg-plist (revision 433531) +++ head/net/freebsd-uucp/pkg-plist (revision 433532) @@ -1,58 +1,59 @@ bin/uulog bin/uupick bin/uusched bin/uuto etc/mtree/uucp-var.mtree etc/mtree/uucp-local.mtree etc/periodic/daily/340.uucp etc/periodic/daily/410.status-uucp etc/periodic/weekly/300.uucp etc/uucp/call.sample etc/uucp/config.sample etc/uucp/dial.sample etc/uucp/dialcode.sample etc/uucp/passwd.sample etc/uucp/port.sample etc/uucp/sys1.sample etc/uucp/sys2.sample man/man1/cu.1.gz man/man1/uuconv.1.gz man/man1/uucp.1.gz man/man1/uulog.1.gz man/man1/uuname.1.gz man/man1/uupick.1.gz man/man1/uustat.1.gz man/man1/uuto.1.gz man/man1/uux.1.gz man/man8/uuchk.8.gz man/man8/uucico.8.gz man/man8/uusched.8.gz man/man8/uuxqt.8.gz man/man8/uucpd.8.gz libexec/uucpd sbin/uuchk sbin/uuconv @owner uucp bin/uucp bin/uuname bin/uux @group uucp libexec/uucp/uuxqt @group dialer bin/cu bin/uustat libexec/uucp/uucico @owner -@exec pw usermod uucp -s %D/libexec/uucp/uucico -@exec mtree -deU -f %D/etc/mtree/uucp-var.mtree -p /var -@exec mtree -deU -f %D/etc/mtree/uucp-local.mtree -p %D -@unexec rm -d /var/spool/uucppublic 2>/dev/null || true -@unexec rm -d /var/spool/uucp/.Preserve 2>/dev/null || true -@unexec rm -d /var/spool/uucp/.Sequence 2>/dev/null || true -@unexec rm -d /var/spool/uucp/.Status 2>/dev/null || true -@unexec rm -d /var/spool/uucp/.Temp 2>/dev/null || true -@unexec rm -d /var/spool/uucp/.Xqtdir 2>/dev/null || true -@unexec rm -d /var/spool/uucp 2>/dev/null || true -%%VAR_LOG%%@unexec rm -d /var/log/uucp 2>/dev/null || true -@exec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^suucp /etc/services.bak ; echo "suucp 4031/tcp #UUCP over SSL"; echo "suucp 4031/udp #UUCP over SSL") > /etc/services -@unexec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^suucp /etc/services.bak ) > /etc/services +@group +@preexec pw usermod uucp -s %D/libexec/uucp/uucico +@preexec mtree -deU -f %D/etc/mtree/uucp-var.mtree -p /var +@preexec mtree -deU -f %D/etc/mtree/uucp-local.mtree -p %D +@preexec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^suucp /etc/services.bak ; echo "suucp 4031/tcp #UUCP over SSL"; echo "suucp 4031/udp #UUCP over SSL") > /etc/services +@postunexec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^suucp /etc/services.bak ) > /etc/services +%%VAR_LOG%%@dir(uucp,uucp,775) /var/log/uucp +@dir(uucp,uucp,775) /var/spool/uucp/.Preserve +@dir(uucp,uucp,775) /var/spool/uucp/.Sequence +@dir(uucp,uucp,775) /var/spool/uucp/.Status +@dir(uucp,uucp,775) /var/spool/uucp/.Temp +@dir(uucp,uucp,775) /var/spool/uucp/.Xqtdir +@dir(uucp,uucp,775) /var/spool/uucp +@dir(uucp,uucp,777) /var/spool/uucppublic