[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openbsd-ports
Subject:    update: mail/mixmaster
From:       Nikolay Sturm <sturm () sec ! informatik ! tu-darmstadt ! de>
Date:       2002-10-28 12:21:15
[Download RAW message or body]

Hi!

Attached is an update of mixmaster to version 2.9b40. Mainly minor
bugfixes.

Please comment and/or commit.

Thanks and bye,

Nikolay

-- 
OpenPGP: 0x5C0878D2 - BB55 EDCF A1F6 8057 B953  4C66 EFBD BA73 5C08 78D2

["mix.diff" (text/plain)]

diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/Makefile ./Makefile
--- /usr/ports/mail/mixmaster/Makefile	Mon Sep 16 08:51:30 2002
+++ ./Makefile	Mon Oct 28 11:08:12 2002
@@ -2,7 +2,7 @@
 
 COMMENT=	"client for anonymous remailing"
 
-VERSION=	2.9b37
+VERSION=	2.9b40
 DISTNAME=	mixmaster-${VERSION}
 CATEGORIES=	mail security
 
@@ -23,10 +23,7 @@
 
 MAKE_ENV=	SYSCONFDIR="${SYSCONFDIR}/mixmaster"
 
-.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
+MIXMASTER_FILES=	${WRKDIST}/conf/* ${WRKDIST}/README
 
 post-patch:
 	@cp files/Makefile ${WRKSRC}
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/distinfo ./distinfo
--- /usr/ports/mail/mixmaster/distinfo	Mon Sep 16 08:51:30 2002
+++ ./distinfo	Mon Oct 28 10:57:47 2002
@@ -1,3 +1,3 @@
-MD5 (mixmaster-2.9b37.tar.gz) = 6aac826101afa8a9f5e8bb54a2b5db03
-RMD160 (mixmaster-2.9b37.tar.gz) = 97c611917e9db9f3ae85cd26b261dc9f4cd60895
-SHA1 (mixmaster-2.9b37.tar.gz) = f1dfb872ee36cc7831c8904fe48743f6f3d031c9
+MD5 (mixmaster-2.9b40.tar.gz) = 3a40425caf61c67dd05d7239c91fe134
+RMD160 (mixmaster-2.9b40.tar.gz) = a6e251409cd6265710de4751486882b02965a244
+SHA1 (mixmaster-2.9b40.tar.gz) = 513d79704e9962b26749707b324349fb8266941c
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/files/Makefile ./files/Makefile
--- /usr/ports/mail/mixmaster/files/Makefile	Sat Sep 14 17:21:14 2002
+++ ./files/Makefile	Mon Oct 28 11:13:06 2002
@@ -10,7 +10,7 @@
 
 # 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)"' +DEF =  -DUSE_ZLIB -DUSE_PCRE \
-DUSE_NCURSES -DHAVE_NCURSES_H -DUSE_SOCK -DSPOOL='"$(SYSCONFDIR)"'  LIBS =   \
pcre-2.08/libpcre.a    LDFLAGS =  -lz  -lcrypto -lcurses
 
@@ -19,7 +19,7 @@
 # OPT = -O2 -Wall
 
 CFLAGS += $(INC) $(DEF) $(OPT)
-#CC ?= gcc
+CC ?= gcc
 AR = ar rc
 RANLIB = ranlib
 #MAKE = make
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/patches/patch-conf_mix_cfg \
                ./patches/patch-conf_mix_cfg
--- /usr/ports/mail/mixmaster/patches/patch-conf_mix_cfg	Sat Sep 14 17:21:14 2002
+++ ./patches/patch-conf_mix_cfg	Mon Oct 28 13:17:46 2002
@@ -1,8 +1,9 @@
 $OpenBSD: patch-conf_mix_cfg,v 1.1 2002/09/14 15:21:14 naddy Exp $
---- 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 @@
+--- conf/mix.cfg.orig	Wed Oct 31 09:19:55 2001
++++ conf/mix.cfg	Mon Oct 28 13:17:39 2002
+@@ -1,3 +1,5 @@
 +SENDMAIL        /usr/sbin/sendmail -t
++POOL            /var/spool/mixmaster
  ######################## Client configuration: ##########################
  REMAIL          n
  
diff -uNr --exclude=CVS /usr/ports/mail/mixmaster/pkg/INSTALL ./pkg/INSTALL
--- /usr/ports/mail/mixmaster/pkg/INSTALL	Mon Sep 16 08:51:30 2002
+++ ./pkg/INSTALL	Mon Oct 28 13:14:10 2002
@@ -85,7 +85,7 @@
 fi
 
 cd $MIXDIR
-for i in "mix.cfg mlist.txt pubring.mix type2.list *.blk"
+for i in "mix.cfg mlist.txt pubring.mix *.blk"
 do
   install -o mixmaster -g mixmaster -m 0640 $i $MIXDEST
 done
@@ -94,8 +94,6 @@
 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 ./pkg/PLIST
--- /usr/ports/mail/mixmaster/pkg/PLIST	Mon Sep 16 08:51:30 2002
+++ ./pkg/PLIST	Mon Oct 28 11:17:23 2002
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.2 2002/09/14 15:21:14 naddy Exp $
-sbin/mixmaster
+@comment $OpenBSD$
 man/man1/mixmaster.1
+sbin/mixmaster
 share/examples/mixmaster/README
 share/examples/mixmaster/abuse.txt.in
 share/examples/mixmaster/adminkey.txt
@@ -12,6 +12,7 @@
 share/examples/mixmaster/intro.hlp
 share/examples/mixmaster/mix.cfg
 share/examples/mixmaster/mix.cfg.ex
+@comment share/examples/mixmaster/mix.cfg.orig
 share/examples/mixmaster/mix.hlp
 share/examples/mixmaster/mlist.txt
 share/examples/mixmaster/news.hlp
@@ -23,6 +24,5 @@
 share/examples/mixmaster/reply.txt.in
 share/examples/mixmaster/rlist.txt
 share/examples/mixmaster/type1.hlp
-share/examples/mixmaster/type2.list
 share/examples/mixmaster/usage.txt.in
 @dirrm share/examples/mixmaster



[prev in list] [next in list] [prev in thread] [next in thread]