--0-2086618025-1139980963=:21604 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Content-Id: Content-Disposition: inline Update to current release and rc'ify. --0-2086618025-1139980963=:21604 Content-Type: text/plain; name="mixminion.diff.txt" Content-Description: 3968816665-mixminion.diff.txt Content-Disposition: inline; filename="mixminion.diff.txt" diff -ruN mixminion.orig/Makefile mixminion/Makefile --- mixminion.orig/Makefile Sun Feb 12 10:02:59 2006 +++ mixminion/Makefile Tue Feb 14 13:10:28 2006 @@ -6,7 +6,8 @@ # PORTNAME= Mixminion -PORTVERSION= 0.0.7.1 +PORTVERSION= 0.0.8 +DISTVERSIONSUFFIX= alpha2 CATEGORIES= mail security MASTER_SITES= http://www.mixminion.net/dist/${PORTVERSION}/ \ ftp://ftp.aha.ru/pub/FreeBSD/ports/distfiles/ \ @@ -16,14 +17,47 @@ COMMENT= A Type III Anonymous Remailer USE_OPENSSL= yes -USE_REINPLACE= yes USE_PYTHON= 2.0+ MAN1= mixminion.1 MAN5= mixminiond.conf.5 mixminionrc.5 MAN8= mixminiond.8 +PORTSDOC= statusfd.txt tutorial.txt + +.ifndef(WITHOUT_SERVER) +USE_RC_SUBR+= mixminiond +.endif + post-patch: @${REINPLACE_CMD} -e "s|share/man|man|g" ${WRKSRC}/setup.py + @${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \ + ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} + +post-install: +.ifndef(WITHOUT_SERVER) + @${INSTALL_DATA} ${WRKSRC}/etc/mixminiond.conf \ + ${PREFIX}/etc/mixminiond.conf.sample + @${INSTALL_DATA} ${WRKSRC}/etc/blacklist.conf \ + ${PREFIX}/etc/blacklist.conf.sample + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} \ + ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @-${MKDIR} /var/spool/mixminion + @${CHOWN} _mixminion:_mixminion /var/spool/mixminion + @${CHMOD} 0700 /var/spool/mixminion + @-${MKDIR} /var/run/mixminion + @${CHOWN} _mixminion:_mixminion /var/run/mixminion + @${CHMOD} 0700 /var/run/mixminion + @-${TOUCH} /var/log/mixminion + @${CHOWN} _mixminion:_mixminion /var/log/mixminion + @${CHMOD} 0700 /var/log/mixminion + @${CAT} pkg-message +.endif +.ifndef(NOPORTDOC) + @${MKDIR} ${DOCDIR} +.for doc in ${PORTSDOC} + @${INSTALL_DATA} ${WRKSRC}/doc/${doc} ${DOCDIR} +.endfor +.endif .include <bsd.port.mk> diff -ruN mixminion.orig/distinfo mixminion/distinfo --- mixminion.orig/distinfo Sun Feb 12 10:02:59 2006 +++ mixminion/distinfo Tue Feb 14 12:34:06 2006 @@ -1,3 +1,3 @@ -MD5 (Mixminion-0.0.7.1.tar.gz) = a7ee96a22dd6246760556fa959a37380 -SHA256 (Mixminion-0.0.7.1.tar.gz) = 7c4bdbcad9663365864712d13cd8d12fd5d4d6cc15697d4fc50163222f318755 -SIZE (Mixminion-0.0.7.1.tar.gz) = 437539 +MD5 (Mixminion-0.0.8alpha2.tar.gz) = 18f1f4166ca9ef61228e7f092280e5d9 +SHA256 (Mixminion-0.0.8alpha2.tar.gz) = 4dd7ab6fd9c0f58c4913609d360abd2650181c6de3b4b21e289cc148192144d5 +SIZE (Mixminion-0.0.8alpha2.tar.gz) = 480843 diff -ruN mixminion.orig/files/mixminiond.in mixminion/files/mixminiond.in --- mixminion.orig/files/mixminiond.in Thu Jan 1 03:00:00 1970 +++ mixminion/files/mixminiond.in Tue Feb 14 14:01:48 2006 @@ -0,0 +1,72 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# mixminion Type III anonymous mailer +# +# Description: Mixminion is the standard implementation of the Type III +# anonymous remailer protocol, which lets you send very anonymous +# email. + +# REQUIRE: NETWORKING SERVERS USR +# BEFORE: LOGIN +# KEYWORD: FreeBSD + +# Add the following lines to /etc/rc.conf to enable mixminiond +# mixminiond_enable (bool): Set to "NO" by default +# Set it to "YES" to enable mixminiond +# mixminiond_conf (str): Points to your mixminiond conf file +# Default: %%PREFIX%%/etc/mixminiond.conf +# mixminiond_user (str): Mixminiond user. Default _mixminion + +. /etc/rc.subr + +name="mixminiond" +rcvar=`set_rcvar` + +[ -z "${mixminiond_enable}" ] && mixminiond_enable="NO" +[ -z "${mixminiond_conf}" ] && mixminiond_conf="%%PREFIX%%/etc/mixminiond.conf" +[ -z "${mixminiond_user}" ] && mixminiond_user="_mixminion" + +command="%%PREFIX%%/bin/${name}" +extra_commands="reload republish DELKEYS stats upgrade" +start_cmd="${name}_start" +stop_cmd="${name}_stop" +reload_cmd="${name}_reload" +republish_cmd="${name}_republish" +DELKEYS_cmd="${name}_DELKEYS" +stats_cmd="${name}_stats" +pidfile="/var/run/mixminion/mixminion.pid" + +load_rc_config $name + +required_files=${mixminiond_conf} +required_dirs=/var/spool/mixminion + +mixminiond_start() { + su $mixminiond_user -c "${command} start -f ${mixminiond_conf} --daemon" +} + +mixminiond_stop() { + ${command} stop -f ${mixminiond_conf} + run_rc_command poll +} + +mixminiond_reload() { + ${command} server-reload -f ${mixminiond_conf} +} + +mixminiond_republish() { + ${command} republish -f ${mixminiond_conf} +} + +mixminiond_DELKEYS() { + ${command} DELKEYS -f ${mixminiond_conf} +} + +mixminiond_stats() { + ${command} stats -f ${mixminiond_conf} +} + +run_rc_command "$1" + diff -ruN mixminion.orig/files/patch-mixminiond.conf mixminion/files/patch-mixminiond.conf --- mixminion.orig/files/patch-mixminiond.conf Thu Jan 1 03:00:00 1970 +++ mixminion/files/patch-mixminiond.conf Tue Feb 14 13:59:53 2006 @@ -0,0 +1,100 @@ +--- etc/mixminiond.conf.orig Tue Feb 14 10:29:28 2006 ++++ etc/mixminiond.conf Tue Feb 14 10:57:02 2006 +@@ -21,7 +21,7 @@ + # This choice protects against root (on a non-journaling filesystem), but + # not against an attacker with deep hardware wizardry and resources. + # +-#ShredCommand: /usr/bin/shred -uz -n0 ++ShredCommand: /bin/rm -P + + # Uncomment this line if your system uses a different entropy generator. + # This file must be a character device that produces a truly random +@@ -34,8 +34,8 @@ + # own good. When this happens, you can either mark certain users + # ('system', 'dev', and so on) as trusted, or disable file paranoia entirely. + # +-#FileParanoia: yes +-#TrustedUser: root ++FileParanoia: yes ++TrustedUser: _mixminion + + [Server] + +@@ -52,8 +52,7 @@ + # + # (This option used to be called 'Homedir'; either spelling will work.) + # +-#BaseDir: /var/spool/mixminion +-#BaseDir: /home/miniond/mixminion ++BaseDir: /var/spool/mixminion + + # By default, all mixminion-related files are stored in subdirectories + # of 'BaseDir'. You can override default placement with the options below. +@@ -74,8 +73,8 @@ + #KeyDir: /var/lib/mixminion/keys + #WorkDir: /var/lib/mixminion/work + #QueueDir: /var/spool/mixminion +-#PidFile: /var/run/mixminion/mixminion.pid +-#LogFile: /var/log/mixminion/log ++PidFile: /var/run/mixminion/mixminion.pid ++LogFile: /var/log/mixminion + #StatsFile: /var/log/mixminion/stats + + # Minimum severity of messages to include in log file. Allowable values +@@ -105,7 +104,7 @@ + # How many bits should the server use for its long-lived 'Identity' keys? + # Must be between 2048 and 4096. + # +-#IdentityKeyBits: 2048 ++IdentityKeyBits: 4096 + + # How often should the server rotate its public keys? If you rotate often, + # you need less storage space for message hash logs, and messages sent +@@ -122,12 +121,12 @@ + # network when servers go down. If it's *too* long, however, you + # enable delaying attacks.) + # +-#PublicKeyOverlap: 24 hours ++PublicKeyOverlap: 24 hours + + # Use this option to define a 'nickname' for this server that users will + # use as a 'friendlier' version of your identity key. + # +-Nickname: Insert nickname here ++Nickname: nINj4 + + # Use this option to define an administrative contact for the remailer. + # +@@ -135,7 +134,7 @@ + # computer from the Mixminion server, so that you can get email when + # the server is down. + # +-Contact-Email: Insert email address here ++Contact-Email: nINj4@2.1337.2.rE6.7h3.In57411.60k5 + + # Use this field for information that users of your remailer may want to + # have. Must be no longer than 1024 characters. +@@ -143,10 +142,12 @@ + # NOTE: Users will not necessarily see this field before they use your + # remailer. + # +-Comments: This server has been running Mixminion since version 0.0.7. ++Comments: This server has been running Mixminion since version 0.0.8alpha2 + Of course, since Mixminion is still in alpha (or since we haven't + edited our configuration file since Mixminion came out of alpha), you +- shouldn't trust us with your anonymity yet. ++ shouldn't trust us with your anonymity yet. The user who installed this ++ node also never edited his default conf as suggested by the docs. He ++ must be one 1337 h4x0r, I would trust him. + + ############ + # Use ONE of these sets of options to configure the pooling algorithm. +@@ -185,7 +186,7 @@ + + # Should we start the server in the background? (Not supported on Win32.) + # +-Daemon: no ++Daemon: yes + + # How much data are we willing to upload or download in a single second? + # (If you don't set this, the bandwidth is limited only by your network diff -ruN mixminion.orig/files/pkg-message.in mixminion/files/pkg-message.in --- mixminion.orig/files/pkg-message.in Thu Jan 1 03:00:00 1970 +++ mixminion/files/pkg-message.in Tue Feb 14 13:00:15 2006 @@ -0,0 +1,8 @@ + +===================================================================================== +WARNING: We don't have statistics yet, so the system isn't robust in the presence of +unreliable servers in the directory. Please don't publish a server if you don't think +you can keep it up for a good while. To enable the mixminion server, set +mixminiond_enable="YES" in your /etc/rc.conf and edit %%PREFIX%%/etc/mixminiond.conf. +===================================================================================== + diff -ruN mixminion.orig/pkg-deinstall mixminion/pkg-deinstall --- mixminion.orig/pkg-deinstall Thu Jan 1 03:00:00 1970 +++ mixminion/pkg-deinstall Tue Feb 14 09:23:12 2006 @@ -0,0 +1,62 @@ +#! /bin/sh +# +# taken from net/cvsup-mirror + +PATH=/bin:/usr/sbin + +MIXMINION_USER=${MIXMINION_USER:-_mixminion} +MIXMINION_GROUP=${MIXMINION_GROUP:-_mixminion} + +ask() { + local question default answer + + question=$1 + default=$2 + if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then + read -p "${question} [${default}]? " answer + fi + if [ x${answer} = x ]; then + answer=${default} + fi + echo ${answer} +} + +yesno() { + local dflt question answer + + question=$1 + dflt=$2 + while :; do + answer=$(ask "${question}" "${dflt}") + case "${answer}" in + [Yy]*) return 0;; + [Nn]*) return 1;; + esac + echo "Please answer yes or no." + done +} + +delete_account() { + local u g home + + u=$1 + g=$2 + if yesno "Do you want me to remove group \"${g}\"" y; then + pw groupdel -n ${g} + echo "Done." + fi + if yesno "Do you want me to remove user \"${u}\"" y; then + eval home=~${u} + pw userdel -n ${u} + echo "Done." + if [ -d "${home}" ]; then + echo "Please remember to remove the home directory \"${home}\"" + fi + fi +} + +if [ x$2 != xDEINSTALL ]; then + exit +fi + +delete_account ${MIXMINION_USER} ${MIXMINION_GROUP} diff -ruN mixminion.orig/pkg-descr mixminion/pkg-descr --- mixminion.orig/pkg-descr Sun Feb 12 10:02:59 2006 +++ mixminion/pkg-descr Tue Feb 14 09:21:53 2006 @@ -1,6 +1,21 @@ -Mixminion is a Type III Anonymous Remailer +Mixminion is the standard implementation of the Type III anonymous remailer +protocol, which lets you send very anonymous email. This best-of-breed +remailer uses conservative design approaches to provide security against most +known attacks. We chose a simple, extensible design so that we can provide a +robust core system and then experiment with new research features such as +dummy policies, directory servers, and reputation systems. -This is still alpha quality code, so do not rely on it for anonymity yet. +You can find the latest information at http://mixminion.net/, or on the +mailing list, archived at http://archives.seul.org/mixminion/dev/. Please +consider subscribing, especially if you're going to run a node. + +This is a testing alpha release. You will probably only want to use it if +you are technically inclined, curious, and interested in helping the +Mixminion development effort. + +WARNING! Do NOT use this release if you require strong anonymity. It has +known deficiencies, including some that make it possible for an adversary +to trace your message through the system. WWW: http://www.mixminion.net/ diff -ruN mixminion.orig/pkg-install mixminion/pkg-install --- mixminion.orig/pkg-install Thu Jan 1 03:00:00 1970 +++ mixminion/pkg-install Tue Feb 14 09:22:47 2006 @@ -0,0 +1,40 @@ +#! /bin/sh +# +# taken from devel/perforce + +PATH=/bin:/usr/sbin + +MIXMINION_USER=${MIXMINION_USER:-_mixminion} +MIXMINION_GROUP=${MIXMINION_GROUP:-_mixminion} + +case $2 in +PRE-INSTALL) + USER=${MIXMINION_USER} + GROUP=${MIXMINION_GROUP} + + if pw group show "${GROUP}" 2>/dev/null; then + echo "You already have a group \"${GROUP}\", so I will use it." + else + if pw groupadd ${GROUP} ; then + echo "Added group \"${GROUP}\"." + else + echo "Adding group \"${GROUP}\" failed..." + exit 1 + fi + fi + + if pw user show "${USER}" 2>/dev/null; then + echo "You already have a user \"${USER}\", so I will use it." + else + if pw useradd ${USER} -g ${GROUP} -h - \ + -d /nonexistent -c "Mixminion Daemon" -s /bin/sh + then + echo "Added user \"${USER}\"." + else + echo "Adding user \"${USER}\" failed..." + exit 1 + fi + fi + + ;; +esac diff -ruN mixminion.orig/pkg-plist mixminion/pkg-plist --- mixminion.orig/pkg-plist Sun Feb 12 10:02:59 2006 +++ mixminion/pkg-plist Tue Feb 14 13:15:26 2006 @@ -1,8 +1,14 @@ bin/mixminion bin/mixminiond +etc/blacklist.conf.sample +etc/mixminiond.conf.sample +etc/rc.d/mixminiond.sh %%PYTHON_SITELIBDIR%%/mixminion/BuildMessage.py %%PYTHON_SITELIBDIR%%/mixminion/BuildMessage.pyc %%PYTHON_SITELIBDIR%%/mixminion/BuildMessage.pyo +%%PYTHON_SITELIBDIR%%/mixminion/ClientAPI.py +%%PYTHON_SITELIBDIR%%/mixminion/ClientAPI.pyc +%%PYTHON_SITELIBDIR%%/mixminion/ClientAPI.pyo %%PYTHON_SITELIBDIR%%/mixminion/ClientDirectory.py %%PYTHON_SITELIBDIR%%/mixminion/ClientDirectory.pyc %%PYTHON_SITELIBDIR%%/mixminion/ClientDirectory.pyo @@ -39,6 +45,9 @@ %%PYTHON_SITELIBDIR%%/mixminion/Packet.py %%PYTHON_SITELIBDIR%%/mixminion/Packet.pyc %%PYTHON_SITELIBDIR%%/mixminion/Packet.pyo +%%PYTHON_SITELIBDIR%%/mixminion/ScheduleUtils.py +%%PYTHON_SITELIBDIR%%/mixminion/ScheduleUtils.pyc +%%PYTHON_SITELIBDIR%%/mixminion/ScheduleUtils.pyo %%PYTHON_SITELIBDIR%%/mixminion/ServerInfo.py %%PYTHON_SITELIBDIR%%/mixminion/ServerInfo.pyc %%PYTHON_SITELIBDIR%%/mixminion/ServerInfo.pyo @@ -52,15 +61,15 @@ %%PYTHON_SITELIBDIR%%/mixminion/__init__.pyc %%PYTHON_SITELIBDIR%%/mixminion/__init__.pyo %%PYTHON_SITELIBDIR%%/mixminion/_minionlib.so -%%PYTHON_SITELIBDIR%%/mixminion/_textwrap.py -%%PYTHON_SITELIBDIR%%/mixminion/_textwrap.pyc -%%PYTHON_SITELIBDIR%%/mixminion/_textwrap.pyo %%PYTHON_SITELIBDIR%%/mixminion/benchmark.py %%PYTHON_SITELIBDIR%%/mixminion/benchmark.pyc %%PYTHON_SITELIBDIR%%/mixminion/benchmark.pyo %%PYTHON_SITELIBDIR%%/mixminion/directory/DirCGI.py %%PYTHON_SITELIBDIR%%/mixminion/directory/DirCGI.pyc %%PYTHON_SITELIBDIR%%/mixminion/directory/DirCGI.pyo +%%PYTHON_SITELIBDIR%%/mixminion/directory/DirFormats.py +%%PYTHON_SITELIBDIR%%/mixminion/directory/DirFormats.pyc +%%PYTHON_SITELIBDIR%%/mixminion/directory/DirFormats.pyo %%PYTHON_SITELIBDIR%%/mixminion/directory/DirMain.py %%PYTHON_SITELIBDIR%%/mixminion/directory/DirMain.pyc %%PYTHON_SITELIBDIR%%/mixminion/directory/DirMain.pyo @@ -94,6 +103,9 @@ %%PYTHON_SITELIBDIR%%/mixminion/server/PacketHandler.py %%PYTHON_SITELIBDIR%%/mixminion/server/PacketHandler.pyc %%PYTHON_SITELIBDIR%%/mixminion/server/PacketHandler.pyo +%%PYTHON_SITELIBDIR%%/mixminion/server/Pinger.py +%%PYTHON_SITELIBDIR%%/mixminion/server/Pinger.pyc +%%PYTHON_SITELIBDIR%%/mixminion/server/Pinger.pyo %%PYTHON_SITELIBDIR%%/mixminion/server/ServerConfig.py %%PYTHON_SITELIBDIR%%/mixminion/server/ServerConfig.pyc %%PYTHON_SITELIBDIR%%/mixminion/server/ServerConfig.pyo --0-2086618025-1139980963=:21604--
Responsible Changed From-To: gnats-admin->freebsd-ports-bugs Rescue this PR from the 'pending' category.
State Changed From-To: open->feedback Unfetchable # make fetch ===> Vulnerability check disabled, database not found => Mixminion-0.0.8alpha2.tar.gz doesn't seem to exist in /usr/ports/distfiles/. => Attempting to fetch from http://www.mixminion.net/dist/0.0.8/. fetch: http://www.mixminion.net/dist/0.0.8/Mixminion-0.0.8alpha2.tar.gz: Not Found => Attempting to fetch from ftp://ftp.aha.ru/pub/FreeBSD/ports/distfiles/. fetch: ftp://ftp.aha.ru/pub/FreeBSD/ports/distfiles/Mixminion-0.0.8alpha2.tar.gz: File unavailable (e.g., file not found, no access) => Attempting to fetch from http://www.mirrors.wiretapped.net/security/cryptography/apps/mail/mixminion/0.0.7.1/. fetch: http://www.mirrors.wiretapped.net/security/cryptography/apps/mail/mixminion/0.0.7.1/Mixminion-0.0.8alpha2.tar.gz: Not Found => Attempting to fetch from ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/. fetch: ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/Mixminion-0.0.8alpha2.tar.gz: File unavailable (e.g., file not found, no access) => Couldn't fetch it - please try to retrieve this => port manually into /usr/ports/distfiles/ and try again. *** Error code 1 Thanks
Attached is dist fix along with some other minor items (fixed a rc.subr bug also)
State Changed From-To: feedback->open Feedback received. New patch.
State Changed From-To: open->feedback Another problem: _mixminion:*:1001: You already have a group "_mixminion", so I will use it. _mixminion:*:1001:1001::0:0:Mixminion Daemon:/nonexistent:/sbin/nologin You already have a user "_mixminion", so I will use it. cat: pkg-message: No such file or directory *** Error code 1 Please fix. Thanks
Not going to submit and entire new patch for a 1 line fix ;) Change: @${CAT} pkg-message to @${CAT} ${PKGMESSAGE}
Responsible Changed From-To: freebsd-ports-bugs->mnag I'll take it.
Dear maintainer, Do you approve this update? http://www.freebsd.org/cgi/query-pr.cgi?pr=93371 Final patch is: http://marcus.grupos.com.br:8080/patch/mixminion.patch Thanks -- Marcus Alves Grando marcus(at)corp.grupos.com.br | Grupos Internet S/A mnag(at)FreeBSD.org | FreeBSD.org
On Mon, Feb 20, 2006 at 05:28:02PM -0300, Marcus Alves Grando wrote: > Dear maintainer, > > Do you approve this update? I approve this update. Thank you for your time and effort! Delay caused by mail bounce. rik
State Changed From-To: feedback->closed Committed, with minor changes. Thanks!