Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (725b40f64eceb40c900768b4bcfca2d39fb320eb)

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.61 grimoire by Vlad Glagolev (725b40f64eceb40c900768b4bcfca2d39fb320eb)
  • Date: Wed, 3 Oct 2012 07:51:04 -0500

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

VERSION | 2 -
chat-im/pidgin/BUILD | 5 ++
chat-im/pidgin/HISTORY | 3 +
database/postgresql/DETAILS | 4 +-
database/postgresql/HISTORY | 3 +
dev/null |binary
kernels/linux/HISTORY | 11 ++++++
kernels/linux/info/kernels/3.6 | 5 ++
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.43 | 5 ++
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.44 | 5 ++
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.29 | 5 ++
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.30 | 5 ++
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.11 | 5 ++
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.12 | 5 ++
kernels/linux/info/patches/maintenance_patches_3/patch-3.5.5 | 5 ++
kernels/linux/info/patches/maintenance_patches_3/patch-3.6 | 5 ++
kernels/linux/latest.defaults | 4 +-
libs/libxslt/DETAILS | 5 +-
libs/libxslt/HISTORY | 4 ++
libs/libxslt/PRE_BUILD | 4 --
libs/libxslt/libxslt-1.1.26.tar.gz.sig | 0
libs/libxslt/libxslt-1.1.27.tar.gz.sig |binary
libs/libxslt/pattern.patch | 11 ------
php-pear/php/DETAILS | 18
+++++-----
php-pear/php/HISTORY | 9 +++++
php-pear/php/PRE_BUILD | 3 +
php-pear/php/pcre830.patch | 15 ++++++++
security/wireshark/DETAILS | 6 +--
security/wireshark/HISTORY | 3 +
29 files changed, 119 insertions(+), 36 deletions(-)

New commits:
commit 725b40f64eceb40c900768b4bcfca2d39fb320eb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

VERSION: 0.61-6

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

php: fixed build with ext. pcre >=8.30 (legacy)
(cherry picked from commit 1f1e4fc840baf6da8e23d104a5b01487bcfb2f8a)

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

php: updated backports+security patches to 20120924 (legacy branch)
(cherry picked from commit 658fed6e4b62800b50a279d7fe3cd3609191873f)

commit 141a90d348f852138b401e749ea570bf63517ec0
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

php 5.3.17
(cherry picked from commit 09f23e0216e1517aded7b365989131538e1ffd6d)

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

libxslt: => 1.1.27 (security)
(cherry picked from commit 4980d9f710b5406fd80ea15ecb9a5ecf6bb4cc23)

commit 4ac764c9f922de01349bce418ae75efedefed002
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

wireshark 1.8.3, SECURITY_PATCH=39
(cherry picked from commit 4ef53de40badadf9c9ee5191559b9c15f4248e84)

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

linux: => 3.0.44 (lts)
(cherry picked from commit a51ad14bc905d25ca0c73d1ca7bdba6ad3cdb707)

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

linux: => 3.2.30 (lts)
(cherry picked from commit b48f3c4689d6c6caf3202ae4cfd56ec732ebd978)

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

linux: => 3.4.12 (lts)
(cherry picked from commit 700bd966265a3c3d36713b93ae16a8488c5a135f)

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

linux: => 3.5.5 (lts)
(cherry picked from commit 3584f89d79a7b0340e3e91df1707aa412a2eff8e)

commit 557e735b665e51784fa9278e53576d31c10fa3a0
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux 3.6
(cherry picked from commit e736cc1882acd810bcca5b27d442815c3a37786d)

commit 3466efb8468457c124e97ec67a4ffb9aaf20c565
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pidgin: explicitly link against libX11

Seems the linker isn't resolving dependencies automatically anymore.
(cherry picked from commit 9b1078073e818433df36afa60667982eba138d02)

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

postgresql: => 9.1.6

diff --git a/VERSION b/VERSION
index 0a0d7d6..37e18a7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.61-5
+0.61-6
diff --git a/chat-im/pidgin/BUILD b/chat-im/pidgin/BUILD
index 88862af..a5297e2 100755
--- a/chat-im/pidgin/BUILD
+++ b/chat-im/pidgin/BUILD
@@ -1,6 +1,11 @@
### had to cook up some pkg-config files for nss and nspr
CFLAGS="$CFLAGS -I${TRACK_ROOT}/usr/X11R6/include" &&
+
+if is_depends_enabled $SPELL gtk+2; then
+ LIBS="$LIBS -lX11"
+endif &&
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/HISTORY b/chat-im/pidgin/HISTORY
index 8ba70d0..448d7e6 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,6 @@
+2012-10-01 Ismael Luceno <ismael.luceno AT gmail.com>
+ * BUILD: explicitly link against libX11
+
2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: removed optional-depends howl

