[SM-Commit] GIT changes to master z-rejected grimoire by Elisamuel Resto (4c907deff9dc0e98fc6c08ffe71bc4ccfe34bc7e)

Elisamuel Resto scm at sourcemage.org
Fri May 18 19:28:22 EDT 2007


GIT changes to master z-rejected grimoire by Elisamuel Resto <ryuji at mages.ath.cx>:

 ChangeLog                                |    5 
 z-mail/c-client/BUILD                    |   22 ---
 z-mail/c-client/CONFLICTS                |    1 
 z-mail/c-client/DEPENDS                  |    3 
 z-mail/c-client/DETAILS                  |   13 --
 z-mail/c-client/HISTORY                  |   20 ---
 z-mail/c-client/INSTALL                  |    3 
 z-mail/c-client/PROVIDES                 |    1 
 z-mail/imap/BUILD                        |   24 ----
 z-mail/imap/CONFIGURE                    |   13 --
 z-mail/imap/CONFLICTS                    |    4 
 z-mail/imap/DEPENDS                      |   12 --
 z-mail/imap/DETAILS                      |   15 --
 z-mail/imap/FINAL                        |    7 -
 z-mail/imap/HISTORY                      |  186 -------------------------------
 z-mail/imap/INSTALL                      |   22 ---
 z-mail/imap/PROVIDES                     |    2 
 z-mail/imap/TRIGGERS                     |    7 -
 z-mail/imap/imapd-stunnel_withoutopenssl |   17 --
 z-mail/imap/mailsubdir.patch             |   12 --
 z-mail/imap/pam.d/imap                   |    7 -
 z-mail/imap/pam.d/pop                    |    7 -
 z-mail/imap/pop3-stunnel_withoutopenssl  |   17 --
 z-mail/imap/services                     |   12 --
 z-mail/imap/xinetd.d/imapd               |   14 --
 z-mail/imap/xinetd.d/imapd-stunnel       |   17 --
 z-mail/imap/xinetd.d/pop3                |   14 --
 z-mail/imap/xinetd.d/pop3-stunnel        |   17 --
 28 files changed, 5 insertions(+), 489 deletions(-)

New commits:
commit 4c907deff9dc0e98fc6c08ffe71bc4ccfe34bc7e
Author: Elisamuel Resto <ryuji at mages.ath.cx>
Commit: Elisamuel Resto <ryuji at mages.ath.cx>

    z-mail/imap, z-mail/c-client: Moved to test due to licence change to APACHE
    from upstream, deleted from z-rejected since it now is in stable.

diff --git a/ChangeLog b/ChangeLog
index 27c6e4d..d385c1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-18 Elisamuel Resto <ryuji at mages.ath.cx>
+	* z-mail/imap, z-mail/c-client: Moved to test due to licence change
+	  to APACHE from upstream, deleted from z-rejected since it now is in
+	  stable.
+
 2007-05-13 Colin "Phoul" Childs <phoul at sourcemage.org>
 	* z-kernels/nvidia_legacy: Version bump to clear up download issues.
 
