Author: jue Date: 2006-03-12 12:12:18 +0100 (Sun, 12 Mar 2006) New Revision: 914 Added: crux-2.1/ports/opt/popa3d/popa3d-config.patch crux-2.2/ports/opt/popa3d/popa3d-config.patch Removed: crux-2.1/ports/opt/popa3d/popa3d-1.0.patch crux-2.2/ports/opt/popa3d/popa3d-1.0.patch Modified: crux-2.1/ports/opt/popa3d/.md5sum crux-2.1/ports/opt/popa3d/Pkgfile crux-2.2/ports/opt/popa3d/.md5sum crux-2.2/ports/opt/popa3d/Pkgfile Log: popa3d: update to 1.0.1 Modified: crux-2.1/ports/opt/popa3d/.md5sum =================================================================== --- crux-2.1/ports/opt/popa3d/.md5sum 2006-03-12 11:08:04 UTC (rev 913) +++ crux-2.1/ports/opt/popa3d/.md5sum 2006-03-12 11:12:18 UTC (rev 914) @@ -1,3 +1,3 @@ 3baf2cb939f1783406096bc7bf4742f7 popa3d -8c6db4e265bf81a16fb9e0cbdfb90049 popa3d-1.0.patch -2e0f91765ff5935bbc24626f02a69ada popa3d-1.0.tar.gz +a1540e9cf856247d32f61c3cb881b127 popa3d-1.0.1.tar.gz +9c5e5760429b5d0cb24f55240c666090 popa3d-config.patch Modified: crux-2.1/ports/opt/popa3d/Pkgfile =================================================================== --- crux-2.1/ports/opt/popa3d/Pkgfile 2006-03-12 11:08:04 UTC (rev 913) +++ crux-2.1/ports/opt/popa3d/Pkgfile 2006-03-12 11:12:18 UTC (rev 914) @@ -3,14 +3,14 @@ # Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de name=popa3d -version=1.0 -release=2 +version=1.0.1 +release=1 source=(http://www.openwall.com/popa3d/$name-$version.tar.gz \ - $name-$version.patch popa3d) + $name-config.patch popa3d) build () { cd $name-$version - patch -p1 < $SRC/$name-$version.patch + patch -p1 < $SRC/$name-config.patch make make DESTDIR=$PKG install install -D -m 755 $SRC/popa3d $PKG/etc/rc.d/popa3d Deleted: crux-2.1/ports/opt/popa3d/popa3d-1.0.patch =================================================================== --- crux-2.1/ports/opt/popa3d/popa3d-1.0.patch 2006-03-12 11:08:04 UTC (rev 913) +++ crux-2.1/ports/opt/popa3d/popa3d-1.0.patch 2006-03-12 11:12:18 UTC (rev 914) @@ -1,67 +0,0 @@ -diff -Nru popa3d-1.0.orig/Makefile popa3d-1.0/Makefile ---- popa3d-1.0.orig/Makefile 2005-09-09 21:03:30.000000000 +0200 -+++ popa3d-1.0/Makefile 2005-09-09 21:03:44.000000000 +0200 -@@ -3,13 +3,13 @@ - RM = rm -f - MKDIR = mkdir -p - INSTALL = install -c --CFLAGS = -Wall -O2 -fomit-frame-pointer -+CFLAGS += -Wall -fomit-frame-pointer - # You may use OpenSSL's MD5 routines instead of the ones supplied here - #CFLAGS += -DHAVE_OPENSSL - LDFLAGS = -s - LIBS = - # Linux with glibc, FreeBSD, NetBSD --#LIBS += -lcrypt -+LIBS += -lcrypt - # HP-UX trusted system - #LIBS += -lsec - # Solaris (POP_STANDALONE, POP_VIRTUAL) -@@ -24,7 +24,7 @@ - #LIBS += -lcrypto - - DESTDIR = --PREFIX = /usr/local -+PREFIX = /usr - SBINDIR = $(PREFIX)/sbin - MANDIR = $(PREFIX)/man - -diff -Nru popa3d-1.0.orig/params.h popa3d-1.0/params.h ---- popa3d-1.0.orig/params.h 2005-09-09 21:03:30.000000000 +0200 -+++ popa3d-1.0/params.h 2005-09-09 21:03:44.000000000 +0200 -@@ -13,7 +13,7 @@ - /* - * Are we going to be a standalone server or start via an inetd clone? - */ --#define POP_STANDALONE 0 -+#define POP_STANDALONE 1 - - #if POP_STANDALONE - -@@ -103,7 +103,7 @@ - * A pseudo-user to run as before authentication. The user and its UID - * must not be used for any other purpose. - */ --#define POP_USER POP_SERVER -+#define POP_USER "mail" - - /* - * An empty directory to chroot to before authentication. The directory -@@ -191,7 +191,7 @@ - * - * #undef this for qmail-style $HOME/Mailbox mailboxes. - */ --#define MAIL_SPOOL_PATH "/var/mail" -+#define MAIL_SPOOL_PATH "/var/spool/mail" - - #ifndef MAIL_SPOOL_PATH - /* -@@ -216,7 +216,7 @@ - */ - #define SYSLOG_IDENT POP_SERVER - #define SYSLOG_OPTIONS LOG_PID --#define SYSLOG_FACILITY LOG_DAEMON -+#define SYSLOG_FACILITY LOG_MAIL - #define SYSLOG_PRI_LO LOG_INFO - #define SYSLOG_PRI_HI LOG_NOTICE - #define SYSLOG_PRI_ERROR LOG_CRIT Copied: crux-2.1/ports/opt/popa3d/popa3d-config.patch (from rev 912, crux-2.1/ports/opt/popa3d/popa3d-1.0.patch) =================================================================== --- crux-2.1/ports/opt/popa3d/popa3d-1.0.patch 2006-03-12 10:47:04 UTC (rev 912) +++ crux-2.1/ports/opt/popa3d/popa3d-config.patch 2006-03-12 11:12:18 UTC (rev 914) @@ -0,0 +1,67 @@ +diff -Nru popa3d-1.0.1.orig/Makefile popa3d-1.0.1/Makefile +--- popa3d-1.0.1.orig/Makefile 2006-03-12 11:39:29.000000000 +0100 ++++ popa3d-1.0.1/Makefile 2006-03-12 11:39:40.000000000 +0100 +@@ -3,13 +3,13 @@ + RM = rm -f + MKDIR = mkdir -p + INSTALL = install -c +-CFLAGS = -Wall -O2 -fomit-frame-pointer ++CFLAGS += -Wall -fomit-frame-pointer + # You may use OpenSSL's MD5 routines instead of the ones supplied here + #CFLAGS += -DHAVE_OPENSSL + LDFLAGS = -s + LIBS = + # Linux with glibc, FreeBSD, NetBSD +-#LIBS += -lcrypt ++LIBS += -lcrypt + # HP-UX trusted system + #LIBS += -lsec + # Solaris (POP_STANDALONE, POP_VIRTUAL) +@@ -24,7 +24,7 @@ + #LIBS += -lcrypto + + DESTDIR = +-PREFIX = /usr/local ++PREFIX = /usr + SBINDIR = $(PREFIX)/sbin + MANDIR = $(PREFIX)/man + +diff -Nru popa3d-1.0.1.orig/params.h popa3d-1.0.1/params.h +--- popa3d-1.0.1.orig/params.h 2006-03-12 11:39:29.000000000 +0100 ++++ popa3d-1.0.1/params.h 2006-03-12 11:39:40.000000000 +0100 +@@ -13,7 +13,7 @@ + /* + * Are we going to be a standalone server or start via an inetd clone? + */ +-#define POP_STANDALONE 0 ++#define POP_STANDALONE 1 + + #if POP_STANDALONE + +@@ -103,7 +103,7 @@ + * A pseudo-user to run as before authentication. The user and its UID + * must not be used for any other purpose. + */ +-#define POP_USER POP_SERVER ++#define POP_USER "mail" + + /* + * An empty directory to chroot to before authentication. The directory +@@ -191,7 +191,7 @@ + * + * #undef this for qmail-style $HOME/Mailbox mailboxes. + */ +-#define MAIL_SPOOL_PATH "/var/mail" ++#define MAIL_SPOOL_PATH "/var/spool/mail" + + #ifndef MAIL_SPOOL_PATH + /* +@@ -216,7 +216,7 @@ + */ + #define SYSLOG_IDENT POP_SERVER + #define SYSLOG_OPTIONS LOG_PID +-#define SYSLOG_FACILITY LOG_DAEMON ++#define SYSLOG_FACILITY LOG_MAIL + #define SYSLOG_PRI_LO LOG_INFO + #define SYSLOG_PRI_HI LOG_NOTICE + #define SYSLOG_PRI_ERROR LOG_CRIT Modified: crux-2.2/ports/opt/popa3d/.md5sum =================================================================== --- crux-2.2/ports/opt/popa3d/.md5sum 2006-03-12 11:08:04 UTC (rev 913) +++ crux-2.2/ports/opt/popa3d/.md5sum 2006-03-12 11:12:18 UTC (rev 914) @@ -1,3 +1,3 @@ 3baf2cb939f1783406096bc7bf4742f7 popa3d -8c6db4e265bf81a16fb9e0cbdfb90049 popa3d-1.0.patch -2e0f91765ff5935bbc24626f02a69ada popa3d-1.0.tar.gz +a1540e9cf856247d32f61c3cb881b127 popa3d-1.0.1.tar.gz +9c5e5760429b5d0cb24f55240c666090 popa3d-config.patch Modified: crux-2.2/ports/opt/popa3d/Pkgfile =================================================================== --- crux-2.2/ports/opt/popa3d/Pkgfile 2006-03-12 11:08:04 UTC (rev 913) +++ crux-2.2/ports/opt/popa3d/Pkgfile 2006-03-12 11:12:18 UTC (rev 914) @@ -3,14 +3,14 @@ # Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de name=popa3d -version=1.0 -release=2 +version=1.0.1 +release=1 source=(http://www.openwall.com/popa3d/$name-$version.tar.gz \ - $name-$version.patch popa3d) + $name-config.patch popa3d) build () { cd $name-$version - patch -p1 < $SRC/$name-$version.patch + patch -p1 < $SRC/$name-config.patch make make DESTDIR=$PKG install install -D -m 755 $SRC/popa3d $PKG/etc/rc.d/popa3d Deleted: crux-2.2/ports/opt/popa3d/popa3d-1.0.patch =================================================================== --- crux-2.2/ports/opt/popa3d/popa3d-1.0.patch 2006-03-12 11:08:04 UTC (rev 913) +++ crux-2.2/ports/opt/popa3d/popa3d-1.0.patch 2006-03-12 11:12:18 UTC (rev 914) @@ -1,67 +0,0 @@ -diff -Nru popa3d-1.0.orig/Makefile popa3d-1.0/Makefile ---- popa3d-1.0.orig/Makefile 2005-09-09 21:03:30.000000000 +0200 -+++ popa3d-1.0/Makefile 2005-09-09 21:03:44.000000000 +0200 -@@ -3,13 +3,13 @@ - RM = rm -f - MKDIR = mkdir -p - INSTALL = install -c --CFLAGS = -Wall -O2 -fomit-frame-pointer -+CFLAGS += -Wall -fomit-frame-pointer - # You may use OpenSSL's MD5 routines instead of the ones supplied here - #CFLAGS += -DHAVE_OPENSSL - LDFLAGS = -s - LIBS = - # Linux with glibc, FreeBSD, NetBSD --#LIBS += -lcrypt -+LIBS += -lcrypt - # HP-UX trusted system - #LIBS += -lsec - # Solaris (POP_STANDALONE, POP_VIRTUAL) -@@ -24,7 +24,7 @@ - #LIBS += -lcrypto - - DESTDIR = --PREFIX = /usr/local -+PREFIX = /usr - SBINDIR = $(PREFIX)/sbin - MANDIR = $(PREFIX)/man - -diff -Nru popa3d-1.0.orig/params.h popa3d-1.0/params.h ---- popa3d-1.0.orig/params.h 2005-09-09 21:03:30.000000000 +0200 -+++ popa3d-1.0/params.h 2005-09-09 21:03:44.000000000 +0200 -@@ -13,7 +13,7 @@ - /* - * Are we going to be a standalone server or start via an inetd clone? - */ --#define POP_STANDALONE 0 -+#define POP_STANDALONE 1 - - #if POP_STANDALONE - -@@ -103,7 +103,7 @@ - * A pseudo-user to run as before authentication. The user and its UID - * must not be used for any other purpose. - */ --#define POP_USER POP_SERVER -+#define POP_USER "mail" - - /* - * An empty directory to chroot to before authentication. The directory -@@ -191,7 +191,7 @@ - * - * #undef this for qmail-style $HOME/Mailbox mailboxes. - */ --#define MAIL_SPOOL_PATH "/var/mail" -+#define MAIL_SPOOL_PATH "/var/spool/mail" - - #ifndef MAIL_SPOOL_PATH - /* -@@ -216,7 +216,7 @@ - */ - #define SYSLOG_IDENT POP_SERVER - #define SYSLOG_OPTIONS LOG_PID --#define SYSLOG_FACILITY LOG_DAEMON -+#define SYSLOG_FACILITY LOG_MAIL - #define SYSLOG_PRI_LO LOG_INFO - #define SYSLOG_PRI_HI LOG_NOTICE - #define SYSLOG_PRI_ERROR LOG_CRIT Copied: crux-2.2/ports/opt/popa3d/popa3d-config.patch (from rev 909, crux-2.2/ports/opt/popa3d/popa3d-1.0.patch) =================================================================== --- crux-2.2/ports/opt/popa3d/popa3d-1.0.patch 2006-03-11 17:45:24 UTC (rev 909) +++ crux-2.2/ports/opt/popa3d/popa3d-config.patch 2006-03-12 11:12:18 UTC (rev 914) @@ -0,0 +1,67 @@ +diff -Nru popa3d-1.0.1.orig/Makefile popa3d-1.0.1/Makefile +--- popa3d-1.0.1.orig/Makefile 2006-03-12 11:39:29.000000000 +0100 ++++ popa3d-1.0.1/Makefile 2006-03-12 11:39:40.000000000 +0100 +@@ -3,13 +3,13 @@ + RM = rm -f + MKDIR = mkdir -p + INSTALL = install -c +-CFLAGS = -Wall -O2 -fomit-frame-pointer ++CFLAGS += -Wall -fomit-frame-pointer + # You may use OpenSSL's MD5 routines instead of the ones supplied here + #CFLAGS += -DHAVE_OPENSSL + LDFLAGS = -s + LIBS = + # Linux with glibc, FreeBSD, NetBSD +-#LIBS += -lcrypt ++LIBS += -lcrypt + # HP-UX trusted system + #LIBS += -lsec + # Solaris (POP_STANDALONE, POP_VIRTUAL) +@@ -24,7 +24,7 @@ + #LIBS += -lcrypto + + DESTDIR = +-PREFIX = /usr/local ++PREFIX = /usr + SBINDIR = $(PREFIX)/sbin + MANDIR = $(PREFIX)/man + +diff -Nru popa3d-1.0.1.orig/params.h popa3d-1.0.1/params.h +--- popa3d-1.0.1.orig/params.h 2006-03-12 11:39:29.000000000 +0100 ++++ popa3d-1.0.1/params.h 2006-03-12 11:39:40.000000000 +0100 +@@ -13,7 +13,7 @@ + /* + * Are we going to be a standalone server or start via an inetd clone? + */ +-#define POP_STANDALONE 0 ++#define POP_STANDALONE 1 + + #if POP_STANDALONE + +@@ -103,7 +103,7 @@ + * A pseudo-user to run as before authentication. The user and its UID + * must not be used for any other purpose. + */ +-#define POP_USER POP_SERVER ++#define POP_USER "mail" + + /* + * An empty directory to chroot to before authentication. The directory +@@ -191,7 +191,7 @@ + * + * #undef this for qmail-style $HOME/Mailbox mailboxes. + */ +-#define MAIL_SPOOL_PATH "/var/mail" ++#define MAIL_SPOOL_PATH "/var/spool/mail" + + #ifndef MAIL_SPOOL_PATH + /* +@@ -216,7 +216,7 @@ + */ + #define SYSLOG_IDENT POP_SERVER + #define SYSLOG_OPTIONS LOG_PID +-#define SYSLOG_FACILITY LOG_DAEMON ++#define SYSLOG_FACILITY LOG_MAIL + #define SYSLOG_PRI_LO LOG_INFO + #define SYSLOG_PRI_HI LOG_NOTICE + #define SYSLOG_PRI_ERROR LOG_CRIT