[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
update: mail/mixmaster
- To: ports_(_at_)_openbsd_(_dot_)_org
- Subject: update: mail/mixmaster
- From: Nikolay Sturm <sturm_(_at_)_sec_(_dot_)_informatik_(_dot_)_tu-darmstadt_(_dot_)_de>
- Date: Tue, 10 Sep 2002 20:45:21 +0200
- Organization: Fnord!
Hi!
Attached is an update of mixmaster to the current version. It's still a
client-only port, setting up a server or using this for nym-accounts
might be possible or not. It would be nice if anyone could test this
further. The base functionality works herei, so it should be commitable.
bye,
Nikolay
--
OpenPGP: 0x5C0878D2 - BB55 EDCF A1F6 8057 B953 4C66 EFBD BA73 5C08 78D2
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/Makefile mixmaster/Makefile
--- /usr/ports/mail/mixmaster/Makefile Tue May 7 21:13:58 2002
+++ mixmaster/Makefile Mon Sep 9 14:39:46 2002
@@ -2,50 +2,39 @@
COMMENT= "client for anonymous remailing"
-VERSION= 2.0.4b45
-DISTNAME= mix${VERSION:S/.//g}
-PKGNAME= mixmaster-${VERSION}
+VERSION= 2.9b37
+DISTNAME= mixmaster-${VERSION}
CATEGORIES= mail security
-NEED_VERSION= 1.515
MAINTAINER= Nikolay Sturm <sturm_(_at_)_sec_(_dot_)_informatik_(_dot_)_tu-darmstadt_(_dot_)_de>
-# GPL
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
+PERMIT_PACKAGE_CDROM= "only with patch notice"
+PERMIT_PACKAGE_FTP= "only with patch notice"
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ftp://ftp.shinn.net/pub/remailer/mixmaster/v2.0/ \
- ftp://ftp.zedz.net/pub/crypto/remailer/mixmaster/ \
- http://tesla.desy.de/~nsturm/distfiles/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mixmaster/}
-# this is a general mixmaster website, mixmaster itself is unmaintained
-HOMEPAGE= http://mixmaster.shinn.net
+HOMEPAGE= http://mixmaster.sourceforge.net/
-SYSCONFDIR= /etc/mixmaster
-
-WRKDIST=${WRKDIR}/Mix-${VERSION:S/.//g}
-WRKSRC=${WRKDIST}/Src
+WRKSRC= ${WRKDIST}/Src
NO_REGRESS= Yes
-MAKE_ENV= SYSCONFDIR="${SYSCONFDIR}"
+MAKE_ENV= SYSCONFDIR="${SYSCONFDIR}/mixmaster"
-MIXMASTER_FILES=${WRKDIST}/type2.list ${WRKDIST}/mixmaster.conf.in \
- ${WRKDIST}/destination.block ${WRKDIST}/mix.help.in \
- ${WRKDIST}/pubring.mix ${WRKDIST}/source.block \
- ${WRKDIST}/mix.list ${WRKDIST}/urls ${WRKDIST}/headers.del \
- ${WRKDIST}/getlist ${WRKDIST}/keyinfo.txt.in \
- ${WRKDIST}/mixmaster.conf ${WRKDIST}/mix.help
+.for i in mix.cfg mix.cfg.ex pubring.* *.alw *.blk *.hlp *.in *.list *.txt
+MIXMASTER_FILES+= ${WRKDIST}/conf/$i
+.endfor
+MIXMASTER_FILES+= ${WRKDIST}/README
post-patch:
- @perl -i -p -e "s#MIXDEST#${SYSCONFDIR}#" ${WRKDIST}/getlist
+ @cp files/Makefile ${WRKSRC}
-post-install:
- @strip ${PREFIX}/sbin/mixmaster
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/mix ${PREFIX}/sbin/mixmaster
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mixmaster
${INSTALL_DATA} ${MIXMASTER_FILES} ${PREFIX}/share/examples/mixmaster
- ${INSTALL_DATA} ${WRKDIST}/mixmaster.1 ${PREFIX}/man/man1
+ ${INSTALL_DATA} ${WRKDIST}/mix.1 ${PREFIX}/man/man1/mixmaster.1
.include <bsd.port.mk>
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/distinfo mixmaster/distinfo
--- /usr/ports/mail/mixmaster/distinfo Thu Mar 21 21:20:47 2002
+++ mixmaster/distinfo Fri Aug 30 09:01:40 2002
@@ -1,3 +1,3 @@
-MD5 (mix204b45.tar.gz) = 7236b81750f07ca97885907d03878fc8
-RMD160 (mix204b45.tar.gz) = dc9e6f40516aa8f3d570bbfcc1566401e190fe9a
-SHA1 (mix204b45.tar.gz) = 52e723148b2664276e94acd53283bbacbfd37747
+MD5 (mixmaster-2.9b37.tar.gz) = 6aac826101afa8a9f5e8bb54a2b5db03
+RMD160 (mixmaster-2.9b37.tar.gz) = 97c611917e9db9f3ae85cd26b261dc9f4cd60895
+SHA1 (mixmaster-2.9b37.tar.gz) = f1dfb872ee36cc7831c8904fe48743f6f3d031c9
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/files/Makefile mixmaster/files/Makefile
--- /usr/ports/mail/mixmaster/files/Makefile Thu Jan 1 01:00:00 1970
+++ mixmaster/files/Makefile Fri Aug 30 09:37:39 2002
@@ -0,0 +1,80 @@
+#Makefile generated on marvin Fri Aug 30 09:18:37 CEST 2002
+# Mixmaster version 3 -- (C) 1999 Anonymizer Inc.
+
+# Mixmaster may be redistributed and modified under certain conditions.
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+# ANY KIND, either express or implied. See the file COPYRIGHT for
+# details.
+
+# $Id: Makefile.in,v 1.4 2002/07/24 07:48:50 rabbi Exp $
+
+# Edit according to the libraries you want to use:
+INC = -Ipcre-2.08
+DEF = -DUSE_ZLIB -DUSE_PCRE -DUSE_NCURSES -DHAVE_NCURSES_H -DUSE_SOCK -DSPOOL='"$(SYSCONFDIR)"' -DCOMPILEDPASS='"$(PASS)"'
+LIBS = pcre-2.08/libpcre.a
+LDFLAGS = -lz -lcrypto -lcurses
+
+OPT = -Wall
+# OPT = -g -pg -Wall -DDEBUG
+# OPT = -O2 -Wall
+
+CFLAGS += $(INC) $(DEF) $(OPT)
+#CC ?= gcc
+AR = ar rc
+RANLIB = ranlib
+#MAKE = make
+
+OBJ = mix.o rem.o rem1.o rem2.o rem3.o chain.o chain1.o chain2.o chain3.o nym.o pgp.o pgpdb.o pgpdata.o pgpget.o pgpcreat.o pool.o mail.o rfc822.o mime.o keymgt.o compress.o stats.o crypto.o random.o util.o buffers.o
+
+MIXOBJ = rndseed.o menu.o menusend.o menunym.o menuutil.o
+NOMENUOBJ = rndseed.o dummy.o
+WINOBJ = winmain.o winutil.o
+
+all: mix
+
+mix: $(OBJ) $(MIXOBJ) main.o $(LIBS)
+ $(CC) $(OBJ) $(MIXOBJ) main.o $(LIBS) $(LDFLAGS) -o mix
+
+libmix.a: $(OBJ) $(MIXOBJ) dllmain.o
+ $(AR) libmix.a $(OBJ) $(MIXOBJ) dllmain.o
+
+libmix32.a: libmix.a mixlib.def
+ dllwrap --dllname mixlib.dll --def mixlib.def --output-lib libmix32.a libmix.a zlib-1.1.4/libz.a pcre-2.08/libpcre.a openssl/libeay32.a -lwsock32
+
+dllmix: main.o libmix32.a
+ $(CC) main.o libmix32.a -o dllmix
+
+winmix.exe: $(WINOBJ) libmix32.a
+ $(CC) $(WINOBJ) libmix32.a -lgdi32 -luser32 $(LDFLAGS) -o mix.exe
+
+winmix: winmenu.res #winmix.exe
+ rsrc winmenu.res mix.exe
+
+winmenu.o: winmenu.rc winmenu.h
+ windres winmenu.rc winmenu.o
+
+remailer: $(OBJ) $(NOMENUOBJ) remailer.o $(LIBS)
+ $(CC) $(OBJ) $(NOMENUOBJ) remailer.o $(LIBS) $(LDFLAGS) -o remailer
+
+mpgp: $(OBJ) $(NOMENUOBJ) pgptest.o $(LIBS)
+ $(CC) $(OBJ) $(NOMENUOBJ) pgptest.o $(LIBS) $(LDFLAGS) -o mpgp
+
+test: $(OBJ) test.o $(NOMENUOBJ) $(LIBS)
+ $(CC) $(OBJ) test.o $(NOMENUOBJ) $(LIBS) $(LDFLAGS) -o test
+
+clean:
+ -rm -f *.o *.a *.res *~ mix *.exe remailer test mpgp core gmon.out
+
+allclean: clean
+ -rm -f Makefile
+
+ci: clean
+ cd ~/mix3; ci -l * Mix/* Mix/Src/*; echo
+
+include Makefile.deps
+
+pcre-2.08/libpcre.a:
+ cd pcre-2.08; make libpcre.a
+
+
+
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/patches/patch-Src_Makefile mixmaster/patches/patch-Src_Makefile
--- /usr/ports/mail/mixmaster/patches/patch-Src_Makefile Wed Jul 4 17:22:34 2001
+++ mixmaster/patches/patch-Src_Makefile Thu Jan 1 01:00:00 1970
@@ -1,100 +0,0 @@
-$OpenBSD: patch-Src_Makefile,v 1.1.1.1 2001/07/04 15:22:34 lebel Exp $
---- Src/Makefile.orig Tue Jun 19 18:12:44 2001
-+++ Src/Makefile Tue Jun 19 18:14:48 2001
-@@ -0,0 +1,96 @@
-+MIXPATH=${SYSCONFDIR}
-+
-+DEF=-DUSE_ZLIB -DUSE_BSAFE
-+INC=-Ipcre -Ibsafe
-+LIBS=pcre/libpcre.a bsafe/libbsafe.a
-+LDFLAGS=-lm -lcrypto -lz
-+
-+CFLAGS = -O2 -Wall -static
-+
-+ALL_CFLAGS=$(INC) $(DEF) $(OPT) $(CFLAGS)
-+
-+CC=gcc
-+
-+LIB=ar
-+RANLIB=ranlib
-+MAKE=make
-+
-+all: mixmaster
-+
-+alpha:
-+ $(MAKE) all OPT=-DDECALPHA
-+
-+##########################################################################
-+
-+OFILES = main.o random.o util.o send.o buffers.o \
-+ type1.o type2.o chain2.o stats.o keymgt.o \
-+ compress.o
-+
-+.KEEP_STATE:
-+
-+clean:
-+ -rm -f *.o mixmaster mixmaster.exe core
-+
-+allclean: clean
-+ cd bsafe; make clean
-+ cd zlib; make clean
-+ cd pcre; make clean
-+
-+newpass:
-+ -rm -f keymgt.o mixmaster
-+
-+mixmaster: $(OFILES) $(LIBS)
-+ $(CC) $(OFILES) $(LIBS) -o mixmaster $(LDFLAGS)
-+
-+
-+main.o: main.c mix.h
-+ $(CC) -c main.c -o main.o $(ALL_CFLAGS) -DSPOOL='"$(MIXPATH)"'
-+
-+random.o: random.c mix.h
-+ $(CC) -c random.c -o random.o $(ALL_CFLAGS)
-+
-+util.o: util.c mix.h
-+ $(CC) -c util.c -o util.o $(ALL_CFLAGS)
-+
-+send.o: send.c mix.h
-+ $(CC) -c send.c -o send.o $(ALL_CFLAGS)
-+
-+buffers.o: buffers.c
-+ $(CC) -c buffers.c -o buffers.o $(ALL_CFLAGS)
-+
-+type1.o: type1.c mix.h
-+ $(CC) -c type1.c -o type1.o $(ALL_CFLAGS)
-+
-+type2.o: type2.c mix.h
-+ $(CC) -c type2.c -o type2.o $(ALL_CFLAGS)
-+
-+chain2.o: chain2.c mix.h
-+ $(CC) -c chain2.c -o chain2.o $(ALL_CFLAGS)
-+
-+stats.o: stats.c mix.h
-+ $(CC) -c stats.c -o stats.o $(ALL_CFLAGS)
-+
-+keymgt.o: keymgt.c mix.h
-+ $(CC) -c keymgt.c -o keymgt.o $(ALL_CFLAGS) -DPASSPHRASE='"$(PASS)"'
-+
-+compress.o: compress.c mix.h zlib/zlib.h
-+ $(CC) -c compress.c -o compress.o $(ALL_CFLAGS)
-+
-+sockio.o: sockio.c mix.h
-+ $(CC) -c sockio.c -o sockio.o $(ALL_CFLAGS)
-+
-+client.o: client.c mix.h
-+ $(CC) -c client.c -o client.o $(ALL_CFLAGS)
-+
-+server.o: server.c mix.h
-+ $(CC) -c server.c -o server.o $(ALL_CFLAGS)
-+
-+pcre/libpcre.a:
-+ cd pcre; $(MAKE) libpcre.a
-+
-+bsafe/libbsafe.a:
-+ cd bsafe; $(MAKE) libbsafe.a
-+
-+install: mixmaster
-+ cp mixmaster ${PREFIX}/sbin
-+
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/patches/patch-Src_pcre-2_08_Makefile mixmaster/patches/patch-Src_pcre-2_08_Makefile
--- /usr/ports/mail/mixmaster/patches/patch-Src_pcre-2_08_Makefile Thu Jan 1 01:00:00 1970
+++ mixmaster/patches/patch-Src_pcre-2_08_Makefile Fri Aug 30 09:37:21 2002
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- Src/pcre-2.08/Makefile.orig Fri Aug 30 09:36:52 2002
++++ Src/pcre-2.08/Makefile Fri Aug 30 09:37:14 2002
+@@ -51,8 +51,8 @@
+ # into errlist.
+
+ AR = ar cq
+-CC = gcc -O2 -Wall
+-CFLAGS =
++#CC = gcc -O2 -Wall
++CFLAGS += -Wall
+ RANLIB = @true
+
+ # If you are going to obey "make install", edit these settings for your
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/patches/patch-Src_util_c mixmaster/patches/patch-Src_util_c
--- /usr/ports/mail/mixmaster/patches/patch-Src_util_c Wed Jul 4 17:22:34 2001
+++ mixmaster/patches/patch-Src_util_c Thu Jan 1 01:00:00 1970
@@ -1,47 +0,0 @@
-$OpenBSD: patch-Src_util_c,v 1.1.1.1 2001/07/04 15:22:34 lebel Exp $
---- Src/util.c.orig Tue Jan 19 03:29:19 1999
-+++ Src/util.c Mon Jun 18 11:01:24 2001
-@@ -177,6 +177,7 @@ tempfile (char *rootname)
- {
- char tmp[256];
- FILE *f;
-+ int fptr;
-
- #ifdef SHORTNAMES
- if (strlen (rootname) > 2)
-@@ -184,8 +185,11 @@ tempfile (char *rootname)
- #endif
- sprintf (tmp, "%sXXXXXX", rootname);
- strcpy (rootname, tmp);
-- if (!mktemp (rootname))
-- return (NULL);
-+ fptr = mkstemp(rootname);
-+ if (fptr > 0)
-+ close(fptr);
-+ else
-+ exit(-1);
- f = open_mix_file (rootname, "w+");
- if (f == NULL)
- exit (-1); /* we are in deep trouble and may as well exit */
-@@ -202,6 +206,7 @@ tempfileb (char *rootname)
- {
- char tmp[256];
- FILE *f;
-+ int fptr;
-
- #ifdef SHORTNAMES
- if (strlen (rootname) > 2)
-@@ -209,8 +214,11 @@ tempfileb (char *rootname)
- #endif
- sprintf (tmp, "%sXXXXXX", rootname);
- strcpy (rootname, tmp);
-- if (!mktemp (rootname))
-- return (NULL);
-+ fptr = mkstemp(rootname);
-+ if (fptr > 0)
-+ close(fptr);
-+ else
-+ exit(-1);
- f = open_mix_file (rootname, "wb+");
- if (f == NULL)
- exit (-1); /* we are in deep trouble and may as well exit */
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/patches/patch-bsafe_Makefile mixmaster/patches/patch-bsafe_Makefile
--- /usr/ports/mail/mixmaster/patches/patch-bsafe_Makefile Wed Jul 4 17:22:33 2001
+++ mixmaster/patches/patch-bsafe_Makefile Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
-$OpenBSD: patch-bsafe_Makefile,v 1.1.1.1 2001/07/04 15:22:33 lebel Exp $
-use #include <openssl/...> instead
-
---- Src/bsafe/Makefile.orig Sun Jun 3 20:11:36 2001
-+++ Src/bsafe/Makefile Sun Jun 3 20:11:53 2001
-@@ -1,6 +1,6 @@
- OBJS = bsafeeay.o
- SRC = bsafeeay.c
--INCLUDE = -I. -I../ssleay/include
-+INCLUDE = -I.
- CC = gcc
- CFLAGS = -ggdb
- AR = ar
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/patches/patch-bsafe_bsafeeay_c mixmaster/patches/patch-bsafe_bsafeeay_c
--- /usr/ports/mail/mixmaster/patches/patch-bsafe_bsafeeay_c Wed Jul 4 17:22:33 2001
+++ mixmaster/patches/patch-bsafe_bsafeeay_c Thu Jan 1 01:00:00 1970
@@ -1,135 +0,0 @@
-$OpenBSD: patch-bsafe_bsafeeay_c,v 1.1.1.1 2001/07/04 15:22:33 lebel Exp $
-use openssl header files in /usr/include
-and correct some pointer type mismatches
-
---- Src/bsafe/bsafeeay.c.orig Tue Jan 19 03:29:20 1999
-+++ Src/bsafe/bsafeeay.c Sun Jun 3 20:38:34 2001
-@@ -54,12 +54,12 @@
- #include <stdio.h>
- #include <unistd.h>
- #include <stdarg.h>
--#include <rsa.h>
--#include <des.h>
--#include <md5.h>
--#include <sha.h>
--#include <rand.h>
--#include <dh.h>
-+#include <openssl/rsa.h>
-+#include <openssl/des.h>
-+#include <openssl/md5.h>
-+#include <openssl/sha.h>
-+#include <openssl/rand.h>
-+#include <openssl/dh.h>
- #include <bsafeeay.h>
- #include <assert.h>
-
-@@ -1674,8 +1674,8 @@ B_EncryptUpdate( B_ALGORITHM_OBJ obj, PO
-
- des_set_key( (des_cblock *)kobj->data, sched );
-
-- des_ncbc_encrypt( (des_cblock *)in,
-- (des_cblock *)out,
-+ des_ncbc_encrypt( in,
-+ out,
- inlen,
- sched,
- (des_cblock *)obj->info,
-@@ -1698,8 +1698,8 @@ B_EncryptUpdate( B_ALGORITHM_OBJ obj, PO
- des_set_key( (des_cblock *)(kobj->data + 2 * sizeof(des_cblock)),
- sched3 );
-
-- des_ede3_cbc_encrypt( (des_cblock *)in,
-- (des_cblock *)out,
-+ des_ede3_cbc_encrypt( in,
-+ out,
- inlen,
- sched1, sched2, sched3,
- (des_cblock *)obj->info,
-@@ -1735,8 +1735,8 @@ B_EncryptUpdate( B_ALGORITHM_OBJ obj, PO
- kobj = (B_KEY_OBJ)obj->key;
- des_set_key( (des_cblock *)kobj->data, sched );
-
-- des_ncbc_encrypt( (des_cblock *)in_pad,
-- (des_cblock *)out,
-+ des_ncbc_encrypt( in_pad,
-+ out,
- newlen,
- sched,
- (des_cblock *)obj->info,
-@@ -1772,8 +1772,8 @@ B_EncryptUpdate( B_ALGORITHM_OBJ obj, PO
-
- des_set_key( (des_cblock *)obj->state, sched );
-
-- des_ncbc_encrypt( (des_cblock *)in_pad,
-- (des_cblock *)out,
-+ des_ncbc_encrypt( in_pad,
-+ out,
- newlen,
- sched,
- (des_cblock *)&(obj->state[8]),
-@@ -1809,8 +1809,8 @@ B_EncryptUpdate( B_ALGORITHM_OBJ obj, PO
-
- des_set_key( (des_cblock *)obj->state, sched );
-
-- des_ncbc_encrypt( (des_cblock *)in_pad,
-- (des_cblock *)out,
-+ des_ncbc_encrypt( in_pad,
-+ out,
- newlen,
- sched,
- (des_cblock *)&(obj->state[8]),
-@@ -2039,8 +2039,8 @@ B_DecryptUpdate( B_ALGORITHM_OBJ obj, PO
-
- des_set_key( (des_cblock *)kobj->data, sched );
-
-- des_ncbc_encrypt( (des_cblock *)in,
-- (des_cblock *)out,
-+ des_ncbc_encrypt( in,
-+ out,
- inlen,
- sched,
- (des_cblock *)obj->info,
-@@ -2063,8 +2063,8 @@ B_DecryptUpdate( B_ALGORITHM_OBJ obj, PO
- des_set_key( (des_cblock *)(kobj->data + 2 * sizeof(des_cblock)),
- sched3 );
-
-- des_ede3_cbc_encrypt( (des_cblock *)in,
-- (des_cblock *)out,
-+ des_ede3_cbc_encrypt( in,
-+ out,
- inlen,
- sched1, sched2, sched3,
- (des_cblock *)obj->info,
-@@ -2082,8 +2082,8 @@ B_DecryptUpdate( B_ALGORITHM_OBJ obj, PO
- kobj = (B_KEY_OBJ)obj->key;
- des_set_key( (des_cblock *)kobj->data, sched );
-
-- des_ncbc_encrypt( (des_cblock *)in,
-- (des_cblock *)out,
-+ des_ncbc_encrypt( in,
-+ out,
- inlen,
- sched,
- (des_cblock *)obj->info,
-@@ -2104,8 +2104,8 @@ B_DecryptUpdate( B_ALGORITHM_OBJ obj, PO
- kobj = (B_KEY_OBJ)obj->key;
- des_set_key( (des_cblock *)obj->state, sched );
-
-- des_ncbc_encrypt( (des_cblock *)in,
-- (des_cblock *)out,
-+ des_ncbc_encrypt( in,
-+ out,
- inlen,
- sched,
- (des_cblock *)&(obj->state[8]),
-@@ -2126,8 +2126,8 @@ B_DecryptUpdate( B_ALGORITHM_OBJ obj, PO
- kobj = (B_KEY_OBJ)obj->key;
- des_set_key( (des_cblock *)obj->state, sched );
-
-- des_ncbc_encrypt( (des_cblock *)in,
-- (des_cblock *)out,
-+ des_ncbc_encrypt( in,
-+ out,
- inlen,
- sched,
- (des_cblock *)&(obj->state[8]),
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/patches/patch-conf_mix_cfg mixmaster/patches/patch-conf_mix_cfg
--- /usr/ports/mail/mixmaster/patches/patch-conf_mix_cfg Thu Jan 1 01:00:00 1970
+++ mixmaster/patches/patch-conf_mix_cfg Fri Aug 30 09:52:02 2002
@@ -0,0 +1,8 @@
+$OpenBSD$
+--- conf/mix.cfg.orig Fri Aug 30 09:51:39 2002
++++ conf/mix.cfg Fri Aug 30 09:51:52 2002
+@@ -1,3 +1,4 @@
++SENDMAIL /usr/sbin/sendmail -t
+ ######################## Client configuration: ##########################
+ REMAIL n
+
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/patches/patch-getlist mixmaster/patches/patch-getlist
--- /usr/ports/mail/mixmaster/patches/patch-getlist Wed Jul 4 17:22:34 2001
+++ mixmaster/patches/patch-getlist Thu Jan 1 01:00:00 1970
@@ -1,37 +0,0 @@
-$OpenBSD: patch-getlist,v 1.1.1.1 2001/07/04 15:22:34 lebel Exp $
---- getlist.orig Tue Jan 19 03:29:15 1999
-+++ getlist Mon Jul 2 23:09:23 2001
-@@ -1,7 +1,14 @@
- #!/bin/sh
- # $Id: patch-getlist,v 1.1.1.1 2001/07/04 15:22:34 lebel Exp $
-+#
-+# this script has to be started in the directory containing
-+# your remailer file mix.list, type2.list and pubring.mix
-+#
-
--echo "Getting mixmaster list. Please wait ..."
-+echo "+---------------"
-+echo "| Getting mixmaster list. Please wait ..."
-+
-+cd MIXDEST
-
- for LIST in mix.list type2.list pubring.mix
- do
-@@ -24,7 +31,7 @@ do
- fi
- if grep "$PATTERN" $LIST.tmp >/dev/null
- then
-- echo "Got $LIST from $URL."
-+ echo "| Got $LIST from $URL."
- else
- rm -f $LIST.tmp
- fi
-@@ -34,6 +41,7 @@ do
- then
- mv $LIST.tmp $LIST
- else
-- echo "Could not get $LIST."
-+ echo "| Could not get $LIST."
- fi
- done
-+echo "+---------------"
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/patches/patch-mixmaster_conf mixmaster/patches/patch-mixmaster_conf
--- /usr/ports/mail/mixmaster/patches/patch-mixmaster_conf Wed Jul 4 17:22:34 2001
+++ mixmaster/patches/patch-mixmaster_conf Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
-$OpenBSD: patch-mixmaster_conf,v 1.1.1.1 2001/07/04 15:22:34 lebel Exp $
---- mixmaster.conf.orig Mon Jul 2 22:52:09 2001
-+++ mixmaster.conf Mon Jul 2 22:53:01 2001
-@@ -3,7 +3,7 @@
- # Name and path of sendmail program. The -t flag is required.
- # If you want to queue outgoing messages rather than sending them
- # immediately, use the second sendmail line.
--SENDMAIL /usr/lib/sendmail -t
-+SENDMAIL /usr/sbin/sendmail -t
- #SENDMAIL /usr/lib/sendmail -todq
-
- # Default chain for your remailer messages (0 means random remailer):
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/patches/patch-urls mixmaster/patches/patch-urls
--- /usr/ports/mail/mixmaster/patches/patch-urls Wed Jul 4 17:22:33 2001
+++ mixmaster/patches/patch-urls Thu Jan 1 01:00:00 1970
@@ -1,22 +0,0 @@
-$OpenBSD: patch-urls,v 1.1.1.1 2001/07/04 15:22:33 lebel Exp $
---- urls.orig Tue Jan 19 03:29:16 1999
-+++ urls Mon Jun 25 21:36:57 2001
-@@ -1,12 +1,6 @@
--mix.list finger:mlist_(_at_)_anon_(_dot_)_efga_(_dot_)_org
--mix.list finger:@core.zedz.net
--mix.list finger:mlist_(_at_)_anon_(_dot_)_lcs_(_dot_)_mit_(_dot_)_edu
--mix.list http://www.publius.net/mixmaster-list.html
--type2.list finger:type2-list_(_at_)_anon_(_dot_)_efga_(_dot_)_org
--type2.list http://privacy.nb.ca/remailer/type2.list
--type2.list finger:type2-list_(_at_)_anon_(_dot_)_lcs_(_dot_)_mit_(_dot_)_edu
--type2.list http://www.publius.net/type2.list
--pubring.mix finger:pubring-mix_(_at_)_anon_(_dot_)_efga_(_dot_)_org
--pubring.mix http://privacy.nb.ca/remailer/pubring.mix
--pubring.mix finger:pubring-mix_(_at_)_anon_(_dot_)_lcs_(_dot_)_mit_(_dot_)_edu
--pubring.mix http://www.publius.net/pubring.mix
-+mix.list http://mixmaster.shinn.net/stats/mlist
-+mix.list http://www.privacyresources.org/frogadmin/MyMixSta1.txt
-+type2.list http://mixmaster.shinn.net/stats/type2.list
-+type2.list http://www.privacyresources.org/frogadmin/Keys/type2.lis
-+pubring.mix http://mixmaster.shinn.net/stats/pubring.mix
-+pubring.mix http://www.privacyresources.org/frogadmin/Keys/pubring.mix
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/pkg/DEINSTALL mixmaster/pkg/DEINSTALL
--- /usr/ports/mail/mixmaster/pkg/DEINSTALL Wed Jul 4 17:22:34 2001
+++ mixmaster/pkg/DEINSTALL Mon Sep 9 14:43:26 2002
@@ -6,7 +6,7 @@
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}
+CONFIG_DIR=${SYSCONFDIR}/mixmaster
if [ -d $CONFIG_DIR ]; then
echo ""
@@ -14,13 +14,8 @@
echo "| To completely deinstall the $1 package you need to perform"
echo "| these steps as root:"
echo "|"
- echo "| rm -rf $CONFIG_DIR and/or"
+ echo "| rm -fr /var/spool/mixmaster"
echo "| rmuser mixmaster"
- echo "|"
- echo "| You can also remove any crontab entries for 'mixmaster' by"
- echo "| executing as root"
- echo "|"
- echo "| crontab -u mixmaster -r"
echo "+---------------"
echo ""
fi
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/pkg/DESCR mixmaster/pkg/DESCR
--- /usr/ports/mail/mixmaster/pkg/DESCR Wed Jul 4 17:22:34 2001
+++ mixmaster/pkg/DESCR Mon Sep 9 14:48:54 2002
@@ -20,8 +20,4 @@
destination of your choice. The recipient of such a message would
not know who had sent it.
-The addition of encryption to this scheme gave significant protection
-from attackers who simply look a the primary improvement with the
-type 2 remailer Mixmaster.
-
WWW: ${HOMEPAGE}
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/pkg/INSTALL mixmaster/pkg/INSTALL
--- /usr/ports/mail/mixmaster/pkg/INSTALL Wed Jul 4 17:22:34 2001
+++ mixmaster/pkg/INSTALL Mon Sep 9 14:43:09 2002
@@ -10,7 +10,8 @@
PREFIX=${PKG_PREFIX:-/usr/local}
MIXMASTER_BIN=${PREFIX}/sbin/mixmaster
MIXDIR=${PREFIX}/share/examples/mixmaster
-MIXDEST=${SYSCONFDIR}
+MIXDEST=${SYSCONFDIR}/mixmaster
+MIXSPOOL=/var/spool/mixmaster
# verify proper execution
#
@@ -39,7 +40,7 @@
useradd \
-g mixmaster \
-c "Anonymous Remailer" \
- -d $MIXDEST \
+ -m -d $MIXDEST \
-s /sbin/nologin \
-p \* \
mixmaster
@@ -49,21 +50,8 @@
last_message()
{
-echo "|"
echo "| Installation of mixmaster client complete."
echo "|"
-echo "| Consider updating the files"
-echo "|"
-echo "| $MIXDEST/mix.list"
-echo "| $MIXDEST/type2.list"
-echo "| $MIXDEST/pubring.mix"
-echo "|"
-echo "| periodically with a script like"
-echo "|"
-echo "| $MIXDIR/getlist"
-echo "|"
-echo "| or you might loose mail by using remailers, that are out of order now."
-echo "|"
echo "| The binary is suid 'mixmaster' and can only be executed by members of"
echo "| the group 'mixmaster'. Add all users to that group, that are allowed"
echo "| sending anonymous mail via the mixmaster network."
@@ -76,17 +64,17 @@
# install client config files
do_install()
{
+echo ""
+echo "+---------------"
if [ ! -d $MIXDEST ]
then
install -d -o mixmaster -g mixmaster -m 0710 $MIXDEST
- echo ""
- echo "+---------------"
-else
- echo ""
- echo "+---------------"
- echo "| $MIXDEST does already exist. It will not be updated by this"
+elif [ -f $MIXDEST/mix.cfg ]
+then
+ echo "| $MIXDEST/mix.cfg does already exist. It will not be updated by this"
echo "| script. If this is not your intention, please deinstall mixmaster,"
echo "| delete $MIXDEST and reinstall."
+ echo "|"
last_message
fi
@@ -97,10 +85,17 @@
fi
cd $MIXDIR
-for i in "mixmaster.conf type2.list pubring.mix mix.list urls"
+for i in "mix.cfg mlist.txt pubring.mix type2.list *.blk"
do
install -o mixmaster -g mixmaster -m 0640 $i $MIXDEST
done
+
+if [ ! -d $MIXSPOOL ]
+then
+ install -d -o mixmaster -g mixmaster -m 0770 $MIXSPOOL
+fi
+ln -s $MIXSPOOL $MIXDEST/pool
+chmod 0770 $MIXDEST/pool
last_message
}
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/pkg/PLIST mixmaster/pkg/PLIST
--- /usr/ports/mail/mixmaster/pkg/PLIST Wed Jul 4 17:22:34 2001
+++ mixmaster/pkg/PLIST Mon Sep 9 14:41:38 2002
@@ -1,17 +1,28 @@
-_(_at_)_comment $OpenBSD: PLIST,v 1.1.1.1 2001/07/04 15:22:34 lebel Exp $
+_(_at_)_comment $OpenBSD$
sbin/mixmaster
man/man1/mixmaster.1
-share/examples/mixmaster/destination.block
-share/examples/mixmaster/getlist
-share/examples/mixmaster/headers.del
-share/examples/mixmaster/keyinfo.txt.in
-share/examples/mixmaster/mix.help
-share/examples/mixmaster/mix.help.in
-share/examples/mixmaster/mix.list
-share/examples/mixmaster/mixmaster.conf
-share/examples/mixmaster/mixmaster.conf.in
+share/examples/mixmaster/README
+share/examples/mixmaster/abuse.txt.in
+share/examples/mixmaster/adminkey.txt
+share/examples/mixmaster/blocked.txt.in
+share/examples/mixmaster/dest.alw
+share/examples/mixmaster/dest.blk
+share/examples/mixmaster/end.hlp
+share/examples/mixmaster/header.blk
+share/examples/mixmaster/intro.hlp
+share/examples/mixmaster/mix.cfg
+share/examples/mixmaster/mix.cfg.ex
+share/examples/mixmaster/mix.hlp
+share/examples/mixmaster/mlist.txt
+share/examples/mixmaster/news.hlp
+share/examples/mixmaster/pgp.hlp
+share/examples/mixmaster/pgponly.hlp
+share/examples/mixmaster/pubring.asc
share/examples/mixmaster/pubring.mix
-share/examples/mixmaster/source.block
+share/examples/mixmaster/rab.blk
+share/examples/mixmaster/reply.txt.in
+share/examples/mixmaster/rlist.txt
+share/examples/mixmaster/type1.hlp
share/examples/mixmaster/type2.list
-share/examples/mixmaster/urls
+share/examples/mixmaster/usage.txt.in
@dirrm share/examples/mixmaster
Visit your host, monkey.org