diff --git a/z-mail/c-client/BUILD b/z-mail/c-client/BUILD
deleted file mode 100755
index 64aa257..0000000
--- a/z-mail/c-client/BUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-if echo $OPTS | grep -q with-openssl; then
-  message "${MESSAGE_COLOR}Building with OpenSSL...${DEFAULT_COLOR}" &&
-  SSLOPTS="SSLTYPE=unix                                 \
-           SSLCERTS=$INSTALL_ROOT/etc/ssl/certs         \
-           SSLINCLUDE=$INSTALL_ROOT/usr/include/openssl \
-           SSLLIB=$INSTALL_ROOT/usr/lib                 \
-           SSLTYPE=unix"
-else
-  message "${MESSAGE_COLOR}Building without OpenSSL...${DEFAULT_COLOR}" &&
-  SSLOPTS='SSLTYPE=none'
-fi &&
-if echo $OPTS | grep -q with-pam; then
-  TARGET=lnp
-else
-  TARGET=slx
-fi &&
-
-# the trick to building c-client only is to remove the target named "bundled"
-# from the dependents list of default target "build"
-sedit 's|^\(build:.*\)bundled|\1|g' Makefile &&
-
-yes | make $SSLOPTS EXTRACFLAGS="$CFLAGS" $TARGET
diff --git a/z-mail/c-client/CONFLICTS b/z-mail/c-client/CONFLICTS
deleted file mode 100755
index f1729ad..0000000
--- a/z-mail/c-client/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts imap
diff --git a/z-mail/c-client/DEPENDS b/z-mail/c-client/DEPENDS
deleted file mode 100755
index 3f87da9..0000000
--- a/z-mail/c-client/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-# The '--' options are bogus, they're only used by the spell itself
-optional_depends openssl '--with-openssl' '--without-openssl' 'for SSL/TLS support' &&
-optional_depends linux-pam '--with-pam' '--without-pam' 'for PAM support'
diff --git a/z-mail/c-client/DETAILS b/z-mail/c-client/DETAILS
deleted file mode 100755
index 2ca717e..0000000
--- a/z-mail/c-client/DETAILS
+++ /dev/null
@@ -1,13 +0,0 @@
-           SPELL=c-client
-         VERSION=2006e
-     SOURCE_HASH=sha512:a05bf9373a8eb59aaa9abfba2c0693a1e1042f5b0e463d0ec218899510b5accacada0e73c8e2cd1ef58829b703dfc1c544b04f3b8e5cdcd2cf665d1697b9f9f9
-          SOURCE=imap-$VERSION.tar.Z
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/imap-$VERSION
-   SOURCE_URL[0]=ftp://ftp.cac.washington.edu/imap/$SOURCE
-        WEB_SITE=http://www.washington.edu/imap/
-         ENTERED=20050411
-      LICENSE[0]=APACHE
-           SHORT='University of Washington IMAP/POP/SMTP/NNTP client library'
-cat << EOF
-The IMAP4rev1, POP3, SMTP and NNTP client API library, a.k.a. c-client.
-EOF
diff --git a/z-mail/c-client/HISTORY b/z-mail/c-client/HISTORY
deleted file mode 100644
index 359dee9..0000000
--- a/z-mail/c-client/HISTORY
+++ /dev/null
@@ -1,20 +0,0 @@
-2007-01-30 Elisamuel Resto <ryuji at mages.ath.cx>
-	* DETAILS: version bump to 2006e, changed license to APACHE
-
-2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* PROVIDES: [automated] Fixed invalid entries.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2005-10-03 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgarde to 2004g; replace $SPELL with `imap' in SOURCE_URL.
-
-2005-04-12 Sergey Lipnevich <sergey at sourcemage.org>
-	* BUILD: pass our CFLAGS using EXTRACFLAGS make variable.
-
-2005-04-11 Sergey Lipnevich <sergey at sourcemage.org>
-	* ALL: spell created from current imap spell.
diff --git a/z-mail/c-client/INSTALL b/z-mail/c-client/INSTALL
deleted file mode 100755
index 0fb7e88..0000000
--- a/z-mail/c-client/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-mkdir -p                        $INSTALL_ROOT/usr/include/imap      &&
-cp    -vf ./c-client/*.h        $INSTALL_ROOT/usr/include/imap/     &&
-cp    -vf ./c-client/c-client.a $INSTALL_ROOT/usr/lib/libc-client.a
diff --git a/z-mail/c-client/PROVIDES b/z-mail/c-client/PROVIDES
deleted file mode 100755
index 2936167..0000000
--- a/z-mail/c-client/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-C-CLIENT
diff --git a/z-mail/imap/BUILD b/z-mail/imap/BUILD
deleted file mode 100755
index b84f5ec..0000000
--- a/z-mail/imap/BUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-if  [  "$IMAP_MAILSUBDIR"  ==  "y"  ];  then
-  patch  -p1  <  $SCRIPT_DIRECTORY/mailsubdir.patch
-fi  &&
-
-if  [  "$IMAP_SSL"  ==  "y"  ];  then
-  message "${MESSAGE_COLOR}Building with OpenSSL...${DEFAULT_COLOR}" &&
-  SSLOPTS="SSLTYPE=unix                     \
-           SSLCERTS=/etc/ssl/certs          \
-           SSLINCLUDE=/usr/include/openssl  \
-           SSLLIB=/usr/lib                  \
-           SSLTYPE=unix"
-else
-  message "${MESSAGE_COLOR}Building without OpenSSL...${DEFAULT_COLOR}" &&
-  SSLOPTS="SSLTYPE=none"
-fi  &&
-
-if  [  "$IMAP_PAM"  ==  "y"  ];  then
-  message "${MESSAGE_COLOR}Building with PAM...${DEFAULT_COLOR}"     &&
-  TARGET=lnp
-else
-  TARGET=slx
-fi  &&
-
-yes | make EXTRACFLAGS="$CFLAGS" $SSLOPTS $TARGET
diff --git a/z-mail/imap/CONFIGURE b/z-mail/imap/CONFIGURE
deleted file mode 100755
index 0ee92ba..0000000
--- a/z-mail/imap/CONFIGURE
+++ /dev/null
@@ -1,13 +0,0 @@
-config_query  IMAP_MAILSUBDIR  "Apply patch to use ~/.imap/ as a mail sub-directory?"  y  &&
-
-if  spell_ok openssl;  then
-  config_query  IMAP_SSL  "Use openssl (for stunnel) for imapds?"  y
-else
-  config_query  IMAP_SSL  "Use openssl (for stunnel) for imapds?"  n
-fi  &&
-
-if  spell_ok  linux-pam;  then
-  config_query  IMAP_PAM  "Use Linux-PAM for PAM authentication?"  y
-else
-  config_query  IMAP_PAM  "Use Linux-PAM for PAM authentication?"  n
-fi
diff --git a/z-mail/imap/CONFLICTS b/z-mail/imap/CONFLICTS
deleted file mode 100755
index fcc8623..0000000
--- a/z-mail/imap/CONFLICTS
+++ /dev/null
@@ -1,4 +0,0 @@
-conflicts  c-client      &&
-conflicts  pine-imap     &&
-conflicts  courier-imap  &&
-conflicts  dovecot
diff --git a/z-mail/imap/DEPENDS b/z-mail/imap/DEPENDS
deleted file mode 100755
index 4c98097..0000000
--- a/z-mail/imap/DEPENDS
+++ /dev/null
@@ -1,12 +0,0 @@
-if  [  "$IMAP_SSL"  ==  "y"  ];  then
-  depends  openssl
-fi  &&
-
-if  [  "$IMAP_PAM"  ==  "y"  ];  then
-  depends  linux-pam
-fi  &&
-
-optional_depends  stunnel                        \
-                  ""                             \
-                  ""                             \
-                  "for imaps and pop3s support"
diff --git a/z-mail/imap/DETAILS b/z-mail/imap/DETAILS
deleted file mode 100755
index cb9270a..0000000
--- a/z-mail/imap/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-           SPELL=imap
-         VERSION=2006e
-     SOURCE_HASH=sha512:a05bf9373a8eb59aaa9abfba2c0693a1e1042f5b0e463d0ec218899510b5accacada0e73c8e2cd1ef58829b703dfc1c544b04f3b8e5cdcd2cf665d1697b9f9f9
-          SOURCE=$SPELL-$VERSION.tar.Z
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=ftp://ftp.cac.washington.edu/$SPELL/$SOURCE
-        WEB_SITE=http://www.washington.edu/imap
-         ENTERED=20010922
-         UPDATED=20030810
-      LICENSE[0]=UW-FF
-           SHORT="University of Washington IMAP server with POP3 gateway"
-cat << EOF
-The IMAP4rev1 server and a POP server with the ability to relay commands to
-an IMAP server, thus permitting existing POP clients to access an IMAP server.
-EOF
diff --git a/z-mail/imap/FINAL b/z-mail/imap/FINAL
deleted file mode 100755
index 9880582..0000000
--- a/z-mail/imap/FINAL
+++ /dev/null
@@ -1,7 +0,0 @@
-source /etc/sorcery/local/depends/imap
-
-if [ "$USE_SSL" != "y" ]; then
-    message "${MESSAGE_COLOR}Updating xinetd imap/pop3 files (without stunnel) ${DEFAULT_COLOR}"
-    cp $SCRIPT_DIRECTORY/imapd-stunnel_withoutopenssl /etc/xinetd.d/imapd-stunnel   
-    cp $SCRIPT_DIRECTORY/pop3-stunnel_withoutopenssl  /etc/xinetd.d/pop3-stunnel
-fi                                                                            
diff --git a/z-mail/imap/HISTORY b/z-mail/imap/HISTORY
deleted file mode 100644
index b70fd60..0000000
--- a/z-mail/imap/HISTORY
+++ /dev/null
@@ -1,186 +0,0 @@
-2006-01-30 Elisamuel Resto <ryuji at sourcemage.org>
-	* DETAILS: version bump to 2006e, changed license to APACHE
-
-2006-10-26 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
-	* INSTALL: use TRACK_ROOT when linking #9163
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* PROVIDES: [automated] Fixed invalid entries.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2005-10-03 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgarde to 2004g.
-
-2005-05-10 Seth Woolley <seth at tautology.org>
-	* BUILD: DEBUG is now EXTRACFLAGS which works correctly (already 
-	  in c-client, so I'm unsure why both weren't fixed at the same time).
-
-2005-04-11 Sergey Lipnevich <sergey at sourcemage.org>
-	* PROVIDES: provides C-CLIENT;
-	* CONFLICTS: conflicts with c-client spell.
-
-2005-02-18 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 2004c1 (Bug #7291)
-	  Removed MENU_* items, MAINTAINER, VOYEUR, and NET_SELECT
-	  Added BUILD_API=2
-	  Removed explicit SMGL mirror listing
-	  Changed LICENSE to LICENSE[0]
-	* CONFIGURE: Converted to config_query
-	  Added query for linux-pam
-	* DEPENDS: Properly depend on packages from choices in CONFIGURE
-	  Formatted to Guru Handbook
-	* CONFLICTS: Added "&&"s
-	* BUILD: Converted to build_api 2
-	  Removed TABs
-	* INSTALL: Branched from BUILD
-	  Converted to build_api 2
-	  Removed TABs
-	* POST_INSTALL,FINAL: POST_INSTALL renamed to FINAL
-	* TRIGGERS: Cleaned up spacing
-
-2005-01-29 Arjan Bouter <abouter at sourcemage.org>
-	* INSTALL: spell_installed -> spell_ok conversion
-
-2005-01-22 Rafael George <george.rafael at gmail.com>
-	* BUILD: linux-pam rename lower case
-	* TRIGGERS: linux-pam rename lower case
-	* DEPENDS: linux-pam rename lower case
-
-2004-01-13 Eric Sandall <sandalle at sourcemage.org>
-	* BUILD: stunnel installs stunnel.pem to /etc/stunnel now
-
-2003-11-02 Eric Sandall <sandalle at sourcemage.org>
-	* PROVIDES: Upper-case provides
-	* HISTORY: Formatted to Guru Handbook
-
-2003-08-10 hgg <hgreig at bigpond.net.au>
-	* TRIGGERS: Revert on_dispel Linux-PAM cast_self
-	  (doesn't work the way it is documented)
-
-2003-07-26 hgg <hgreig at bigpond.net.au>
-	* TRIGGERS: Update for Linux-PAM
-
-2003-05-30 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (2002d).
-
-2003-04-19 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (2002c1).
-
-2003-04-17 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (2002c).
-
-2003-02-06 M.L. <mlubrano at sourcemage.org>
-	* Fixed bug 2507 (thanks to tony at smee.org)
-
-2003-01-14 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (2002b).
-
-2002-12-22 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (2002a).
-
-2002-12-16 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Changed VOYEUR=off to on...
-
-2002-12-06 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Fixed bug #1883, added VOYEUR=off in DETAILS.
-	  Thanks to sandalle at sourcemage.org (Eric Sandall).
-
-2002-11-20 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (2002).
-
-2002-11-05 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Added MENU_* entries to DETAILS file.
-
-2002-10-31 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (2002.RC10).
-
-2002-10-30 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (2002.RC9).
-
-2002-10-17 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (2002.RC8).
-
-2002-10-07 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (2002.RC7) thanks to Eric sandalle at sourcemage.org
-
-2002-09-15 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (2002.RC6).
-
-2002-09-10 M.L. <mlubrano at sourcemage.org>
-	* xinetd.d/imap: Fixed files (thanks to LKThomas). 
-	* BUILD: Patched so cast imap now generate an install log.
-
-2002-09-05 M.L. <m.l at compaqnet.fr>
-	* DETAILS: Version++ (2002.RC5).
-
-2002-09-02 M.L. <m.l at compaqnet.fr>
-	* DETAILS: Version++ (2002.RC4).
-	  Thanks to "Thomas Graham" <lkthomas at sml.dyndns.org>
-
-2002-08-21 M.L. <m.l at compaqnet.fr>
-	* DETAILS: MD5[0] field updated, built from the ".tar" archive.
-
-2002-08-15 M.L. <m.l at compaqnet.fr>
-	* DETAILS: MD5[x] field format conforming to grimoire-gurus handbook.
-	  Added source url of last ressort (sourcemage mirror).
-
-2002-07-24 M.L. <m.l at compaqnet.fr>
-	* DETAILS: Changed licence to UW-FF
-
-2002-07-23 M.L. <m.l at compaqnet.fr>
-	* Fixed bug #492, uses user "root" in xinet.d/ files instead of nobody.
-	  Updated to 2002-RC2 (fixes buffer overflow security bug with root account,
-	  which is now used by default in xinetd files).
-
-2002-07-17 M.L. <m.l at compaqnet.fr>
-	* PROVIDES: Added
-
-2002-06-11 M.L. <m.l at compaqnet.fr>
-	* DETAILS: Added MD5.
-
-2002-06-10 M.L. <m.l at compaqnet.fr>
-	* DETAILS: Added LICENSE.
-	  !!! TO BE TUNED !!!
-
-2002-06-04 M.L. <m.l at compaqnet.fr>
-	* USEGCC2: Removed
-
-2002-05-10 M.L. <m.l at compaqnet.fr>
-	* CONFLICTS: Modified (because of pine split).
-
-2002-05-08 M.L. <m.l at compaqnet.fr>
-	* CONFLICTS: Added courier-imap to CONFLICTS file
-	* DETAILS: Added Sergey as MAINTAINER. Thanks to him for this spell.
-
-2002-05-08 Sergey Lipnevich <sergey at sourcemage.org>
-	* Make option NOSSL corrected to SSLTYPE, added patch to use ~/.imap/
-	  instead of ~, improved the structure of BUILD script by combining four
-	  separate 'make' into one parameterized. UPDATED changed because SSL was
-	  effectively not enabled.
-
-2002-04-16 Anonymous <sergey at sourcemage.org>
-	* Added copying of mtest binary to /usr/bin, changed all 'cp'
-	  to 'cp -f' for binaries. No UPDATED change. Added CONFLICTS
-	  to indicate conflict with current pine spell.
-
-2002-04-12 Sergey Lipnevich <sergey at sourcemage.org>
-	* Separated IMAPd into a separate spell, imap. Fixed 'services' according to
-	  http://www.iana.org/assignments/port-numbers. 'services' and xinet.d/*
-	  changed to be non-executable. All services run under 'nobody'. Removed
-	  copying of manpages because they don't come with this archive. Removed
-	  copying of client binaries: only imapd, ipop2d and ipop3d are copied.
-
-2002-09-15 M.L. <anonymous at sourcemage.org>
-	* Changelog,HISTORY: mv Changelog HISTORY
-
-2002-01-15 Kyle Sallee <anonymous at sourcemage.org>
-	* fixed pam authentication & imaps/pop3s
-
-2001-01-06 Kyle Sallee <anonymous at sourcemage.org>
-	* Added support launching imapd from xinetd
-
-2002-01-14 Kyle Sallee <anonymous at sourcemage.org>
-	* Added imaps support to spell.
-
diff --git a/z-mail/imap/INSTALL b/z-mail/imap/INSTALL
deleted file mode 100755
index 09402b4..0000000
--- a/z-mail/imap/INSTALL
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Install c-cient
-#
-mkdir  -p                         /usr/include/imap       &&
-cp     -f  ./c-client/*.h         /usr/include/imap/      &&
-cp     -f  ./c-client/c-client.a  /usr/lib/libc-client.a  &&
-
-cp  -f  ./imapd/imapd   /usr/sbin/  &&
-cp  -f  ./ipopd/ipop2d  /usr/sbin/  &&
-cp  -f  ./ipopd/ipop3d  /usr/sbin/  &&
-cp  -f  ./mtest/mtest   /usr/bin/   &&
-
-if  spell_ok  stunnel;  then
-  ln -sf $TRACK_ROOT/etc/stunnel/stunnel.pem   \
-           /etc/ssl/certs/imapd.pem   &&
-  ln -sf $TRACK_ROOT/etc/stunnel/stunnel.pem   \
-           /etc/ssl/certs/ipop3d.pem
-fi  &&
-
-message  "${MESSAGE_COLOR}If you get 'unknown AUTHORIZATION state command'"  &&
-message  "Then you probably want to edit /etc/xinetd.d/imapd-stunnel"        &&
-message  "and use imap without stunnel encapsulation... ${DEFAULT_COLOR}"
diff --git a/z-mail/imap/PROVIDES b/z-mail/imap/PROVIDES
deleted file mode 100755
index 2eeab1b..0000000
--- a/z-mail/imap/PROVIDES
+++ /dev/null
@@ -1,2 +0,0 @@
-IMAPD
-C-CLIENT
diff --git a/z-mail/imap/TRIGGERS b/z-mail/imap/TRIGGERS
deleted file mode 100755
index 85fced0..0000000
--- a/z-mail/imap/TRIGGERS
+++ /dev/null
@@ -1,7 +0,0 @@
-for  i  in  $(grep  $SPELL  $DEPENDS_STATUS);  do
-  if  [ $(echo $i | cut -d: -f1) == "$SPELL"    ]   &&
-      [ $(echo $i | cut -d: -f2) == "linux-pam" ]   &&
-      [ $(echo $i | cut -d: -f3) == "on"        ];  then
-    on_cast  linux-pam  cast_self
-  fi
-done
diff --git a/z-mail/imap/imapd-stunnel_withoutopenssl b/z-mail/imap/imapd-stunnel_withoutopenssl
deleted file mode 100755
index 555ba53..0000000
--- a/z-mail/imap/imapd-stunnel_withoutopenssl
+++ /dev/null
@@ -1,17 +0,0 @@
-service imaps
-{
-	socket_type		= stream
-	protocol		= tcp
-	wait			= no
-	user			= root
-	#user			= nobody
-	#server			= /usr/sbin/stunnel
-	#server_args		= -l /usr/sbin/imapd
-	# imaps will work without stunnel if you have /etc/ssl/certs/imapd.pem
-	server			= /usr/sbin/imapd
-	# server_args	=
-	per_source		= 4
-	log_type		= FILE /var/log/xinetd/imapd-stunnel
-	log_on_success		= PID HOST USERID EXIT DURATION
-	log_on_failure		= USERID ATTEMPT
-}
diff --git a/z-mail/imap/mailsubdir.patch b/z-mail/imap/mailsubdir.patch
deleted file mode 100755
index 8f137f9..0000000
--- a/z-mail/imap/mailsubdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN imap-2001a/src/osdep/unix/env_unix.c imap/src/osdep/unix/env_unix.c
---- imap-2001a/src/osdep/unix/env_unix.c	2001-10-17 23:27:59.000000000 -0400
-+++ imap/src/osdep/unix/env_unix.c	2002-05-08 11:09:19.000000000 -0400
-@@ -29,7 +29,7 @@
- static char *myMailboxDir = NIL;/* mailbox directory name */
- static char *myLocalHost = NIL;	/* local host name */
- static char *myNewsrc = NIL;	/* newsrc file name */
--static char *mailsubdir = NIL;	/* mail subdirectory name */
-+static char *mailsubdir = ".imap";	/* mail subdirectory name */
- static char *sysInbox = NIL;	/* system inbox name */
- static char *newsActive = NIL;	/* news active file */
- static char *newsSpool = NIL;	/* news spool */
diff --git a/z-mail/imap/pam.d/imap b/z-mail/imap/pam.d/imap
deleted file mode 100755
index 15b9d55..0000000
--- a/z-mail/imap/pam.d/imap
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# The PAM configuration file for the `imap' service
-#
-auth		required	pam_unix.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
diff --git a/z-mail/imap/pam.d/pop b/z-mail/imap/pam.d/pop
deleted file mode 100755
index effc3c1..0000000
--- a/z-mail/imap/pam.d/pop
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# The PAM configuration file for the `pop' service
-#
-auth		required	pam_unix.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
diff --git a/z-mail/imap/pop3-stunnel_withoutopenssl b/z-mail/imap/pop3-stunnel_withoutopenssl
deleted file mode 100755
index 535bf06..0000000
--- a/z-mail/imap/pop3-stunnel_withoutopenssl
+++ /dev/null
@@ -1,17 +0,0 @@
-service pop3s
-{
-	socket_type		= stream
-	protocol		= tcp
-	wait			= no
-	user			= root
-	#user			= nobody
-	#server			= /usr/sbin/stunnel
-	#server_args		= -l /usr/sbin/ipop3d
-	# pop3s will work without stunnel if you have /etc/ssl/certs/ipop3d.pem
-	server			= /usr/sbin/ipop3d
-	# server_args	=
-	per_source		= 4
-	log_type		= FILE /var/log/xinetd/pop3s
-	log_on_success		= PID HOST USERID EXIT DURATION
-	log_on_failure		= USERID ATTEMPT
-}
diff --git a/z-mail/imap/services b/z-mail/imap/services
deleted file mode 100644
index a91febd..0000000
--- a/z-mail/imap/services
+++ /dev/null
@@ -1,12 +0,0 @@
-pop2		109/tcp		Post Office Protocol - Version 2
-pop2		109/udp		Post Office Protocol - Version 2
-pop3		110/tcp		Post Office Protocol - Version 3
-pop3		110/udp		Post Office Protocol - Version 3
-imap		143/tcp		Internet Message Access Protocol
-imap		143/udp		Internet Message Access Protocol
-imap3		220/tcp		Interactive Mail Access Protocol v3
-imap3		220/udp		Interactive Mail Access Protocol v3
-imaps		993/tcp		imap4 protocol over TLS/SSL
-imaps		993/udp		imap4 protocol over TLS/SSL
-pop3s		995/tcp		pop3 protocol over TLS/SSL (was spop3)
-pop3s		995/udp		pop3 protocol over TLS/SSL (was spop3)
diff --git a/z-mail/imap/xinetd.d/imapd b/z-mail/imap/xinetd.d/imapd
deleted file mode 100755
index a8daa82..0000000
--- a/z-mail/imap/xinetd.d/imapd
+++ /dev/null
@@ -1,14 +0,0 @@
-service imap
-{
-	socket_type		= stream
-	protocol		= tcp
-	wait			= no
-	user			= root
-	#user			= nobody
-	server			= /usr/sbin/imapd
-	#server_args		= 
-	per_source		= 4
-	log_type		= FILE /var/log/xinetd/imapd
-	log_on_success		= PID HOST USERID EXIT DURATION
-	log_on_failure		= USERID ATTEMPT
-}
diff --git a/z-mail/imap/xinetd.d/imapd-stunnel b/z-mail/imap/xinetd.d/imapd-stunnel
deleted file mode 100755
index 905d5a1..0000000
--- a/z-mail/imap/xinetd.d/imapd-stunnel
+++ /dev/null
@@ -1,17 +0,0 @@
-service imaps
-{
-	socket_type		= stream
-	protocol		= tcp
-	wait			= no
-	user			= root
-	#user			= nobody
-	server			= /usr/sbin/stunnel
-	server_args		= -l /usr/sbin/imapd
-	# imaps will work without stunnel if you have /etc/ssl/certs/imapd.pem
-	# server		= /usr/sbin/imapd
-	# server_args	=
-	per_source		= 4
-	log_type		= FILE /var/log/xinetd/imapd-stunnel
-	log_on_success		= PID HOST USERID EXIT DURATION
-	log_on_failure		= USERID ATTEMPT
-}
diff --git a/z-mail/imap/xinetd.d/pop3 b/z-mail/imap/xinetd.d/pop3
deleted file mode 100755
index e2fd1e8..0000000
--- a/z-mail/imap/xinetd.d/pop3
+++ /dev/null
@@ -1,14 +0,0 @@
-service pop3
-{
-	socket_type		= stream
-	protocol		= tcp
-	wait			= no
-	user			= root
-	#user			= nobody
-	server			= /usr/sbin/ipop3d
-	#server_args		= 
-	per_source		= 4
-	log_type		= FILE /var/log/xinetd/pop3
-	log_on_success		= PID HOST USERID EXIT DURATION
-	log_on_failure		= USERID ATTEMPT
-}
diff --git a/z-mail/imap/xinetd.d/pop3-stunnel b/z-mail/imap/xinetd.d/pop3-stunnel
deleted file mode 100755
index 2442fc7..0000000
--- a/z-mail/imap/xinetd.d/pop3-stunnel
+++ /dev/null
@@ -1,17 +0,0 @@
-service pop3s
-{
-	socket_type		= stream
-	protocol		= tcp
-	wait			= no
-	user			= root
-	#user			= nobody
-	server			= /usr/sbin/stunnel
-	server_args		= -l /usr/sbin/ipop3d
-	# pop3s will work without stunnel if you have /etc/ssl/certs/ipop3d.pem
-	# server		= /usr/sbin/ipop3d
-	# server_args	=
-	per_source		= 4
-	log_type		= FILE /var/log/xinetd/pop3s
-	log_on_success		= PID HOST USERID EXIT DURATION
-	log_on_failure		= USERID ATTEMPT
-}



More information about the SM-Commit mailing list