Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (fd7b5c1c102a4c8bf7a66e3b4fc49ae63163143b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Elisamuel Resto <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (fd7b5c1c102a4c8bf7a66e3b4fc49ae63163143b)
  • Date: Wed, 13 Aug 2008 17:32:38 -0500

GIT changes to master grimoire by Elisamuel Resto <ryuji AT sourcemage.org>:

mail/c-client/BUILD | 28 ++++++++++++++--------------
mail/c-client/DEPENDS | 5 ++---
mail/c-client/DETAILS | 1 +
mail/c-client/HISTORY | 5 +++++
mail/imap/BUILD | 38 +++++++++++++++++---------------------
mail/imap/CONFIGURE | 14 +-------------
mail/imap/CONFLICTS | 8 ++++----
mail/imap/DEPENDS | 16 +++++-----------
mail/imap/DETAILS | 1 +
mail/imap/FINAL | 16 ++++++++++------
mail/imap/HISTORY | 11 +++++++++++
mail/imap/INSTALL | 36 ++++++++++++++++++------------------
mail/imap/PRE_BUILD | 10 +++++++---
mail/imap/TRIGGERS | 10 +++-------
mail/imap/xinetd.d/pop3 | 0
15 files changed, 99 insertions(+), 100 deletions(-)

New commits:
commit fd7b5c1c102a4c8bf7a66e3b4fc49ae63163143b
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

mail/imap: Rework of most of the spell; PATCHLEVEL++
CONFIGURE: Only the patch query needs to be here
CONFLICTS: Padding removed
DEPENDS: Padding removed, optional depends instead of if'ing
FINAL: Padding removed; quoting; cp's are now conditional
INSTALL: Padding removed; quoting
{PRE_,}BUILD: Patching done in PRE_BUILD; use is_depends_enabled
TRIGGERS: Only trigger recast if the spell depends on it
mailsubdir.patch, {pop3d,imapd}*, {pam,xinetd}.d/*: Permissions to 0644

commit 8de12407ca90ea9c0411c3e046cd28629acfe66a
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

mail/c-client: remove unused enable/disable flags in DEPENDS and changed
BUILD to use is_depends_enabled instead of the grep; quoted paths, added
some brackets and removed useless padding. PATCHLEVEL++

diff --git a/mail/c-client/BUILD b/mail/c-client/BUILD
index 297aa79..1904778 100755
--- a/mail/c-client/BUILD
+++ b/mail/c-client/BUILD
@@ -1,25 +1,25 @@
-cd ${SOURCE_DIRECTORY} &&
+cd "${SOURCE_DIRECTORY}" &&

-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"
+if is_depends_enabled $SPELL 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'
+ message "${MESSAGE_COLOR}Building without OpenSSL...${DEFAULT_COLOR}" &&
+ SSLOPTS='SSLTYPE=none'
fi &&

-if echo $OPTS | grep -q with-pam; then
- TARGET=lnp
+if is_depends_enabled $SPELL linux-pam; then
+ TARGET=lnp
else
- TARGET=slx
+ 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
+yes | make ${SSLOPTS} EXTRACFLAGS="${CFLAGS}" ${TARGET}
diff --git a/mail/c-client/DEPENDS b/mail/c-client/DEPENDS
index 3f87da9..5773acb 100755
--- a/mail/c-client/DEPENDS
+++ b/mail/c-client/DEPENDS
@@ -1,3 +1,2 @@
-# 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'
+optional_depends openssl "" "" "for SSL/TLS support" &&
+optional_depends linux-pam "" "" "for PAM support"
diff --git a/mail/c-client/DETAILS b/mail/c-client/DETAILS
index 52af28f..7374574 100755
--- a/mail/c-client/DETAILS
+++ b/mail/c-client/DETAILS
@@ -1,6 +1,7 @@
SPELL=c-client
VERSION=2007b

SOURCE_HASH=sha512:cf99dd8027efb0700fac219f928f5eb0522ee35c8960959a18963870a8e11a5b5a2b81afb6d686ddd1288c4c645cfafa2242a5f6ec2fef63e0c69fd434504e66
+ PATCHLEVEL=1
SOURCE=imap-${VERSION}.tar.Z
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/imap-${VERSION}
SOURCE_URL[0]=ftp://ftp.cac.washington.edu/imap/${SOURCE}
diff --git a/mail/c-client/HISTORY b/mail/c-client/HISTORY
index aa5f40d..2b51a70 100644
--- a/mail/c-client/HISTORY
+++ b/mail/c-client/HISTORY
@@ -1,3 +1,8 @@
+2008-08-12 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DEPENDS: remove unused enable/disable flags; PATCHLEVEL++
+ * BUILD: use is_depends_enabled instead of the grep; quoted paths,
+ added some brackets and removed padding
+
2008-07-01 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated to 2007b (perhaps the last update ever)
* PRE_BUILD: added, seems that the tar.Z wasn't unpacked by sorcery
diff --git a/mail/imap/BUILD b/mail/imap/BUILD
index 502778c..ad853e4 100755
--- a/mail/imap/BUILD
+++ b/mail/imap/BUILD
@@ -1,26 +1,22 @@
-cd ${SOURCE_DIRECTORY} &&
+cd "${SOURCE_DIRECTORY}" &&

-if [ "$IMAP_MAILSUBDIR" == "y" ]; then
- patch -p0 < $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"
+if is_depends_enabled $SPELL 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 &&
+ 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
+if is_depends_enabled $SPELL linux-pam; then
+ message "${MESSAGE_COLOR}Building with PAM...${DEFAULT_COLOR}" &&
+ TARGET=lnp
else
- TARGET=slx
-fi &&
+ TARGET=slx
+fi &&

-yes | make EXTRACFLAGS="$CFLAGS" $SSLOPTS $TARGET
+yes | make ${SSLOPTS} EXTRACFLAGS="${CFLAGS}" ${TARGET}
diff --git a/mail/imap/CONFIGURE b/mail/imap/CONFIGURE
index 0ee92ba..7afa0e0 100755
--- a/mail/imap/CONFIGURE
+++ b/mail/imap/CONFIGURE
@@ -1,13 +1 @@
-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
+config_query IMAP_MAILSUBDIR "Apply patch to use ~/.imap/ as a mail
sub-directory?" y
diff --git a/mail/imap/CONFLICTS b/mail/imap/CONFLICTS
index fcc8623..43e5add 100755
--- a/mail/imap/CONFLICTS
+++ b/mail/imap/CONFLICTS
@@ -1,4 +1,4 @@
-conflicts c-client &&
-conflicts pine-imap &&
-conflicts courier-imap &&
-conflicts dovecot
+conflicts c-client &&
+conflicts pine-imap &&
+conflicts courier-imap &&
+conflicts dovecot
diff --git a/mail/imap/DEPENDS b/mail/imap/DEPENDS
index 4c98097..98d08fc 100755
--- a/mail/imap/DEPENDS
+++ b/mail/imap/DEPENDS
@@ -1,12 +1,6 @@
-if [ "$IMAP_SSL" == "y" ]; then
- depends openssl
-fi &&
+optional_depends openssl "" "" "Use openssl (for stunnel) for imapds?" &&
+optional_depends linux-pam "" "" "for PAM authentication?" &&

-if [ "$IMAP_PAM" == "y" ]; then
- depends linux-pam
-fi &&
-
-optional_depends stunnel \
- "" \
- "" \
- "for imaps and pop3s support"
+if is_depends_enabled $SPELL openssl; then
+ depends stunnel
+fi
diff --git a/mail/imap/DETAILS b/mail/imap/DETAILS
index 4c41d6e..e55e4ca 100755
--- a/mail/imap/DETAILS
+++ b/mail/imap/DETAILS
@@ -1,6 +1,7 @@
SPELL=imap
VERSION=2007b

SOURCE_HASH=sha512:cf99dd8027efb0700fac219f928f5eb0522ee35c8960959a18963870a8e11a5b5a2b81afb6d686ddd1288c4c645cfafa2242a5f6ec2fef63e0c69fd434504e66
+ PATCHLEVEL=1
SOURCE=${SPELL}-${VERSION}.tar.Z
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=ftp://ftp.cac.washington.edu/imap/${SOURCE}
diff --git a/mail/imap/FINAL b/mail/imap/FINAL
index 9880582..db882a9 100755
--- a/mail/imap/FINAL
+++ b/mail/imap/FINAL
@@ -1,7 +1,11 @@
-source /etc/sorcery/local/depends/imap
+if ! is_depends_enabled $SPELL stunnel; then
+ if [[ -e "${INSTALL_ROOT}/etc/xinetd.d/imapd-stunnel" ]]; then
+ message "${MESSAGE_COLOR}Updating xinetd imapd file (without
stunnel)${DEFAULT_COLOR}" &&
+ cp -v "${SCRIPT_DIRECTORY}/imapd-stunnel_withoutopenssl"
"${INSTALL_ROOT}/etc/xinetd.d/imapd-stunnel"
+ fi &&

-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

+ if [[ -e "${INSTALL_ROOT}/etc/xinetd.d/pop3-stunnel" ]]; then
+ message "${MESSAGE_COLOR}Updating xinetd pop3d file (without
stunnel)${DEFAULT_COLOR}" &&
+ cp -v "${SCRIPT_DIRECTORY}/pop3-stunnel_withoutopenssl"
"${INSTALL_ROOT}/etc/xinetd.d/pop3-stunnel"
+ fi
+fi
diff --git a/mail/imap/HISTORY b/mail/imap/HISTORY
index 7c87563..f3d59c0 100644
--- a/mail/imap/HISTORY
+++ b/mail/imap/HISTORY
@@ -1,3 +1,14 @@
+2008-08-13 Elisamuel Resto <ryuji AT sourcemage.org>
+ * CONFIGURE: Only the patch query needs to be here
+ * CONFLICTS: Padding removed; quoting
+ * DEPENDS: Padding removed, optional depends instead of if'ing
+ * FINAL: Padding removed; quoting; cp's are now conditional
+ * INSTALL: Padding removed; quoting
+ * {PRE_,}BUILD: Patching done in PRE_BUILD; use is_depends_enabled
+ * TRIGGERS: Only trigger if the spell depends on it
+ * DETAILS: PATCHLEVEL++
+ * mailsubdir.patch, {pop3d,imapd}*, {pam,xinetd}.d/*: Permissions to
0644
+
2008-07-01 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated to 2007b (maybe the last update ever)
* PRE_BUILD: added, seems the tar.Z file wasn't being unpacked by
sorcery
diff --git a/mail/imap/INSTALL b/mail/imap/INSTALL
index 09402b4..089ec37 100755
--- a/mail/imap/INSTALL
+++ b/mail/imap/INSTALL
@@ -1,22 +1,22 @@
-#
+cd "${SOURCE_DIRECTORY}" &&
+
# 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 &&
+mkdir -pv /usr/include/imap &&
+cp -fv ./c-client/*.h /usr/include/imap/ &&
+cp -fv ./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/ &&
+# Install imapd and ipop{2,3}d
+cp -fv ./imapd/imapd /usr/sbin/ &&
+cp -fv ./ipopd/ipop2d /usr/sbin/ &&
+cp -fv ./ipopd/ipop3d /usr/sbin/ &&
+cp -fv ./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 &&
+# Install stunnel certificates, if stunnel is requested
+if is_depends_enabled $SPELL 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}"
+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/mail/imap/PRE_BUILD b/mail/imap/PRE_BUILD
index e9a50a8..a968da4 100755
--- a/mail/imap/PRE_BUILD
+++ b/mail/imap/PRE_BUILD
@@ -1,4 +1,8 @@
default_pre_build &&
-cd ${BUILD_DIRECTORY} &&
-gzip -cd ${SOURCE_CACHE}/${SOURCE} | tar -x &&
-cd ${SOURCE_DIRECTORY}
+cd "${BUILD_DIRECTORY}" &&
+gzip -cd "${SOURCE_CACHE}/${SOURCE}" | tar -x &&
+cd "${SOURCE_DIRECTORY}" &&
+
+if [[ "${IMAP_MAILSUBDIR}" == "y" ]]; then
+ patch -p0 -i "${SCRIPT_DIRECTORY}/mailsubdir.patch"
+fi
diff --git a/mail/imap/TRIGGERS b/mail/imap/TRIGGERS
index 85fced0..93c8f0a 100755
--- a/mail/imap/TRIGGERS
+++ b/mail/imap/TRIGGERS
@@ -1,7 +1,3 @@
-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
+if is_depends_enabled $SPELL linux-pam; then
+ on_cast linux-pam cast_self
+fi
diff --git a/mail/imap/imapd-stunnel_withoutopenssl
b/mail/imap/imapd-stunnel_withoutopenssl
old mode 100755
new mode 100644
diff --git a/mail/imap/mailsubdir.patch b/mail/imap/mailsubdir.patch
old mode 100755
new mode 100644
diff --git a/mail/imap/pam.d/imap b/mail/imap/pam.d/imap
old mode 100755
new mode 100644
diff --git a/mail/imap/pam.d/pop b/mail/imap/pam.d/pop
old mode 100755
new mode 100644
diff --git a/mail/imap/pop3-stunnel_withoutopenssl
b/mail/imap/pop3-stunnel_withoutopenssl
old mode 100755
new mode 100644
diff --git a/mail/imap/xinetd.d/imapd b/mail/imap/xinetd.d/imapd
old mode 100755
new mode 100644
diff --git a/mail/imap/xinetd.d/imapd-stunnel
b/mail/imap/xinetd.d/imapd-stunnel
old mode 100755
new mode 100644
diff --git a/mail/imap/xinetd.d/pop3 b/mail/imap/xinetd.d/pop3
old mode 100755
new mode 100644
diff --git a/mail/imap/xinetd.d/pop3-stunnel b/mail/imap/xinetd.d/pop3-stunnel
old mode 100755
new mode 100644



  • [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (fd7b5c1c102a4c8bf7a66e3b4fc49ae63163143b), Elisamuel Resto, 08/13/2008

Archive powered by MHonArc 2.6.24.

Top of Page