X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fpkg%2Fuw-imap;h=acaaad529f0a16d14174b758f509906d53621e8b;hb=4e78d26dd7f5e46a21cdc916e031f1b4a68578c0;hp=8f10d493c16b3f46b0690c444641b0cf41464a2b;hpb=f3c8db3027d5dc530e1f30c88e0235975211582e;p=hvlinux.git

diff --git a/stage5/pkg/uw-imap b/stage5/pkg/uw-imap
index 8f10d49..acaaad5 100644
--- a/stage5/pkg/uw-imap
+++ b/stage5/pkg/uw-imap
@@ -2,35 +2,46 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     # Setting default mailbox format for imapd
     sed -i -e "s!^\(CREATEPROTO=\)unixproto!\1${MAILBOX_FORMAT}proto!" \
         src/osdep/unix/Makefile
     make lnp
 
     # Installing imapd
-    install -m 755 imapd/imapd /usr/bin
-    install -m 644 src/imapd/imapd.8 /usr/man/man8/imapd.8
+    install -v -m 755 imapd/imapd /usr/bin
+    install -v -m 644 src/imapd/imapd.8 /usr/man/man8/imapd.8
 
     # Installing mailutil
-    install -m 755 mailutil/mailutil /usr/bin
-    install -m 644 src/mailutil/mailutil.1 /usr/man/man1/mailutil.1
+    install -v -m 755 mailutil/mailutil /usr/bin
+    install -v -m 644 src/mailutil/mailutil.1 /usr/man/man1/mailutil.1
 
     # Installing dmail
-    install -m 755 dmail/dmail /usr/bin
-    install -m 644 src/dmail/dmail.1 /usr/man/man1/dmail.1
+    install -v -m 755 dmail/dmail /usr/bin
+    install -v -m 644 src/dmail/dmail.1 /usr/man/man1/dmail.1
 
     # Installing C-library
     mkdir -p /usr/lib/uw-imap/{include,lib}
-    install -m 644 c-client/c-client.a /usr/lib/uw-imap/lib
+    install -v -m 644 c-client/c-client.a /usr/lib/uw-imap/lib
     ln -sf /usr/lib/uw-imap/lib/c-client.a /usr/lib/uw-imap/lib/libc-client.a
-    install -m 644 c-client/*.h /usr/lib/uw-imap/include
-    install -m 644 src/osdep/tops-20/shortsym.h /usr/lib/uw-imap/include
+    install -v -m 644 c-client/*.h /usr/lib/uw-imap/include
+    install -v -m 644 src/osdep/tops-20/shortsym.h /usr/lib/uw-imap/include
+}
 
-    # Addition to /etc/inetd.conf
-    string_add "imaps stream tcp nowait.400 root /usr/bin/imapd imapd" \
-        /etc/inetd.conf
+hvbuild_post()
+{
+    # Addition to xinetd
+    cat > /etc/xinetd.d/imapd << "EOF"
+service imap
+{
+   disable        = no
+   socket_type    = stream
+   protocol       = tcp
+   wait           = no
+   user           = root
+   server         = /usr/bin/imapd
+   log_type       = SYSLOG local4 info
+}
+EOF
 
     # Addition to /etc/services
     string_add "imaps     993/tcp " /etc/services