Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.60 grimoire by Vlad Glagolev (f9b500fd3585cfe26c4fea3de54273a2688f4ff8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.60 grimoire by Vlad Glagolev (f9b500fd3585cfe26c4fea3de54273a2688f4ff8)
  • Date: Thu, 29 Mar 2012 14:38:39 -0500

GIT changes to stable-0.60 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

VERSION | 2
archive-libs/libzip/DETAILS | 5 +-
archive-libs/libzip/HISTORY | 9 +++
archive-libs/libzip/UP_TRIGGERS | 9 +++
chat-im/pidgin/BUILD | 3 -
chat-im/pidgin/DEPENDS | 7 ---
chat-im/pidgin/DETAILS | 4 -
chat-im/pidgin/HISTORY | 19 ++++++++
collab/openldap/BUILD | 26 ++++++++++-
collab/openldap/CONFIGURE | 55
+++++++++++++++++++-----
collab/openldap/DEPENDS | 45 +++++++++++++++----
collab/openldap/DETAILS | 12 ++---
collab/openldap/HISTORY | 24 ++++++++++
crypto/openssl/DETAILS | 8 +--
crypto/openssl/HISTORY | 4 +
dev/null |binary
gnome2-libs/libgdata/DEPENDS | 3 -
gnome2-libs/libgdata/DETAILS | 5 +-
gnome2-libs/libgdata/HISTORY | 10 ++++
gnome2-libs/libgdata/libgdata-0.10.2.tar.xz.sig |binary
gnome2-libs/libgdata/libgdata-0.6.6.tar.bz2.sig | 0
graphics-libs/freetype2/DETAILS | 4 -
graphics-libs/freetype2/HISTORY | 9 +++
http/nginx/DETAILS | 8 +--
http/nginx/HISTORY | 12 +++++
libs/libxslt/DETAILS | 4 -
libs/libxslt/HISTORY | 5 ++
libs/libxslt/PRE_BUILD | 4 +
libs/libxslt/pattern.patch | 11 ++++
net/ipset/HISTORY | 3 +
net/ipset/PRE_BUILD | 2
net/quagga/CONFLICTS | 2
net/quagga/DETAILS | 16 +++---
net/quagga/HISTORY | 10 ++++
net/quagga/quagga.gpg | 0
security/wireshark/DETAILS | 6 +-
security/wireshark/HISTORY | 3 +
video-libs/xvid/HISTORY | 3 +
video-libs/xvid/INSTALL | 3 +
video/transcode/DEPENDS | 37 +++++++++++++---
video/transcode/HISTORY | 5 ++
41 files changed, 323 insertions(+), 74 deletions(-)

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>

nginx: => 1.0.14 (stable), 1.1.17 (devel) [security]
(cherry picked from commit 2c842ffc22bf2a26e0d4a98d910366db41659f12)

commit e12577687f017b1043d042f974072559b4fa852a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nginx: => 1.0.12 (stable), 1.1.14 (devel)
(cherry picked from commit a695cead64f00fa8d6caebdf549b2634ee2a9892)

commit 3ba0907d77f16794d14043f8d6373a3b1e13d9b0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nginx: => 1.0.11 (stable), 1.1.12 (devel)
(cherry picked from commit bc55e2a1cc5ac577badd6c590eba8075d06b339d)

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>

pidgin: => 2.10.1
SECURITY_PATCH=12, CVE-2011-3594 & CVE-2011-4601
(cherry picked from commit fef48c12bf5b0a58550d6a3f639355196756cbd1)

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/VERSION b/VERSION
index 4411905..bc010ca 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.60-8
+0.60-9
diff --git a/archive-libs/libzip/DETAILS b/archive-libs/libzip/DETAILS
index 3453eca..8de59a3 100755
--- a/archive-libs/libzip/DETAILS
+++ b/archive-libs/libzip/DETAILS
@@ -1,6 +1,7 @@
SPELL=libzip
- VERSION=0.9.3
-
SOURCE_HASH=sha512:e10e563d79dbe633e8dc10e47c4b724be08d1d15176f46ba0dc433c6a8697484a55c2778d37ce93fbf760ca27a6d12268520d1af79aa0fa3e6926648ccd161e5
+ VERSION=0.10.1
+
SOURCE_HASH=sha512:bbbf22ab93e18630f33597a93057cd3b9e7fb9896b38ae1e6b883ad2b257dba859aab4870a0a31dec0407cfa72dd4b3a2d20403447945dcb96f548a0e57df87f
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.nih.at/libzip
diff --git a/archive-libs/libzip/HISTORY b/archive-libs/libzip/HISTORY
index 6280952..1415f1e 100644
--- a/archive-libs/libzip/HISTORY
+++ b/archive-libs/libzip/HISTORY
@@ -1,3 +1,12 @@
+2012-03-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.10.1
+ SECURITY_PATCH=1
+ CVE-2012-1162, CVE-2012-1163
+
+2012-01-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.10
+ * UP_TRIGGERS: added, libzip.so.1 -> libzip.so.2
+
2010-06-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.3

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

optional_depends perl \
'--enable-perl=mod' \
'--disable-perl' \
- 'for perl backend' &&
+ 'for perl backend (write your own storage backend)' &&
+
+ optional_depends bash \
+ '--enable-shell=mod' \
+ '--disable-shell' \
+ 'for shell backend (write your own storage backend)' &&

optional_depends shadow \
'--enable-passwd=mod' \
'--disable-passwd' \
- 'for passwd backend' &&
+ 'for passwd backend (demo code, do not use)' &&

optional_depends tcp_wrappers \
'--enable-wrappers' \
diff --git a/collab/openldap/DETAILS b/collab/openldap/DETAILS
index 87bb936..e26f484 100755
--- a/collab/openldap/DETAILS
+++ b/collab/openldap/DETAILS
@@ -1,13 +1,13 @@
SPELL=openldap
if [[ $OPENLDAP_BRANCH == stable ]]; then
- VERSION=2.4.23
- XVERSION=20100719
+ VERSION=2.4.30
+ XVERSION=20120311
SOURCE=$SPELL-stable-$XVERSION.tgz
-
SOURCE_HASH=sha512:cca9c32ab319cbe6fb851c0244a25d9e372f34f780a939b75cfe35fb77995918669b7d4e815bb7a7941a844f5b55b886caccc769180bfe87b20d66e4441008e2
+
SOURCE_HASH=sha512:89f032b069dc54cfe0c3149b85c5fedaf89b6b706c368da22852fed51c2574cb703823db1f4c52a9422d5274d4e70497f270fd558985675ab274d6025678c6f3
else
- VERSION=2.4.26
+ VERSION=2.4.30
SOURCE=$SPELL-$VERSION.tgz
-
SOURCE_HASH=sha512:2c1f0c708852f684c5429a94329d072b9a8154ef0243a91199229d990714253bb1837cd88e979fd1030d6d86c4686ac833f043fa441b448f21566be29140eb3c
+
SOURCE_HASH=sha512:89f032b069dc54cfe0c3149b85c5fedaf89b6b706c368da22852fed51c2574cb703823db1f4c52a9422d5274d4e70497f270fd558985675ab274d6025678c6f3
fi
SOURCE_URI=$SPELL-$OPENLDAP_BRANCH/$SOURCE
SOURCE_URL[0]=ftp://ftp.openldap.org/pub/OpenLDAP/$SOURCE_URI
@@ -18,7 +18,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
ENTERED=20010922
LICENSE[0]=http://www.openldap.org/software/release/license.html
KEYWORDS="ldap collab"
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
SHORT="fully featured open source LDAP software suite"
cat << EOF
The OpenLDAP Project is a collaborative effort to provide a robust,
diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY
index 44f2949..3581166 100644
--- a/collab/openldap/HISTORY
+++ b/collab/openldap/HISTORY
@@ -1,3 +1,27 @@
+2012-03-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.30 (stable); 2.4.30 was a security
update
+ (CVE-2012-1164) => SECURITY_PATCH++
+
+2012-03-01 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: ldbm support was removed upstream,
+ allow shell backend, added comments on several backends,
+ added mysql backends.
+ * CONFIGURE: removed obsolete ldbm and slurpd queries,
+ (auto enables syncprov overlay if slurpd was used)
+ added comments on backends.
+ don't enable dns backend by default.
+ added options for sock, relay and meta backends.
+ made reverse lookups, crypt and clear passwords optional.
+ added optional overlays.
+ * BUILD: fix check for enabled db, don't add slapd options when not
+ building slapd. added overlays, removed slurpd
+
+2012-03-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.30
+
+2011-12-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.28
+
2011-08-18 Bor Kraljič <pyrobor AT ver.si>
* BUILD: add -ldb to LDFLAGS if db support is enabled (fixes #50)

diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 6f9094d..1563ad8 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -6,12 +6,12 @@ fi

case $OPENSSL_BRANCH in
0.9)
- VERSION=0.9.8t
- SECURITY_PATCH=15
+ VERSION=0.9.8u
+ SECURITY_PATCH=16
;;
1.0)
- VERSION=1.0.0g
- SECURITY_PATCH=15
+ VERSION=1.0.0h
+ SECURITY_PATCH=16
PATCHLEVEL=0
;;
esac
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index ad4034a..2125561 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2012-03-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.8u, 1.0.0h, SECURITY_PATCH=16
+ http://www.openssl.org/news/secadv_20120312.txt
+
2012-01-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.8t, 1.0.0g, SECURITY_PATCH=15
http://www.openssl.org/news/secadv_20120118.txt
diff --git a/gnome2-libs/libgdata/DEPENDS b/gnome2-libs/libgdata/DEPENDS
index d4b093a..1d8d0cb 100755
--- a/gnome2-libs/libgdata/DEPENDS
+++ b/gnome2-libs/libgdata/DEPENDS
@@ -1,3 +1,4 @@
depends glib2 &&
depends -sub SOUP_GNOME libsoup &&
-depends libxml2
+depends libxml2 &&
+depends liboauth
diff --git a/gnome2-libs/libgdata/DETAILS b/gnome2-libs/libgdata/DETAILS
index 8429bf1..9b32a65 100755
--- a/gnome2-libs/libgdata/DETAILS
+++ b/gnome2-libs/libgdata/DETAILS
@@ -1,7 +1,8 @@
SPELL=libgdata
- VERSION=0.6.6
+ VERSION=0.10.2
+ SECURITY_PATCH=1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome2-libs/libgdata/HISTORY b/gnome2-libs/libgdata/HISTORY
index b6ca3b1..a4afa75 100644
--- a/gnome2-libs/libgdata/HISTORY
+++ b/gnome2-libs/libgdata/HISTORY
@@ -1,3 +1,13 @@
+2012-03-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.10.2, SECURITY_PATCH=1
+
+2011-09-29 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.10.1
+ * DEPENDS: liboauth added
+
+2011-04-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.8.0
+
2010-12-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.6.6