diff --git a/database/postgresql/DETAILS b/database/postgresql/DETAILS
index 9561cd4..c0dfdec 100755
--- a/database/postgresql/DETAILS
+++ b/database/postgresql/DETAILS
@@ -1,6 +1,6 @@
SPELL=postgresql
- VERSION=9.1.5
-
SOURCE_HASH=sha512:63998808c8a5ad7a4712d6639a7d77d01bfdfee1ea41a40e7db1c4c469e3ecdf3af78a0451907aaf856f2e76e5166de15fb9009143fca8b4d36c964291402930
+ VERSION=9.1.6
+
SOURCE_HASH=sha512:80fbb62734ac20a500ef9f0a307543011a376c3162304cd8996cba3ea4aba32681dfa556ba06450bdc400971efb65cc9ce2635844950e4f6f31badaa93fe25a4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.postgresql.org/pub/source/v$VERSION/$SOURCE
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index 4e1f1e5..f8e437b 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,3 +1,6 @@
+2012-10-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9.1.6
+
2012-08-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 9.1.5; SECURITY_PATCH++

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 9ac8b4e..a07ca09 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,14 @@
+2012-10-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.5.5: added
+ * info/patches/maintenance_patches_3/patch-3.4.{11,12}: added
+ * info/patches/maintenance_patches_3/patch-3.2.{29,30}: added
+ * info/patches/maintenance_patches_3/patch-3.0.{43,44}: added
+
+2012-10-01 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=3.6, LATEST_3=3.6
+ * info/kernels/3.6: added
+ * info/patches/maintenance_patches_3/patch-3.6: added
+
2012-09-14 Ladislav Hagara <hgr AT vabo.cz>
* latest.defaults: LATEST_maintenance_patches_3=patch-3.5.4
* info/patches/maintenance_patches_3/patch-3.5.4: added
diff --git a/kernels/linux/info/kernels/3.6 b/kernels/linux/info/kernels/3.6
new file mode 100755
index 0000000..0b22a65
--- /dev/null
+++ b/kernels/linux/info/kernels/3.6
@@ -0,0 +1,5 @@
+version="3.6"
+source="linux-${version}.tar.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+source2="linux-${version}.tar.sign"
+source2_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source2}"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.43
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.43
new file mode 100755
index 0000000..9a9d509
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.43
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.43"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="12ce4ec2d3a7fa70df54e101a1953e9539f0daac"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.44
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.44
new file mode 100755
index 0000000..ed8573c
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.44
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.44"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="6b21a8a51f9965834b2a0c71249e22be06a22398"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.29
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.29
new file mode 100755
index 0000000..cb4990b
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.29
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.29"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="00f1315c80d40b520987011b3d90a9d1db22091f"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.30
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.30
new file mode 100755
index 0000000..cf1c528
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.30
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.30"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="1537ad3443044014e146a69406d6d0857fd401df"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.11
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.11
new file mode 100755
index 0000000..7770184
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.11
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.11"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="04e4074e365967d8511d4f40b78f0a44045d286a"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.12
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.12
new file mode 100755
index 0000000..298f9c9
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.12
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.12"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="97bbfecbce3316745724617efcccb60dda912185"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.5.5
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.5.5
new file mode 100755
index 0000000..ecf4646
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.5.5
@@ -0,0 +1,5 @@
+appliedkernels="3.5"
+patchversion="${appliedkernels}.5"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="277ccd1097aa3a8b2562df1753738928892332c4"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.6
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6
new file mode 100755
index 0000000..ea51d28
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6
@@ -0,0 +1,5 @@
+patchversion="3.6.0"
+source=""
+source_url=""
+appliedkernels="3.6"
+md5sum=""
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 2e61990..2cdc622 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,8 +1,8 @@
-LATEST_3=3.5
+LATEST_3=3.6
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.5.4
+LATEST_maintenance_patches_3=patch-3.6
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/libs/libxslt/DETAILS b/libs/libxslt/DETAILS
index 0feecb3..8a0dfff 100755
--- a/libs/libxslt/DETAILS
+++ b/libs/libxslt/DETAILS
@@ -1,7 +1,6 @@
SPELL=libxslt
- VERSION=1.1.26
- PATCHLEVEL=1
- SECURITY_PATCH=2
+ VERSION=1.1.27
+ SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://xmlsoft.org/$SPELL/$SOURCE
diff --git a/libs/libxslt/HISTORY b/libs/libxslt/HISTORY
index afd3c73..088ce67 100644
--- a/libs/libxslt/HISTORY
+++ b/libs/libxslt/HISTORY
@@ -1,3 +1,7 @@
+2012-10-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.1.27; SECURITY_PATCH++ (several CVEs)
+ * PRE_BUILD, pattern.patch: dropped
+
2012-04-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* DEPENDS: add icu if libmxl2 uses it
diff --git a/libs/libxslt/PRE_BUILD b/libs/libxslt/PRE_BUILD
deleted file mode 100755
index fdcf12f..0000000
--- a/libs/libxslt/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/pattern.patch"
diff --git a/libs/libxslt/libxslt-1.1.26.tar.gz.sig
b/libs/libxslt/libxslt-1.1.26.tar.gz.sig
deleted file mode 100644
index 975b530..0000000
Binary files a/libs/libxslt/libxslt-1.1.26.tar.gz.sig and /dev/null differ
diff --git a/libs/libxslt/libxslt-1.1.27.tar.gz.sig
b/libs/libxslt/libxslt-1.1.27.tar.gz.sig
new file mode 100644
index 0000000..95f11dc
Binary files /dev/null and b/libs/libxslt/libxslt-1.1.27.tar.gz.sig differ
diff --git a/libs/libxslt/pattern.patch b/libs/libxslt/pattern.patch
deleted file mode 100644
index 924425d..0000000
--- a/libs/libxslt/pattern.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 8017ce4..5114f97 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,8 +1,8 @@
SPELL=php
if [[ $PHP5_BRANCH == stable ]]; then
- VERSION=5.3.16
+ VERSION=5.3.17
SECURITY_PATCH=19
-
SOURCE_HASH=sha512:719667d7f6a6b6894c234aac9d2d609583032b422dbd5de0d87c4cf3ff7736885a08c5bfad212db9839622e75b8a2cf2d078731208318475c74469ef837e7cbf
+
SOURCE_HASH=sha512:70f5dca6c5e19c38b0586cd2f3854459ca56cac929b6c0cf8fda606b21031576c08214e817411c1c76158b14d09c175b9ef6ff35e17536b9dc80bdfb7d9b8937
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
if [[ $PHP5_SUHOSIN == y ]]; then
@@ -16,14 +16,14 @@ if [[ $PHP5_BRANCH == stable ]]; then
SOURCE2_GPG="suhosin.gpg:$SOURCE3:UPSTREAM_KEY"
fi
elif [[ $PHP5_BRANCH == alpha ]]; then
- VERSION=5.3.16
-
SOURCE_HASH=sha512:719667d7f6a6b6894c234aac9d2d609583032b422dbd5de0d87c4cf3ff7736885a08c5bfad212db9839622e75b8a2cf2d078731208318475c74469ef837e7cbf
+ VERSION=5.3.17
+
SOURCE_HASH=sha512:70f5dca6c5e19c38b0586cd2f3854459ca56cac929b6c0cf8fda606b21031576c08214e817411c1c76158b14d09c175b9ef6ff35e17536b9dc80bdfb7d9b8937
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
SECURITY_PATCH=19
elif [[ $PHP5_BRANCH == legacy ]]; then
VERSION=5.2.17
- SECURITY_PATCH=19
+ SECURITY_PATCH=20

