New commits:
commit 5578de14cb844964ea09dbba9f4a008cc5b472f4
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
gnome2-apps/epiphany-extensions: updated VERSION to 2.24.0
commit c5451159f8d0b285c4363db0babf1833bb15119c
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
gnome2-apps/epiphany: updated VERSION to 2.24.0.1
commit 84836343157227de66803ea6585f4462f8f55ec2
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
gnome2-apps/epiphany: fixed broken check for python dep when
gnome-python2 was requested
commit 0a07b91cd2ae1331a202bfa63ed7008a3294a698
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
utils/ntp: updated spell to 4.2.4p5
- Bormatting changes on BUILD, DEPENDS, INSTALL and TRIGGERS
- CONFIGURE added to prompt for IPv6 support
- linuxcaps configure flag moved from BUILD to DEPENDS' libcap dep
- Only use glibc's getifaddr if IPv6 support is requested and >glibc-2.4
- Removed CONFIG_PHONE sedit line, since it's not needed anymore
commit 487d2de858d3b7f155582e74b8d24a00e8806e23
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
net/dnsmasq: enabled building of I18N translations (requires gettext)
commit 34ad5c45a56f7b5353492d1a03fa15f605d85a3d
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
mail/postfix: removed brackets (but on message prompts) and quoted paths;
DOCS had dirs, moved to DOC_DIRS
commit 4b16604f346674c765939c96e989b23e24056721
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
video/mplayer: faad2 configure switch differs on svn version
diff --git a/gnome2-apps/epiphany-extensions/DETAILS
b/gnome2-apps/epiphany-extensions/DETAILS
index 5217252..67078ae 100755
--- a/gnome2-apps/epiphany-extensions/DETAILS
+++ b/gnome2-apps/epiphany-extensions/DETAILS
@@ -1,5 +1,5 @@
SPELL=epiphany-extensions
- VERSION=2.22.2
+ VERSION=2.24.0
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/epiphany-extensions/HISTORY
b/gnome2-apps/epiphany-extensions/HISTORY
index 1c575b3..8e026d7 100644
--- a/gnome2-apps/epiphany-extensions/HISTORY
+++ b/gnome2-apps/epiphany-extensions/HISTORY
@@ -1,3 +1,6 @@
+2008-09-29 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: updated VERSION to 2.24.0
+
2008-08-03 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.22.2
diff --git
a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.22.2.tar.bz2.sig
b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.22.2.tar.bz2.sig
deleted file mode 100644
index 4a21475..0000000
Binary files
a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.22.2.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.24.0.tar.bz2.sig
b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.24.0.tar.bz2.sig
new file mode 100644
index 0000000..ceb0677
Binary files /dev/null and
b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.24.0.tar.bz2.sig
differ
diff --git a/gnome2-apps/epiphany/DETAILS b/gnome2-apps/epiphany/DETAILS
index 10e16ed..c640238 100755
--- a/gnome2-apps/epiphany/DETAILS
+++ b/gnome2-apps/epiphany/DETAILS
@@ -1,5 +1,5 @@
SPELL=epiphany
- VERSION=2.22.3
+ VERSION=2.24.0.1
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index 4f8c2bd..b627eb2 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,7 @@
+2008-09-29 Elisamuel Resto <ryuji AT sourcemage.org>
+ * PRE_SUB_DEPENDS: fixed broken check (gnome-python2 != python)
+ * DETAILS: updated VERSION to 2.24.0.1
+
2008-08-03 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.22.3
diff --git a/gnome2-apps/epiphany/PRE_SUB_DEPENDS
b/gnome2-apps/epiphany/PRE_SUB_DEPENDS
index da18f16..d7760b5 100755
--- a/gnome2-apps/epiphany/PRE_SUB_DEPENDS
+++ b/gnome2-apps/epiphany/PRE_SUB_DEPENDS
@@ -1,4 +1,4 @@
case $THIS_SUB_DEPENDS in
-gnome-python2) if is_depends_enabled $SPELL python; then return 0; fi;;
+ gnome-python2) is_depends_enabled $SPELL gnome-python2 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: ${SPELL}
${THIS_SUB_DEPENDS}${DEFAULT_COLOR}" && return 1 ;;
esac
-return 1
diff --git a/gnome2-apps/epiphany/epiphany-2.22.3.tar.bz2.sig
b/gnome2-apps/epiphany/epiphany-2.22.3.tar.bz2.sig
deleted file mode 100644
index e26f3ba..0000000
Binary files a/gnome2-apps/epiphany/epiphany-2.22.3.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/epiphany/epiphany-2.24.0.1.tar.bz2.sig
b/gnome2-apps/epiphany/epiphany-2.24.0.1.tar.bz2.sig
new file mode 100644
index 0000000..1a0006b
Binary files /dev/null and
b/gnome2-apps/epiphany/epiphany-2.24.0.1.tar.bz2.sig differ
diff --git a/mail/postfix/BUILD b/mail/postfix/BUILD
index 6f31aed..f4bcb82 100755
--- a/mail/postfix/BUILD
+++ b/mail/postfix/BUILD
@@ -2,78 +2,78 @@ create_account postfix &&
create_account postdrop &&
create_account mail &&
# We want blank vars
local AUXLIBS="" &&
local CCARGS="" &&
if is_depends_enabled $SPELL openldap; then
- AUXLIBS="${AUXLIBS} -lldap -llber" &&
- CCARGS="${CCARGS} -DHAS_LDAP" &&
+ AUXLIBS="$AUXLIBS -lldap -llber" &&
+ CCARGS="$CCARGS -DHAS_LDAP" &&
message "${MESSAGE_COLOR}OpenLDAP requested: Using
OpenLDAP${DEFAULT_COLOR}"
fi &&
if is_depends_enabled $SPELL linux-pam; then
- AUXLIBS="${AUXLIBS} -lpam -lpam_misc" &&
- CCARGS="${CCARGS} -DHAS_PAM" &&
+ AUXLIBS="$AUXLIBS -lpam -lpam_misc" &&
+ CCARGS="$CCARGS -DHAS_PAM" &&
message "${MESSAGE_COLOR}Linux-PAM requested: Using
Linux-PAM${DEFAULT_COLOR}"
fi &&
if is_depends_enabled $SPELL cyrus-sasl; then
- AUXLIBS="${AUXLIBS} -lsasl2" &&
- CCARGS="${CCARGS} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL
-I${INSTALL_ROOT}/usr/include/sasl" &&
+ AUXLIBS="$AUXLIBS -lsasl2" &&
+ CCARGS="$CCARGS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL
-I$INSTALL_ROOT/usr/include/sasl" &&
message "${MESSAGE_COLOR}Cyrus-SASL requested: Using
Cyrus-SASL${DEFAULT_COLOR}"
fi &&
if is_depends_enabled $SPELL mysql; then
- AUXLIBS="${AUXLIBS} -L${INSTALL_ROOT}/usr/lib -lmysqlclient -lz -lm" &&
- CCARGS="${CCARGS} -DHAS_MYSQL -I${INSTALL_ROOT}/usr/include/mysql" &&
+ AUXLIBS="$AUXLIBS -L$INSTALL_ROOT/usr/lib -lmysqlclient -lz -lm" &&
+ CCARGS="$CCARGS -DHAS_MYSQL -I$INSTALL_ROOT/usr/include/mysql" &&
message "${MESSAGE_COLOR}MySQL requested: Using MySQL${DEFAULT_COLOR}"
fi &&
if is_depends_enabled $SPELL postgresql; then
- AUXLIBS="${AUXLIBS} -L${INSTALL_ROOT}/usr/lib -lpq" &&
- CCARGS="${CCARGS} -DHAS_PGSQL -I${INSTALL_ROOT}/usr/include/pgsql" &&
+ AUXLIBS="$AUXLIBS -L$INSTALL_ROOT/usr/lib -lpq" &&
+ CCARGS="$CCARGS -DHAS_PGSQL -I$INSTALL_ROOT/usr/include/pgsql" &&
message "${MESSAGE_COLOR}PostgreSQL requested: Using
PostgresSQL${DEFAULT_COLOR}"
fi &&
if is_depends_enabled $SPELL openssl; then
- AUXLIBS="${AUXLIBS} -lssl -lcrypto" &&
- CCARGS="${CCARGS} -DHAS_SSL -DUSE_TLS
-I${INSTALL_ROOT}/usr/include/openssl" &&
+ AUXLIBS="$AUXLIBS -lssl -lcrypto" &&
+ CCARGS="$CCARGS -DHAS_SSL -DUSE_TLS -I$INSTALL_ROOT/usr/include/openssl"
&&
message "${MESSAGE_COLOR}OpenSSL requested: Using OpenSSL for
SSL/TLS${DEFAULT_COLOR}"
fi &&
# fix to get man pages to install in /usr/man
-#sedit "s:/usr/local:${INSTALL_ROOT}/usr:" src/global/mail_params.h &&
-CCARGS="${CCARGS} -DDEF_MANPAGE_DIR=\\\"${INSTALL_ROOT}/usr/share/man\\\"" &&
+#sedit "s:/usr/local:$INSTALL_ROOT/usr:" src/global/mail_params.h &&
+CCARGS="$CCARGS -DDEF_MANPAGE_DIR=\\\"$INSTALL_ROOT/usr/share/man\\\"" &&
# NPTL glibc fix
if glibc_is_nptl; then
- AUXLIBS="${AUXLIBS} -lpthread"
+ AUXLIBS="$AUXLIBS -lpthread"
fi &&
# Fix directories in the main.cf
-if [[ "${POSTFIX_PRE_EXISTING}" == "yes" ]]; then
- if [[ "${POSTFIX_FIX_MAINCF}" == "y" ]]; then
+if [[ "$POSTFIX_PRE_EXISTING" == "yes" ]]; then
+ if [[ "$POSTFIX_FIX_MAINCF" == "y" ]]; then
# repair directories in the main.cf
- local MANPAGE_DIR="$(grep manpage_directory
${INSTALL_ROOT}/etc/postfix/main.cf | cut -d"=" -f2)" &&
+ local MANPAGE_DIR="$(grep manpage_directory
$INSTALL_ROOT/etc/postfix/main.cf | cut -d"=" -f2)" &&
MANPAGE_DIR="${MANPAGE_DIR## }" &&
- if [[ "$MANPAGE_DIR" != "${INSTALL_ROOT}/usr/share/man" ]]; then
- sed -i -e "s|manpage_directory.*=.*|manpage_directory =
${INSTALL_ROOT}/usr/share/man|" \
- ${INSTALL_ROOT}/etc/postfix/main.cf
+ if [[ "$MANPAGE_DIR" != "$INSTALL_ROOT/usr/share/man" ]]; then
+ sed -i -e "s|manpage_directory.*=.*|manpage_directory =
$INSTALL_ROOT/usr/share/man|" \
+ "$INSTALL_ROOT/etc/postfix/main.cf"
fi
fi
fi
diff --git a/mail/postfix/CONFIGURE b/mail/postfix/CONFIGURE
index 8312e15..9c7a1fb 100755
--- a/mail/postfix/CONFIGURE
+++ b/mail/postfix/CONFIGURE
@@ -2,7 +2,7 @@ persistent_add POSTFIX_PRE_EXISTING &&
persistent_add POSTFIX_FIX_MAINCF &&
persistent_add POSTFIX_VDA &&
-if [[ "x${POSTFIX_VDA}" == "x" ]] && spell_ok $SPELL; then
+if [[ "x$POSTFIX_VDA" == "x" ]] && spell_ok $SPELL; then
persistent_read $SPELL VDA POSTFIX_VDA
fi &&
@@ -24,12 +24,13 @@ fi &&
config_query POSTFIX_BENCH "Install smtpstone benckmarking tools?" n &&
# Config file backup
-#message "${MESSAGE_COLOR}smtp configuration files loss may expose your
system to SPAM relaying. You should backup and restore configuration files
and reply y to the next two questions...${DEFAULT_COLOR}" &&
+#message "${MESSAGE_COLOR}Configuration file loss may expose your system to
SPAM relaying." &&
+#message "You should backup and restore configuration files and reply y to
the next two questions...${DEFAULT_COLOR}" &&
#config_query BACKUP "Backup config on dispel?" y &&
#config_query RESTORE "Restore config on rebuild/update?" y
# Newaliases
-#message "${MESSAGE_COLOR}You should run newaliases after each aliases file
update, and on first $spell cast...${DEFAULT_COLOR}" &&
+#message "${MESSAGE_COLOR}You should run newaliases after each aliases file
update, and on first $spell cast...$}DEFAULT_COLOR}" &&
#config_query ALIAS "Run newaliases after cast?" y &&
config_query POSTFIX_VDA "Apply Virtual Delivery Agent (VDA) patch?
(EXPERIMENTAL)" n
diff --git a/mail/postfix/DETAILS b/mail/postfix/DETAILS
index fe1bec9..a320f23 100755
--- a/mail/postfix/DETAILS
+++ b/mail/postfix/DETAILS
@@ -61,7 +61,7 @@ fi
SOURCE2_URL[20]=${SOURCE_URL[20]}.sig
# fix the default manpage_directory
- sed -i -e "s|manpage_directory.*=.*|manpage_directory = /usr/share/man|"
/etc/postfix/main.cf
+ sed -i -e "s|manpage_directory.*=.*|manpage_directory =
$INSTALL_ROOT/usr/share/man|" /etc/postfix/main.cf
else
# preexisting install found doing the upgrade, which is unattended
make upgrade
fi &&