diff --git a/gnome2-libs/libgdata/libgdata-0.10.2.tar.xz.sig
b/gnome2-libs/libgdata/libgdata-0.10.2.tar.xz.sig
new file mode 100644
index 0000000..f23a103
Binary files /dev/null and b/gnome2-libs/libgdata/libgdata-0.10.2.tar.xz.sig
differ
diff --git a/gnome2-libs/libgdata/libgdata-0.6.6.tar.bz2.sig
b/gnome2-libs/libgdata/libgdata-0.6.6.tar.bz2.sig
deleted file mode 100644
index ba9a208..0000000
Binary files a/gnome2-libs/libgdata/libgdata-0.6.6.tar.bz2.sig and /dev/null
differ
diff --git a/graphics-libs/freetype2/DETAILS b/graphics-libs/freetype2/DETAILS
index 3b9875e..bc2559b 100755
--- a/graphics-libs/freetype2/DETAILS
+++ b/graphics-libs/freetype2/DETAILS
@@ -1,6 +1,6 @@
SPELL=freetype2
- VERSION=2.4.6
- SECURITY_PATCH=4
+ VERSION=2.4.9
+ SECURITY_PATCH=7
SOURCE=freetype-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/freetype-$VERSION"
diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY
index 4f49268..3bbb23e 100644
--- a/graphics-libs/freetype2/HISTORY
+++ b/graphics-libs/freetype2/HISTORY
@@ -1,3 +1,12 @@
+2012-03-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.9, SECURITY_PATCH=7
+
+2011-11-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.4.8, SECURITY_PATCH=6, CVE-2011-3439
+
+201-010-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.4.7, SECURITY_PATCH=5, CVE-2011-3256
+
2011-08-23 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: use gnu.gpg instead of freetype.gpg
* freetype.gpg: removed, no longer needed
diff --git a/http/nginx/DETAILS b/http/nginx/DETAILS
index 9bee45e..bf4bd48 100755
--- a/http/nginx/DETAILS
+++ b/http/nginx/DETAILS
@@ -6,8 +6,8 @@ fi