SOURCE_HASH=sha512:baf3b5038468c9fa7c1a9e0506ed23559c21ba8df29380498a24e8d31c4c5f3633f29b1bc2faa3e59c6e5336536c09e19a5462b0a9d5916181c08f1f19abbca8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
@@ -37,13 +37,13 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
SOURCE3_URL="http://download.suhosin.org/$SOURCE3";
SOURCE2_GPG="suhosin.gpg:$SOURCE3:UPSTREAM_KEY"
fi
- SOURCE4=php52-backports-20120826.patch
+ SOURCE4=php52-backports-20120924.patch
SOURCE4_URL=http://php52-backports.googlecode.com/files/$SOURCE4
-
SOURCE4_HASH=sha512:edff47355256c2270a61b7e01df98067b44ce7be6b7cb70de595fd369e1389c3c6bf7bc0b6ac1309bb0be13e0f8382eb07f3c8ce523671e6b5e76fa91a219c05
+
SOURCE4_HASH=sha512:1753ebbe9c5abadc13dc84ad1cb3baa7369489691016eb4a49fa51120fc7eeb9971ece34767ce4659b4b35b2b9744d7d84c20cf1ba84acab015650c7a1fd9d96
else
- VERSION=5.3.16
+ VERSION=5.3.17
SECURITY_PATCH=19
-
SOURCE_HASH=sha512:719667d7f6a6b6894c234aac9d2d609583032b422dbd5de0d87c4cf3ff7736885a08c5bfad212db9839622e75b8a2cf2d078731208318475c74469ef837e7cbf
+
SOURCE_HASH=sha512:70f5dca6c5e19c38b0586cd2f3854459ca56cac929b6c0cf8fda606b21031576c08214e817411c1c76158b14d09c175b9ef6ff35e17536b9dc80bdfb7d9b8937
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://downloads.php.net/johannes/$SOURCE
fi
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index c1fbba0..85bd433 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,12 @@
+2012-10-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated backports+security patches to 20120924;
+ SECUIRTY_PATCH++
+ * PRE_BUILD: apply the patch for legacy php branch
+ * pcre830.patch: added to fix build with external pcre lib >=8.30
+
+2012-09-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 5.3.17
+
2012-08-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated backports+security patches to 20120826;
SECUIRTY_PATCH++
diff --git a/php-pear/php/PRE_BUILD b/php-pear/php/PRE_BUILD
index b3c82e4..96280bb 100755
--- a/php-pear/php/PRE_BUILD
+++ b/php-pear/php/PRE_BUILD
@@ -3,7 +3,8 @@ cd "${SOURCE_DIRECTORY}" &&

