New commits:
commit f9b500fd3585cfe26c4fea3de54273a2688f4ff8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
VERSION: 0.60-9
commit 286fef2d0c47d20495fe5d45f55b7f6278bd6abd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libzip: => 0.10.1 security fixes
(cherry picked from commit 2e62f8bbb06ad0d033b3fc913e2d9e15a360cb73)
commit d4eabc54cfaecc3af12c20c0756b067feb6974f7
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libzip 0.10
(cherry picked from commit e1ab319715de4e38fe58f4e3074ad843fea70db9)
commit 539cfd7be67885eeb79953f3f6f9feb12c560d37
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
wireshark 1.6.6, SECURITY_PATCH=35
(cherry picked from commit d048baa6978f32587453915ed37cdbc46183c3e8)
commit a7ed018bb00805e11bb2edf24320a34402004bfc
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
quagga: fixed hashsum; for some strange reason DETAILS wasn't copied from
/var/lib/sorcery/codex/test.git
(cherry picked from commit 76fce3dbc094630e4424cff2d7a1f5baaac05b56)
commit dcffbef052fe18afed70b60016b8f260146aec70
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
quagga: => 0.99.20.1 (security)
(cherry picked from commit ea3530050e10ec9df5c0b885e6351f3dbc6adafb)
commit 02b2ebab00db7ac11b239488b17502d00ff56a72
Author: Tommy Boatman <tboatman AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
quagga: added "y" to zebra to force unattended cast
(cherry picked from commit d6b97ef6cd59fc0808f5c1128aefa64cf6f95caa)
commit c5dd1ab8a7e36d6879c107c7447c954dee73c151
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
commit e21f2fbddaaf0d5cbcaaa76492f5189bd9a859dd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nginx: => 1.1.10 (devel)
(cherry picked from commit 3a35a5622329c1576846913e63d6fa98595a6367)
commit 9998e43c4f3f3dc233a00e204e5207491cbd8f5e
Author: Julien ROZO <julien AT rozo.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pidgin: updated version to 2.10.2, SECURITY_PATCH=13
removed patch for glib 2.31, integrated upstream
(cherry picked from commit 4d2ea7a8b2ccbd15b42cef0bbc4711391e0aed6b)
commit 04a4be9590a8957ca902067b00d70978c58f7e79
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
chat-im/pidgin: added -lm to LIBS
(cherry picked from commit 7605e2e8bed0db98e2289dbcfe9a7e0b18d9607f)
commit 2a44fdd8eafd9aafbe08cfcb58fc2ef98e4739fa
Author: Julien ROZO <julien AT rozo.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pidgin: added a patch to fix compilation issue with glib2 2.31.x
(cherry picked from commit 66dd669b1c040178538fe10d825b3f08fea7dad0)
commit f181cb72bb831ec222b390b7942ca290fef47d4b
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
chat-im/pidgin: non-optional depends on intltool
CVS support was removed from the spell quite some time ago in DETAILS,
but hadn't been removed from DEPENDS. I removed the CVS if block.
Meanwhile, current pidgin depends on intltool, which was lacking as a
dependency (it was previously inside the CVS if block). Adding intltool
as a regular dependency enables the spell to build correctly.
(cherry picked from commit 58c803a97363065279f85b0d960f88bb94f7df59)
commit 1dc8380c7a296c7c1d01b0fe5bf0fbdde01c604e
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
commit b8b40a1be8af990e987eb45f59d756b48c013f55
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libxslt: security update
(cherry picked from commit ab75567f521ef45b4c8a4808c70a83ad41de44f2)
commit e84179b4e8f63a1ec1c10c98816dfb849f4bebb3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
openldap: => 2.4.30 (stable) [security]
(cherry picked from commit c0ae79bd2189acd1d203f16b3ec134af825f85bb)
commit c65ce3059e0032a11cd4d8ca51f555b1934782b2
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
openldap: removed sluprd and ldbm as they are removed by upstream.
added comments to various backends and added some missing ones
added overlay support, made cleartext and crypt passwords optional.
Note: I'm not done with this spell yet, but it seems to work.
(cherry picked from commit 5a4c671a76d4ef78ac8aa416966c630b55943af9)
commit ec35626b4c3a1172b6012e965c7e3b28c5ff85b8
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
openldap 2.4.30
(cherry picked from commit 215fcd898f3a136117c49cabd478b821d4453b0b)
commit 226c9876c16441c2db39f5e47d8e01fad835f953
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
openldap 2.4.28
(cherry picked from commit 6fbfe2b1806790905552e038a3813f6045627d8b)
commit d60f33112ebd6469d7e7645b990f472a42eec9e1
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
openssl 0.9.8u, 1.0.0h, SECURITY_PATCH=16
(cherry picked from commit 9a00e108a21855743e20612d30a62b7fb2a3a99a)
commit aad6da3bf1b7e5bea72d2a0ed524334eb71c67b2
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libgdata 0.10.2, SECURITY_PATCH=1
(cherry picked from commit 4bddb2d839002d3adb319e49900d553cf92c0849)
commit 09beaf61ceb620c7e49a8af546c7cb1a19b12dcf
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libgdata 0.10.1
(cherry picked from commit 2767a9d5961302744804b97d0d0ed0ae9d175374)
commit 8c1fbfd3c032daea4bfa5965b8f7387346895919
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libgdata 0.8.0
(cherry picked from commit b72c8bed3e074e4f350c5e677a1c35528499825e)
commit 74673a9dad2fe212f1af84335ccc65c715783b07
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xvid: added INSTALL for a symlink to fix building transcode with xvid
support
(cherry picked from commit 16fce786f1a8873648ced9c11a5633aa0ea66106)
commit 540025b5ecfdd8b7ae7d69f4a0df79470f23ff5e
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
transcode: added missing dependencies, made ffmpeg and libmpeg2 optional
and completed xvid options
(cherry picked from commit de122ae47a71da895ba9ec05c0d88973ab1c10fc)
commit 84be7a5442f520f303eca1758f0bfcf03eaf0b2f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
freetype2 2.4.9, SECURITY_PATCH=7
(cherry picked from commit 0e99a5fbd9bee8bb5b3b8c50328b90b96e7d494b)
commit 20cee87b2b894e2996323ee2178d4a267c4d59d4
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
freetype2 2.4.8, SECURITY_PATCH=6, CVE-2011-3439
(cherry picked from commit 325c47035035ec8646202a44f71c6680aeea4951)
commit ce53d944a93e16ba97c63ef87983401bfd0a4129
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
freetype2: => 2.4.7
(cherry picked from commit 4b240a10e03ea6b259c4a6d5a7179dd3833dbca6)
commit 97b4b87e4a91a341af34b4bb41e338bddeb7f0ab
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ipset: killed typo
(cherry picked from commit 19b3c183c426253c361f59f4ac4ba8ec5af02009)
diff --git a/archive-libs/libzip/UP_TRIGGERS b/archive-libs/libzip/UP_TRIGGERS
new file mode 100755
index 0000000..abfbe0e
--- /dev/null
+++ b/archive-libs/libzip/UP_TRIGGERS
@@ -0,0 +1,9 @@
+local OLD_SPELL_VERSION=""
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+if [ "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}" ]; then
+ message "This is an incompatible update of $SPELL..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(show_up_depends $SPELL 1); do
+ up_trigger $each cast_self
+ done
+fi
diff --git a/chat-im/pidgin/BUILD b/chat-im/pidgin/BUILD
index 7a7daaf..88862af 100755
--- a/chat-im/pidgin/BUILD
+++ b/chat-im/pidgin/BUILD
@@ -1,5 +1,6 @@
### had to cook up some pkg-config files for nss and nspr
-CFLAGS="$CFLAGS -I${TRACK_ROOT}/usr/X11R6/include"
+CFLAGS="$CFLAGS -I${TRACK_ROOT}/usr/X11R6/include" &&
+export LIBS="${LIBS} -lm" &&
export
PKG_CONFIG_PATH="${TRACK_ROOT}/usr/include/nss:${TRACK_ROOT}/usr/include/nspr"
&&
make_single &&
default_build &&
diff --git a/chat-im/pidgin/DEPENDS b/chat-im/pidgin/DEPENDS
index 9f23f47..7f60e21 100755
--- a/chat-im/pidgin/DEPENDS
+++ b/chat-im/pidgin/DEPENDS
@@ -1,11 +1,6 @@
depends libxml2 &&
depends xml-parser-expat &&
-
-if [ "$PIDGIN_CVS" == "y" ]
-then
- depends subversion &&
- depends intltool
-fi &&
+depends intltool &&
optional_depends silc-toolkit \
"" \
diff --git a/chat-im/pidgin/DETAILS b/chat-im/pidgin/DETAILS
index 44273c9..8061608 100755
--- a/chat-im/pidgin/DETAILS
+++ b/chat-im/pidgin/DETAILS
@@ -1,6 +1,6 @@
SPELL=pidgin
- VERSION=2.10.0
- SECURITY_PATCH=11
+ VERSION=2.10.2
+ SECURITY_PATCH=13
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 55e5ebc..f33d45f 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,22 @@
+2012-03-14 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 2.10.2, SECURITY_PATCH=13
+ * glib-2.31.patch: removed, integrated upstream
+ * PRE_BUILD: no longer applying former patch
+
+2012-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: LIBS+=-lm to avoid linker error
+
+2011-12-28 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * glib-2.31.patch: added, to fix compilation issue with latest glib2
+ * PRE_BUILD: applying new patch
+
+2011-12-15 Justin Boffemmyer <flux AT sourcemage.org>
+ * DEPENDS: remove CVS if block, add intltool
+
+2011-12-10 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 2.10.1,
+ SECURITY_PATCH=12, CVE-2011-3594 & CVE-2011-4601
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 4C292FCC.gpg: added gpg keyring
diff --git a/collab/openldap/BUILD b/collab/openldap/BUILD
index c34f4ae..101e5cd 100755
--- a/collab/openldap/BUILD
+++ b/collab/openldap/BUILD
@@ -2,13 +2,33 @@
# See http://www.openldap.org/lists/openldap-bugs/200804/msg00074.html
CPPFLAGS="-D_GNU_SOURCE $CPPFLAGS" &&
-if [[ "$SLAPD_LDBM" == "db" ]]; then
+if is_depends_enabled $SPELL db; then
LDFLAGS="-ldb $LDFLAGS"
fi &&
+# only add slapd options when actually building it
+if echo $OPENLDAP_SLAPD | grep -q enable; then
+
+ if [[ "${SLAPD_OVERLAYS}" == 'none' ]]; then
+ message 'skipping overlays'
+ elif [[ "${SLAPD_OVERLAYS}" == 'all' ]]; then
+ message 'adding all overlays' &&
+ OVERLAYS='--enable-overlays=mod'
+ else
+ for OVERLAY in ${SLAPD_OVERLAYS}; do
+ OVERLAYS="${OVERLAYS} --enable-${OVERLAY}=mod"
+ done
+ fi
+
+ SLAPD_OPTS="$OPENLDAP_SLAPD $SLAPD_ACL $SLAPD_ACI $SLAPD_DNSSRV
+ $SLAPD_MONITOR $SLAPD_CRYPT $SLAPD_CLEAR $SLAPD_REV
+ $SLAPD_SOCK $SLAPD_META $SLAPD_RELAY $OVERLAYS"
+else
+ SLAPD_OPTS="$OPENLDAP_SLAPD"
+fi &&
+
OPTS="$OPTS
- $OPENLDAP_SLAPD $SLAPD_ACI $SLAPD_DNSSRV $SLAPD_MONITOR
- $OPENLDAP_SLURPD
+ $SLAPD_OPTS
--enable-shared --enable-static
--enable-dynamic
--enable-local" &&
diff --git a/collab/openldap/CONFIGURE b/collab/openldap/CONFIGURE
index 69e5b19..8ba29f9 100755
--- a/collab/openldap/CONFIGURE
+++ b/collab/openldap/CONFIGURE
@@ -1,22 +1,57 @@
-config_query_option OPENLDAP_SLAPD 'Build SLAPD, the standalone LDAP
daemon?' y \
- '--enable-slapd --enable-modules --enable-cleartext --enable-crypt
--enable-rlookups' \
- '--disable-slapd' &&
+source $GRIMOIRE/config_query_multi.function &&
-config_query_option OPENLDAP_SLURPD 'Build SLURPD, the replication daemon?'
y \
- '--enable-slurpd' '--disable-slurpd' &&
+config_query_option OPENLDAP_SLAPD 'Build SLAPD, the standalone LDAP
daemon?' y \
+ '--enable-slapd --enable-modules' '--disable-slapd' &&
if echo $OPENLDAP_SLAPD | grep -q enable; then
- config_query_list SLAPD_LDBM 'Select LDBM backend (Berkeley DB
recommended)' \
- db none &&
- config_query_option SLAPD_DNSSRV 'Enable DNS "SRV" record backend?' y \
+ config_query_option SLAPD_DNSSRV 'Enable DNS backend? (LDAP server
locator)' n \
'--enable-dnssrv=mod' '--disable-dnssrv' &&
- config_query_option SLAPD_MONITOR 'Enable monitor backend?' y \
+ config_query_option SLAPD_META 'Enable metadirectory backend?' n \
+ '--enable-meta=mod' '--disable-meta' &&
+ config_query_option SLAPD_MONITOR 'Enable LDAP server monitor backend?' y \
'--enable-monitor=mod' '--disable-monitor' &&
- config_query_option SLAPD_ACI 'Enable per-object access control' n \
+ config_query_option SLAPD_SOCK 'Enable sock backend?' n \
+ '--enable-sock=mod' '--disable-sock' &&
+ config_query_option SLAPD_RELAY 'Enable relay backend?' n \
+ '--enable-relay=mod' '--disable-relay' &&
+ config_query_option SLAPD_ACL 'Enable EXPERIMENTAL loadable ACL?' n \
+ '--enable-dynacl' '--disable-dynacl' &&
+ if echo $SLAPD_ACL|grep -q enable; then
+ config_query_option SLAPD_ACI 'Enable per-object access control' n \
'--enable-aci' '--disable-aci'
+ fi &&
+ config_query_option SLAPD_CLEAR 'Enable cleartext passwords?' y \
+ '--enable-cleartext' '--disable-cleartext' &&
+ config_query_option SLAPD_CRYPT 'Enable crypt passwords?' n \
+ '--enable-crypt' '--disable-crypt' &&
+ config_query_option SLAPD_REV 'Enable reverse lookup of client hostnames?'
n \
+ '--enable-rlookups' '--disable-rlookups'
fi &&
config_query OPENLDAP_NTLM "Enable NTLM API support (needed for Evolution
Exchange plugin)?" n &&
+config_query_multi SLAPD_OVERLAYS \
+ "which overlays do you want supported?" \
+ none all \
+ accesslog auditlog collect constraint dds deref dyngroup \
+ dynlist memberof ppolicy proxycache refint retcode rwm \
+ seqmod sssvlv syncprov translucent unique valsort
+
+if list_find "$SLAPD_OVERLAYS" "all"; then
+ SLAPD_OVERLAYS="all"
+elif list_find "$SLAPD_OVERLAYS" "none"; then
+ SLAPD_OVERLAYS="none"
+fi &&
+
+if echo $OPENLDAP_SLURPD |grep -q enable ; then
+ if list_find "$SLAPD_OVERLAYS" "syncprov"; then
+ message 'slurpd has been replaced by the syncprov overlay'
+ else
+ message 'slurpd has been replaced by the syncprov overlay, adding it' &&
+ SLAPD_OVERLAYS="${SLAPD_OVERLAYS} syncprov"
+ fi &&
+ persistent_remove OPENLDAP_SLURPD
+fi &&
+
message "${MESSAGE_COLOR}If you care about security, check out http://timof.qipc.org/ldap/libldap.html .$DEFAULT_COLOR" &&
message "${MESSAGE_COLOR}The patch is not in the spell anymore because of
version mismatch...$DEFAULT_COLOR."
diff --git a/collab/openldap/DEPENDS b/collab/openldap/DEPENDS
index d5bafb0..e3b7aa3 100755
--- a/collab/openldap/DEPENDS
+++ b/collab/openldap/DEPENDS
@@ -12,30 +12,57 @@ optional_depends openssl \
'--without-tls' \
'for SSL/TLS support' &&
-optional_depends cyrus-sasl '--with-cyrus-sasl' '--without-cyrus-sasl'
\
+optional_depends cyrus-sasl '--with-cyrus-sasl' '--without-cyrus-sasl' \
'for SASL authentication, if SLAPD is a backend authenticator for SASL,
say "no"' &&
if echo $OPENLDAP_SLAPD | grep -q enable; then
- case "$SLAPD_LDBM" in
- db)
- depends db '--enable-ldbm=mod --enable-ldbm-api=berkeley'
- ;;
- esac
+ optional_depends db '--enable-bdb=mod --enable-hdb=mod' \
+ '--disable-bdb --disable-hdb' \
+ 'for Berkeley DB backend (recommended)' &&
optional_depends ODBC-MGR \
'--enable-sql=mod' \
'--disable-sql' \
- 'for SQL backend' &&
+ 'for SQL backend (experimental)' &&
+ if [[ $(get_spell_provider $SPELL ODBC-MGR) ]]; then
+ if is_depends_enabled $SPELL unixodbc; then
+ depends unixodbc --with-odbc=unixodbc
+ elif is_depends_enabled $SPELL libiodbc; then
+ depends libiodbc --with-odbc=iodbc
+ else
+ message "${PROBLEM_COLOR}unknown ODBC provider selected, please update
spell${DEFAULT_COLOR}"
+ fi
+ fi &&
+
+ optional_depends MYSQL '--enable-mdb=mod' '--disable-mdb' \
+ 'for MYSQL backend' &&
+
+ if [[ $(get_spell_provider $SPELL MYSQL) ]]; then
+ config_query_option SLAPD_NDB 'Enable MYSQL NDB cluster support?' n \
+ '--enable-ndb=mod' '--disable-ndb'
+ if echo $SLAPD_NDB |grep -q enable ; then
+ if is_depends_enabled $SPELL mariadb; then
+ depends -sub NDB mariadb
+ elif is_depends_enabled $SPELL mysql; then
+ depends -sub NDB mysql
+ fi
+ fi
+ fi