case "$NGINX_RELEASE" in
stable)
- VERSION=1.0.10
- SECURITY_PATCH=1
+ VERSION=1.0.14
+ SECURITY_PATCH=2
;;
legacy)
VERSION=0.8.55
@@ -17,8 +17,8 @@ case "$NGINX_RELEASE" in
SECURITY_PATCH=2
;;
devel)
- VERSION=1.1.8
- SECURITY_PATCH=1
+ VERSION=1.1.17
+ SECURITY_PATCH=2
;;
esac
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY
index 93b669e..299f8fb 100644
--- a/http/nginx/HISTORY
+++ b/http/nginx/HISTORY
@@ -1,3 +1,15 @@
+2012-03-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.0.14 (stable), 1.1.17 (devel) [security]
+
+2012-02-15 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.0.12 (stable), 1.1.14 (devel)
+
+2012-01-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.0.11 (stable), 1.1.12 (devel)
+
+2011-12-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.1.10 (devel)
+
2011-11-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.0.10 (stable), 1.1.8 (devel) [security]

diff --git a/libs/libxslt/DETAILS b/libs/libxslt/DETAILS
index 7b3038e..1708421 100755
--- a/libs/libxslt/DETAILS
+++ b/libs/libxslt/DETAILS
@@ -1,8 +1,8 @@
SPELL=libxslt
VERSION=1.1.26
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://xmlsoft.org/$SPELL/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
LICENSE[0]=BSD
diff --git a/libs/libxslt/HISTORY b/libs/libxslt/HISTORY
index 5265f3f..8a00e45 100644
--- a/libs/libxslt/HISTORY
+++ b/libs/libxslt/HISTORY
@@ -1,3 +1,8 @@
+2012-03-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * SECURITY_PATCH++
+ * PRE_BUILD: apply the patch
+ * pattern.patch: added, to fix security issue (CVE-2011-3970)
+
2009-09-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.1.26
* PRE_BUILD, locking.patch: removed, :-(
diff --git a/libs/libxslt/PRE_BUILD b/libs/libxslt/PRE_BUILD
new file mode 100755
index 0000000..fdcf12f
--- /dev/null
+++ b/libs/libxslt/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/pattern.patch"
diff --git a/libs/libxslt/pattern.patch b/libs/libxslt/pattern.patch
new file mode 100644
index 0000000..924425d
--- /dev/null
+++ b/libs/libxslt/pattern.patch
@@ -0,0 +1,11 @@
+--- libxslt/pattern.c.orig
++++ libxslt/pattern.c
+@@ -1867,6 +1867,8 @@ xsltCompilePatternInternal(const xmlChar *pattern,
xmlDocPtr doc,
+ while ((pattern[end] != 0) && (pattern[end] != '"'))
+ end++;
+ }
++ if (pattern[end] == 0)
++ break;
+ end++;
+ }
+ if (current == end) {
diff --git a/net/ipset/HISTORY b/net/ipset/HISTORY
index f45283a..f7b8610 100644
--- a/net/ipset/HISTORY
+++ b/net/ipset/HISTORY
@@ -1,3 +1,6 @@
+2012-02-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: killed typo
+
2012-01-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 6.11

diff --git a/net/ipset/PRE_BUILD b/net/ipset/PRE_BUILD
index bf5547d..c420cc0 100755
--- a/net/ipset/PRE_BUILD
+++ b/net/ipset/PRE_BUILD
@@ -7,6 +7,6 @@ else
cd "$INSTALL_ROOT/usr/src/linux" &&

if ! grep -q NFNL_SUBSYS_IPSET include/linux/netfilter/nfnetlink.h; then
- patch -d -Np1 < "$SOURCE_DIRECTORY/netlink.patch"
+ patch -d . -Np1 < "$SOURCE_DIRECTORY/netlink.patch"
fi
fi
diff --git a/net/quagga/CONFLICTS b/net/quagga/CONFLICTS
index 05cd131..85a7250 100755
--- a/net/quagga/CONFLICTS
+++ b/net/quagga/CONFLICTS
@@ -1 +1 @@
-conflicts zebra
+conflicts zebra y
diff --git a/net/quagga/DETAILS b/net/quagga/DETAILS
index 6de83a2..a692bba 100755
--- a/net/quagga/DETAILS
+++ b/net/quagga/DETAILS
@@ -1,18 +1,16 @@
SPELL=quagga
- VERSION=0.99.20
- SECURITY_PATCH=1
+ VERSION=0.99.20.1
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE2=${SOURCE}.asc
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL=http://www.quagga.net/download/$SOURCE
- SOURCE2_URL=${SOURCE_URL}.asc
- SOURCE_GPG="quagga.gpg:${SOURCE}.asc:UPSTREAM_KEY"
- SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://www.quagga.net/download/$SOURCE
+ SOURCE_URL[1]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:854c3e2786e80b87d635ff6858950a3edc8971dd4909f4c8df5bdbf888fd2c7679bf3231b7996fd6117e588c92b66c061feaa3d4ad96ca36e1d18cb57cddc6c3
WEB_SITE=http://www.quagga.net/
LICENSE[0]=GPL
ENTERED=20030905
KEYWORDS="net"
- SHORT="A routing software suite."
+ SHORT="routing software suite"
cat << EOF
Quagga is a routing software suite, providing implementations of OSPFv2,
OSPFv3, RIP v1 and v2, RIPv3 and BGPv4 for Unix platforms. Quagga is a fork
of
diff --git a/net/quagga/HISTORY b/net/quagga/HISTORY
index 86771ab..395eb6c 100644
--- a/net/quagga/HISTORY
+++ b/net/quagga/HISTORY
@@ -1,3 +1,13 @@
+2012-03-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: corrected misused hash sum
+
+2012-03-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.99.20.1, SECURITY_PATCH++; quoting
+ paths; added 2nd mirror; switched to hash check; cleaned up
+
+2011-11-16 Tommy Boatman <tboatman AT sourcemage.org>
+ * CONFLICTS: added y to zebra conflict for autocast
+
2011-10-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH=1 (CVEs: 2011-3323, 2011-3324, 2011-3325,
2011-3326, 2011-3327, 2010-1674, 2010-1675 at least)
diff --git a/net/quagga/quagga.gpg b/net/quagga/quagga.gpg
deleted file mode 100644
index 8a4440a..0000000
Binary files a/net/quagga/quagga.gpg and /dev/null differ
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index 08e4196..a3399c4 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=1.6.5
- SECURITY_PATCH=34
+ VERSION=1.6.6
+ SECURITY_PATCH=35
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-
SOURCE_HASH=sha512:67c12d6853219f3c57c7946ffb98697639e9e40fc4c0b9dc27ca50b301fb40cb74c08d31cc35b1120cbb0315f1ddcce47d82ae2dec9733a764614090c76df0f3
+
SOURCE_HASH=sha512:ed74915a4cbd5626c37d4f71aea533e729db9dbd1c9e860bcd5c3e306deea37572096834d77d3639348eaf2c6fdd2d2bfeb2fdb4f253fb9b50e3c138aa516285
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index e8190e9..d881692 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,6 @@
+2012-03-27 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.6, SECURITY_PATCH=35
+
2012-01-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.5, SECURITY_PATCH=34
* PRE_BUILD, dumpcap.patch: removed
diff --git a/video-libs/xvid/HISTORY b/video-libs/xvid/HISTORY
index 247dbb7..f562eb7 100644
--- a/video-libs/xvid/HISTORY
+++ b/video-libs/xvid/HISTORY
@@ -1,3 +1,6 @@
+2012-03-12 Arjan Bouter <abouter AT sourcemage.org>
+ * INSTALL: added libxvidcore.so symlink
+
2011-07-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.2

diff --git a/video-libs/xvid/INSTALL b/video-libs/xvid/INSTALL
new file mode 100755
index 0000000..5053a58
--- /dev/null
+++ b/video-libs/xvid/INSTALL
@@ -0,0 +1,3 @@
+default_install &&
+cd "${INSTALL_ROOT}/usr/lib" &&
+ln -vsf libxvidcore.so.4 libxvidcore.so
diff --git a/video/transcode/DEPENDS b/video/transcode/DEPENDS
index 5153e7a..9b22e2f 100755
--- a/video/transcode/DEPENDS
+++ b/video/transcode/DEPENDS
@@ -1,10 +1,22 @@
-# auto* for configure hacking
+ auto* for configure hacking
depends autoconf &&
depends automake &&

depends zlib &&
-depends libmpeg2 &&
-depends LIBAVCODEC &&
+
+optional_depends LIBAVCODEC '--enable-ffmpeg' \
+ '--disable-ffmpeg' \
+ 'for ffmpeg support' &&
+
+optional_depends libv4l '--enable-v4l --enable-libv4l2' \
+ '--disable-v4l' \
+ 'for video4linux support' &&
+
+optional_depends alsa-lib \
+ '--enable-alsa' \
+ '--disable-alsa' \
+ 'for alsa audio support' &&
+
optional_depends nasm \
"" \
"" \
@@ -35,6 +47,11 @@ optional_depends libdv \
"--disable-libdv" \
"for Quasar DV code support" &&

+optional_depends faac \
+ '--enable-faac' \
+ '--disable-faac' \
+ 'for faac support' &&
+
optional_depends lame \
"--enable-lame" \
"--disable-lame" \
@@ -91,10 +108,20 @@ optional_depends JPEG \
"for JPEG image support" &&

optional_depends xvid \
- "" \
- "" \
+ "--enable-xvid" \
+ "--disable-xvid" \
"for xvid de-/encoding support" &&

+optional_depends x264 \
+ '--enable-x264' \
+ '--disable-x264' \
+ 'for x264 support' &&
+
+optional_depends libmpeg2 \
+ '--enable-libmpeg2' \
+ '--disable-libmpeg2' \
+ 'for mpeg2 support' &&
+
optional_depends libmpeg3 \
"--enable-libmpeg3" \
"--disable-libmpeg3" \
diff --git a/video/transcode/HISTORY b/video/transcode/HISTORY
index 456277f..031e4a7 100644
--- a/video/transcode/HISTORY
+++ b/video/transcode/HISTORY
@@ -1,3 +1,8 @@
+2012-03-12 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: made libmpeg2 and LIBAVCODEC optional,
+ added missing deps on libv4l, alsa-lib, faac and x264.
+ completed options for xvid.
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG




  • [SM-Commit] GIT changes to stable-0.60 grimoire by Vlad Glagolev (f9b500fd3585cfe26c4fea3de54273a2688f4ff8), Vlad Glagolev, 03/29/2012

Archive powered by MHonArc 2.6.24.

Top of Page