if [[ $PHP5_BRANCH == legacy ]]; then
unpack_file 4 &&
- patch -p1 < "${SOURCE_CACHE}/${SOURCE4}"
+ patch -p1 < "${SOURCE_CACHE}/${SOURCE4}" &&
+ patch -p0 < "$SPELL_DIRECTORY/pcre830.patch"
fi &&

if [[ "${PHP5_SUHOSIN}" == "y" ]]; then
diff --git a/php-pear/php/pcre830.patch b/php-pear/php/pcre830.patch
new file mode 100644
index 0000000..c47722a
--- /dev/null
+++ b/php-pear/php/pcre830.patch
@@ -0,0 +1,15 @@
+--- ext/pcre/php_pcre.c.orig
++++ ext/pcre/php_pcre.c
+@@ -252,10 +252,11 @@
+ back the compiled pattern, otherwise go on and compile it. */
+ if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void
**)&pce) == SUCCESS) {
+ /*
+- * We use a quick pcre_info() check to see whether cache is
corrupted, and if it
++ * We use a quick pcre_fullinfo() check to see whether cache
is corrupted, and if it
+ * is, we flush it and compile the pattern from scratch.
+ */
+- if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
++ int count = 0;
++ if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT,
&count) == PCRE_ERROR_BADMAGIC) {
+ zend_hash_clean(&PCRE_G(pcre_cache));
+ } else {
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index 93c7b07..a3070c4 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=1.8.2
- SECURITY_PATCH=38
+ VERSION=1.8.3
+ SECURITY_PATCH=39
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:219ec8249072773719162851515eb9c29a01693c9ba4d57976afad1e58d30cac9aefb482d3c6113386c39cfab775919ad68a888e94de8d62af0e8b8da7c3991b
+
SOURCE_HASH=sha512:acc6a6fcbf86f67d3d5cb9cfbe4eed3699465f4687c2eca88fa51b417b3bbb68e80630ae5ace814e1a5dfd6f269b286237e4dcaafe510eb4ce87bde044413504
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 5c2f2d6..6ee662e 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,6 @@
+2012-10-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.3, SECURITY_PATCH=39
+
2012-08-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.2, SECURITY_PATCH=38




  • [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (725b40f64eceb40c900768b4bcfca2d39fb320eb), Vlad Glagolev, 10/03/2012

Archive powered by MHonArc 2.6.24.

Top of Page