Date: Thu, 12 Jun 2014 19:41:00 +0000 (UTC) From: Carlo Strub <cs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357632 - in head/mail/mixmaster: . files Message-ID: <201406121941.s5CJf0La022221@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cs Date: Thu Jun 12 19:41:00 2014 New Revision: 357632 URL: http://svnweb.freebsd.org/changeset/ports/357632 QAT: https://qat.redports.org/buildarchive/r357632/ Log: - Update to 3.0.2d - Support staging - Many minor fixes Added: head/mail/mixmaster/files/patch-Mix-Src-Makefile.in (contents, props changed) head/mail/mixmaster/files/patch-Mix-Src-config.h (contents, props changed) head/mail/mixmaster/files/patch-Mix-Src-mix.c (contents, props changed) head/mail/mixmaster/files/patch-Mix-conf-mix.cfg (contents, props changed) Deleted: head/mail/mixmaster/files/Makefile.in head/mail/mixmaster/files/patch-aa head/mail/mixmaster/files/patch-ab head/mail/mixmaster/files/patch-ac head/mail/mixmaster/files/patch-ad Modified: head/mail/mixmaster/Makefile head/mail/mixmaster/distinfo head/mail/mixmaster/pkg-descr head/mail/mixmaster/pkg-plist Modified: head/mail/mixmaster/Makefile ============================================================================== --- head/mail/mixmaster/Makefile Thu Jun 12 19:34:06 2014 (r357631) +++ head/mail/mixmaster/Makefile Thu Jun 12 19:41:00 2014 (r357632) @@ -1,54 +1,72 @@ # Created by: Meyer Wolfsheim # $FreeBSD$ +# PORTNAME= mixmaster -PORTVERSION= 2.9.1 -PORTREVISION= 2 +PORTVERSION= 3.0.2d CATEGORIES= mail security -MASTER_SITES= SF/${PORTNAME}/Mixmaster/${PORTVERSION} \ - ftp://ftp.erisiandiscord.de/pub/misc/ +MASTER_SITES= http://www.c-s.li/ports/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ mixmaster-update.pl.gz allpingers.txt.gz EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= cs@FreeBSD.org -COMMENT= A cryptographically secure anonymous remailer +COMMENT= Cryptographically secure anonymous remailer -LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre +LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre -USES= ncurses perl5 -USE_OPENSSL= yes -.if !exists(/usr/include/openssl/idea.h) -WITH_OPENSSL_PORT= yes -.endif +USES= perl5 +USE_NCURSES= yes + +BUILD_WRKSRC= ${WRKSRC}/Mix/Src -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/Src +PORTDOCS= README HISTORY +CONFIG_FILES= abuse.txt.in dest.blk mix.cfg news.hlp pubring.mix type1.hlp \ + adminkey.txt end.hlp mix.cfg.ex pgp.hlp rab.blk usage.txt.in \ + blocked.txt.in header.blk mix.hlp pgponly.hlp reply.txt.in \ + dest.alw intro.hlp mlist.txt pubring.asc rlist.txt \ + allpingers.txt -CFLAGS+= -DGLOBALMIXCONF="\"${SYSCONFDIR}/mixmaster/client.cfg\"" -DHOMEMIXDIR="\".Mix\"" -MAKE_ARGS= CC=${CC} +OPTIONS_DEFINE= DOCS +OPTIONS_DEFAULT=DOCS -MAN1= mixmaster.1 -WRKDIST= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MIXMASTER_FILES= ${WRKDIST}/conf/* ${WRKDIST}/README ${WRKDIR}/allpingers.txt -MIXMASTER_SCRIPTS= ${WRKDIR}/mixmaster-update.pl +.include <bsd.port.options.mk> -NO_STAGE= yes .include <bsd.port.pre.mk> +.if ${OSVERSION} < 1000000 +BROKEN= Does not compile +.endif + post-patch: - ${CP} ${FILESDIR}/Makefile.in ${WRKSRC}/Makefile - @${RM} ${WRKSRC}/../conf/mix.cfg.orig + @${RM} ${WRKSRC}/Mix/conf/mix.cfg.orig + @${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|' ${WRKSRC}/Mix/Src/config.h \ + ${WRKSRC}/Mix/Src/Makefile.in + ${CP} ${WRKSRC}/Mix/Src/Makefile.in ${WRKSRC}/Mix/Src/Makefile pre-install: ${GZCAT} ${DISTDIR}/mixmaster-update.pl.gz >${WRKDIR}/mixmaster-update.pl - ${GZCAT} ${DISTDIR}/allpingers.txt.gz >${WRKDIR}/allpingers.txt - ${REINPLACE_CMD} -e "s,/etc,${SYSCONFDIR},g" ${WRKDIR}/mixmaster-update.pl - ${MKDIR} ${PREFIX}/share/examples/mixmaster + ${GZCAT} ${DISTDIR}/allpingers.txt.gz >${WRKSRC}/Mix/conf/allpingers.txt + ${REINPLACE_CMD} -e "s|/etc/mixmaster|${ETCDIR}|g" ${WRKDIR}/mixmaster-update.pl + ${REINPLACE_CMD} -e "s|/usr/bin|${PREFIX}/bin|g" ${WRKDIR}/mixmaster-update.pl + ${MKDIR} ${ETCDIR} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mix ${PREFIX}/bin/mixmaster - ${INSTALL_SCRIPT} ${MIXMASTER_SCRIPTS} ${PREFIX}/bin/mixmaster-update.pl - ${INSTALL_DATA} ${MIXMASTER_FILES} ${PREFIX}/share/examples/mixmaster - ${INSTALL_MAN} ${WRKDIST}/mix.1 ${PREFIX}/man/man1/mixmaster.1 + ${INSTALL_PROGRAM} ${WRKSRC}/Mix/Src/mixmaster ${STAGEDIR}${PREFIX}/bin/mixmaster + ${INSTALL_PROGRAM} ${WRKSRC}/Mix/Src/mpgp ${STAGEDIR}${PREFIX}/bin/mpgp + ${INSTALL_PROGRAM} ${WRKSRC}/Mix/Src/remailer ${STAGEDIR}${PREFIX}/bin/remailer + ${INSTALL_SCRIPT} ${WRKDIR}/mixmaster-update.pl ${STAGEDIR}${PREFIX}/bin/mixmaster-update + ${INSTALL_MAN} ${WRKSRC}/Mix/mixmaster.1 ${STAGEDIR}${PREFIX}/man/man1/mixmaster.1 + ${INSTALL_MAN} ${WRKSRC}/Mix/mpgp.1 ${STAGEDIR}${PREFIX}/man/man1/mpgp.1 +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/Mix/,} ${STAGEDIR}${DOCSDIR}/ +.endif +.for FILE in ${CONFIG_FILES} + @${INSTALL_DATA} ${WRKSRC}/Mix/conf/${FILE} ${ETCDIR}/${FILE}.sample + @if [ ! -f ${ETCDIR}/${FILE} ]; then \ + ${CP} -p ${WRKSRC}/Mix/conf/${FILE} ${ETCDIR}/${FILE} ; \ + fi +.endfor .include <bsd.port.post.mk> Modified: head/mail/mixmaster/distinfo ============================================================================== --- head/mail/mixmaster/distinfo Thu Jun 12 19:34:06 2014 (r357631) +++ head/mail/mixmaster/distinfo Thu Jun 12 19:41:00 2014 (r357632) @@ -1,6 +1,6 @@ -SHA256 (mixmaster-2.9.1.tar.gz) = 4249cfa9be9ea98857c216673ece95201444982a91a7aaa953aa98ca3326796d -SIZE (mixmaster-2.9.1.tar.gz) = 534816 +SHA256 (mixmaster-3.0.2d.tar.gz) = 22290968f8ebaef2977268f4dfada55edbc3866a3961808ac1a7c9db46a92a71 +SIZE (mixmaster-3.0.2d.tar.gz) = 690405 SHA256 (mixmaster-update.pl.gz) = b460688aa197bbb7fb6f727961de3f50695e9a1ac28ba55fae0ffabde0408550 SIZE (mixmaster-update.pl.gz) = 4138 -SHA256 (allpingers.txt.gz) = 19ff404694aa013393838e53944521cc12c3248aede701219589631d5c796536 -SIZE (allpingers.txt.gz) = 2360 +SHA256 (allpingers.txt.gz) = 2f698ba304987b71ee503ca95b54760829f480fb1060d537fb6721b7e0ab2ef0 +SIZE (allpingers.txt.gz) = 1937 Added: head/mail/mixmaster/files/patch-Mix-Src-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/mixmaster/files/patch-Mix-Src-Makefile.in Thu Jun 12 19:41:00 2014 (r357632) @@ -0,0 +1,47 @@ +--- Mix/Src/Makefile.in.orig 2014-06-01 22:58:49.000000000 +0200 ++++ Mix/Src/Makefile.in 2014-06-01 23:00:44.000000000 +0200 +@@ -8,10 +8,10 @@ + # $Id: Makefile.in 647 2003-10-25 23:34:13Z weasel $ + + # Edit according to the libraries you want to use: +-INC = %INC +-DEF = %DEF -DUSE_SOCK %MIXDIR +-LIBS = %LIBS +-LDFLAGS = %LDFLAGS ++INC = -I/usr/local/include -I/usr/include ++DEF = -DUSE_ZLIB -DUSE_PCRE -DUSE_AES -DUSE_NCURSES -DHAVE_NCURSES_H -DUSE_IDEA -DHAVE_SETENV -DUSE_SOCK -DSPOOL='"/tmp/mixmaster"' -DGLOBALMIXCONF='"%%ETCDIR%%/mix.cfg"' -DHOMEMIXDIR='".Mix"' ++LIBS = ++LDFLAGS = -Wl -lz -lpcre -L/usr/local/lib -lncurses -ltermcap -lcrypto + + # Set compiler options + # Note: Define NDEBUG to disable "assert" when not using DEBUG +@@ -21,7 +21,6 @@ + # OPT = -O2 -Wall -DNDEBUG + + CFLAGS = $(INC) $(DEF) $(OPT) +-CC = gcc + AR = ar rc + RANLIB = ranlib + #MAKE = make +@@ -32,7 +31,7 @@ + NOMENUOBJ = rndseed.o dummy.o + WINOBJ = winmain.o winutil.o + +-all: mixmaster ++all: mixmaster mpgp remailer + + mixmaster: $(OBJ) $(MIXOBJ) main.o $(LIBS) + $(CC) $(OBJ) $(MIXOBJ) main.o $(LIBS) $(LDFLAGS) -o mixmaster +@@ -77,10 +76,10 @@ + + parsedate.tab.c: parsedate.y + @echo Expect 6 shift/reduce conflicts +- bison parsedate.y ++ yacc -o parsedate.tab.c parsedate.y + + parsedate: parsedate.tab.c +- gcc -DTEST parsedate.tab.c -o parsedate ++ $(CC) -DTEST parsedate.tab.c -o parsedate + + + include Makefile.deps Added: head/mail/mixmaster/files/patch-Mix-Src-config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/mixmaster/files/patch-Mix-Src-config.h Thu Jun 12 19:41:00 2014 (r357632) @@ -0,0 +1,16 @@ +--- Mix/Src/config.h.orig 2014-06-01 23:03:49.000000000 +0200 ++++ Mix/Src/config.h 2014-06-01 23:04:46.000000000 +0200 +@@ -179,11 +179,11 @@ + #define BUFSIZE 4096 + + /** if it is a systemwide installation defined GLOBALMIXCONF **********/ +-/* #define GLOBALMIXCONF "/etc/mix.cfg" */ ++#define GLOBALMIXCONF "%%ETCDIR%%/mix.cfg" + + /* The path to append to a user's homedirectory for his local Mix dir */ + #ifndef HOMEMIXDIR +-#define HOMEMIXDIR "Mix" ++#define HOMEMIXDIR ".Mix" + #endif + + /** file names ********************************************************/ Added: head/mail/mixmaster/files/patch-Mix-Src-mix.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/mixmaster/files/patch-Mix-Src-mix.c Thu Jun 12 19:41:00 2014 (r357632) @@ -0,0 +1,11 @@ +--- Mix/Src/mix.c.orig 2014-06-01 23:05:54.000000000 +0200 ++++ Mix/Src/mix.c 2014-06-01 23:06:14.000000000 +0200 +@@ -430,7 +430,7 @@ + #ifdef WIN32 + strnncpy(SENDMAIL , "outfile"); + #else /* end of WIN32 */ +- strnncpy(SENDMAIL , "/usr/lib/sendmail -t"); ++ strnncpy(SENDMAIL , "/usr/sbin/sendmail -t"); + #endif /* else if not WIN32 */ + strnncpy(SENDANONMAIL , ""); + strnncpy(NEWS , ""); Added: head/mail/mixmaster/files/patch-Mix-conf-mix.cfg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/mixmaster/files/patch-Mix-conf-mix.cfg Thu Jun 12 19:41:00 2014 (r357632) @@ -0,0 +1,8 @@ +--- Mix/conf/mix.cfg.orig 2014-06-01 23:07:26.000000000 +0200 ++++ Mix/conf/mix.cfg 2014-06-01 23:07:48.000000000 +0200 +@@ -12,3 +12,5 @@ + RELFINAL 99 + MAXLAT 36h + MINLAT 5m ++SENDMAIL /usr/sbin/sendmail -t ++POOL /var/spool/mixmaster Modified: head/mail/mixmaster/pkg-descr ============================================================================== --- head/mail/mixmaster/pkg-descr Thu Jun 12 19:34:06 2014 (r357631) +++ head/mail/mixmaster/pkg-descr Thu Jun 12 19:41:00 2014 (r357632) @@ -2,7 +2,7 @@ Mixmaster is an "Chaumian mix-net" anony protection against traffic analysis and allow sending email anonymously or pseudonymously. -This software comes in a client only configuration! If you want -to setup a mixmaster server, read through the example files and man page. +This software comes in a client only configuration! If you want to setup a +mixmaster server, read through the example files and man page. -WWW: http://mixmaster.sf.net +WWW: https://github.com/crooks/mixmaster Modified: head/mail/mixmaster/pkg-plist ============================================================================== --- head/mail/mixmaster/pkg-plist Thu Jun 12 19:34:06 2014 (r357631) +++ head/mail/mixmaster/pkg-plist Thu Jun 12 19:41:00 2014 (r357632) @@ -1,27 +1,6 @@ bin/mixmaster -bin/mixmaster-update.pl -%%EXAMPLESDIR%%/README -%%EXAMPLESDIR%%/abuse.txt.in -%%EXAMPLESDIR%%/adminkey.txt -%%EXAMPLESDIR%%/allpingers.txt -%%EXAMPLESDIR%%/blocked.txt.in -%%EXAMPLESDIR%%/dest.alw -%%EXAMPLESDIR%%/dest.blk -%%EXAMPLESDIR%%/end.hlp -%%EXAMPLESDIR%%/header.blk -%%EXAMPLESDIR%%/intro.hlp -%%EXAMPLESDIR%%/mix.cfg -%%EXAMPLESDIR%%/mix.cfg.ex -%%EXAMPLESDIR%%/mix.hlp -%%EXAMPLESDIR%%/mlist.txt -%%EXAMPLESDIR%%/news.hlp -%%EXAMPLESDIR%%/pgp.hlp -%%EXAMPLESDIR%%/pgponly.hlp -%%EXAMPLESDIR%%/pubring.asc -%%EXAMPLESDIR%%/pubring.mix -%%EXAMPLESDIR%%/rab.blk -%%EXAMPLESDIR%%/reply.txt.in -%%EXAMPLESDIR%%/rlist.txt -%%EXAMPLESDIR%%/type1.hlp -%%EXAMPLESDIR%%/usage.txt.in -@dirrm share/examples/mixmaster +bin/mixmaster-update +bin/mpgp +bin/remailer +man/man1/mixmaster.1.gz +man/man1/mpgp.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406121941.s5CJf0La022221>