Index: head/net/rp-pppoe/Makefile =================================================================== --- head/net/rp-pppoe/Makefile (revision 405807) +++ head/net/rp-pppoe/Makefile (revision 405808) @@ -1,91 +1,91 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= rp-pppoe -PORTVERSION= 3.11 +PORTVERSION= 3.12 CATEGORIES= net MASTER_SITES= http://www.roaringpenguin.com/files/download/ MAINTAINER= mandree@FreeBSD.org COMMENT= The popular Roaring Penguin's PPPoE software GNU_CONFIGURE= yes PATCH_WRKSRC= ${WRKSRC}/src CONFIGURE_WRKSRC= ${WRKSRC}/src BUILD_WRKSRC= ${WRKSRC}/src man5= pppoe.conf.5 man8= pppoe-connect.8 pppoe-setup.8 pppoe-start.8 pppoe-status.8 \ pppoe-stop.8 pppoe-relay.8 pppoe-server.8 pppoe.8 CONFIG_FILES= firewall-masq firewall-standalone pap-secrets \ pppoe-server-options pppoe.conf DOC_FILES= CHANGES HOW-TO-CONNECT KERNEL-MODE-PPPOE LICENSE \ PROBLEMS SCRIPT_FILES= pppoe-connect pppoe-init pppoe-setup pppoe-start \ pppoe-status pppoe-stop OPTIONS_DEFINE= DOCS # work around "Present But Cannot Be Compiled" issue in GNU configure: CFLAGS+= -include sys/types.h -include sys/socket.h -include netinet/in.h .include .if ${PORT_OPTIONS:MDOCS} PORTDOCS= * .endif post-patch: @${REINPLACE_CMD} -e "s!/etc/ppp!${PREFIX}/etc/ppp!g" ${WRKSRC}/man/* @${REINPLACE_CMD} -e 's!/etc/ppp!$$(prefix)/etc/ppp!g' \ ${WRKSRC}/src/Makefile.in .for file in pppoe-connect pppoe-init pppoe-setup pppoe-start @${REINPLACE_CMD} -e 's!/etc/+ppp!$${prefix}/etc/ppp!g' \ ${WRKSRC}/scripts/${file}.in .endfor @${REINPLACE_CMD} -e 's!pty!tty!g' ${WRKSRC}/scripts/pppoe-connect.in @${REINPLACE_CMD} -e 's!/var/lock/subsys/adsl!/var/tmp/rp_pppoe_adsl!g' \ ${WRKSRC}/scripts/pppoe-init.in .for f in pppoe-status pppoe-stop.in @${REINPLACE_CMD} -e "s!/etc/ppp!${PREFIX}/etc/ppp!g" \ ${WRKSRC}/scripts/${f} .endfor @${REINPLACE_CMD} -e "s/\$$^/\$$>/g" ${WRKSRC}/src/Makefile.in do-install: # Binaries ${MKDIR} ${STAGEDIR}${PREFIX}/sbin .for f in pppoe pppoe-server pppoe-relay ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${f} ${STAGEDIR}${PREFIX}/sbin .endfor # Configurations ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ppp .for f in ${CONFIG_FILES} ${INSTALL_DATA} ${WRKSRC}/configs/${f} \ ${STAGEDIR}${PREFIX}/etc/ppp/${f}.sample .endfor # Manual pages ${MKDIR} ${STAGEDIR}${MAN5PREFIX}/man/man5 .for f in ${man5} ${INSTALL_MAN} ${WRKSRC}/man/${f} ${STAGEDIR}${MAN5PREFIX}/man/man5 .endfor ${MKDIR} ${STAGEDIR}${MAN8PREFIX}/man/man8 .for f in ${man8} ${INSTALL_MAN} ${WRKSRC}/man/${f} ${STAGEDIR}${MAN8PREFIX}/man/man8 .endfor # Scripts .for f in ${SCRIPT_FILES} ${INSTALL_SCRIPT} ${WRKSRC}/scripts/${f} ${STAGEDIR}${PREFIX}/sbin .endfor # Startup scripts .for f in 04pppoe-relay.sh.sample 04pppoe-server.sh.sample ${INSTALL_SCRIPT} ${FILESDIR}/${f} ${STAGEDIR}${PREFIX}/etc/rc.d/ .endfor # Documentation ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} .include Index: head/net/rp-pppoe/distinfo =================================================================== --- head/net/rp-pppoe/distinfo (revision 405807) +++ head/net/rp-pppoe/distinfo (revision 405808) @@ -1,2 +1,2 @@ -SHA256 (rp-pppoe-3.11.tar.gz) = 86a1a4d92fcea74fa6dd45516c5975933fa978b36fafe71f76ea70b4b4747720 -SIZE (rp-pppoe-3.11.tar.gz) = 223234 +SHA256 (rp-pppoe-3.12.tar.gz) = 00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2 +SIZE (rp-pppoe-3.12.tar.gz) = 224125 Index: head/net/rp-pppoe/files/patch-md5.c =================================================================== --- head/net/rp-pppoe/files/patch-md5.c (revision 405807) +++ head/net/rp-pppoe/files/patch-md5.c (nonexistent) @@ -1,11 +0,0 @@ ---- ./md5.c.orig 2012-08-17 20:31:25.000000000 +0200 -+++ ./md5.c 2012-09-23 17:27:55.000000000 +0200 -@@ -141,7 +141,7 @@ - MD5Transform(ctx->buf, (uint32 *) ctx->in); - byteReverse((unsigned char *) ctx->buf, 4); - memcpy(digest, ctx->buf, 16); -- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ -+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ - } - - #ifndef ASM_MD5 Property changes on: head/net/rp-pppoe/files/patch-md5.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