Skip to Content.
Sympa Menu

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

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 (60e4a587bc08275ed2659d98ce788e3c86592b3c)
  • Date: Fri, 23 Nov 2012 15:01:34 -0600

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

http/firefox/DETAILS | 6 +-
http/firefox/HISTORY | 3 +
http/lighttpd/DETAILS | 6 +-
http/lighttpd/HISTORY | 6 ++
kernels/linux/HISTORY | 8 +++
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.52 | 5 ++
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.19 | 5 ++
kernels/linux/info/patches/maintenance_patches_3/patch-3.6.7 | 5 ++
kernels/linux/latest.defaults | 2
mail/masqmail/DETAILS | 1
mail/masqmail/HISTORY | 5 ++
mail/masqmail/INSTALL | 2
net/chrony/HISTORY | 4 +
net/chrony/PRE_BUILD | 4 +
net/chrony/no-ipv6.patch | 20
+++++++++
php-pear/php/DETAILS | 6 +-
php-pear/php/HISTORY | 4 +
wm-addons/xxkb/DETAILS | 2
wm-addons/xxkb/HISTORY | 6 ++
wm-addons/xxkb/PRE_BUILD | 1
wm-addons/xxkb/missing_init.patch | 22
++++++++++
21 files changed, 111 insertions(+), 12 deletions(-)

New commits:
commit 60e4a587bc08275ed2659d98ce788e3c86592b3c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.0.52 (lts)
(cherry picked from commit db6ad373b22456197c61864038ffd7d3531b5bce)

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

linux: => 3.4.19 (lts)
(cherry picked from commit 0c86e4b6839f4bdfd9049db12b720eec494c915e)

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

php: updated backports+security patches to 20121114 (legacy)
(cherry picked from commit 418c54f2d0a3f903f45562f4f270203ad0d10ef6)

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

xxkb: fixed crash in some cases (see
https://bugs.gentoo.org/show_bug.cgi?id=407127)
(cherry picked from commit b8c1912f6d7029e12f1222fae55485452a958dc8)

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

firefox 17.0, SECURITY_PATCH=57
(cherry picked from commit 14202a6910f5f5634f8e4aef1c7753d0cb22de58)

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

lighttpd: => 1.4.32 (security)
(cherry picked from commit 12b44fef02e769cac080a5f4d319f7ef10eecb99)

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

lighttpd: => 1.4.31
(cherry picked from commit b7e1e4c8c1bb58942c296d27c61ae7427d6c4ac2)

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

chrony: fixed build without IPv6 support
(cherry picked from commit 46cb7d5d4016798348b7f831624763d5553fad9e)

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

masqmail: corrected permissions for maildir
(cherry picked from commit 0fdb11f44af9c9c2d50d6859330fe3e7a3cdb158)

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

linux 3.6.7
(cherry picked from commit c391106a4991e950db598fe33d7331bbe26bf45c)

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index abc472c..577fdb0 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=16.0.2
+ VERSION=17.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=16.0.2
+ VERSION=17.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -15,7 +15,7 @@ else

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=56
+ SECURITY_PATCH=57
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index a7ec542..79319d6 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2012-11-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 17.0, SECURITY_PATCH=57
+
2012-10-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 16.0.2, SECURITY_PATCH=56

diff --git a/http/lighttpd/DETAILS b/http/lighttpd/DETAILS
index 1b77f84..021d6e4 100755
--- a/http/lighttpd/DETAILS
+++ b/http/lighttpd/DETAILS
@@ -1,14 +1,14 @@
SPELL=lighttpd
- VERSION=1.4.30
+ VERSION=1.4.32
BRANCH=`echo -n $VERSION | cut -d . -f 1,2`
-
SOURCE_HASH=sha512:a5bf730d7699aa4c825dfd1333eea0dbdedfa29a0c43854c23c8b0eb13a12c75b3944c862fd094dee521f7bad78e50b5aa07607002ef590e14ba68fb1cac05a2
+
SOURCE_HASH=sha512:ffd5488a2ed57daa26b6d16223f422a94e88f2488cdc50bbb354c45daa535fbf9231fbbe73c23327a0adb708cc2b67fbdc60c34195a2a46a171dcc0f30bb3efb
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]=http://download.lighttpd.net/lighttpd/releases-$BRANCH.x/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.lighttpd.net/
LICENSE[0]=BSD
ENTERED=20050722
- SECURITY_PATCH=7
+ SECURITY_PATCH=8
KEYWORDS="http"
SHORT="light httpd"
cat << EOF
diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index 13b49cc..eb5b48e 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,3 +1,9 @@
+2012-11-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.32; SECURITY_PATCH++ (CVE-2012-5533)
+
+2012-05-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.31
+
2011-12-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.30; SECURITY_PATCH++ (CVE-2011-4362)

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 74bc11f..0437720 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,11 @@
+2012-11-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.4.19: added
+ * info/patches/maintenance_patches_3/patch-3.0.52: added
+
+2012-11-18 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.6.7
+ * info/patches/maintenance_patches_3/patch-3.6.7: added
+
2012-11-17 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.2.34: added

diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.52
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.52
new file mode 100755
index 0000000..1e7928d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.52
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.52"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="b66089a5add9d1da2c78531c8a63dacc28ee0d76"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.19
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.19
new file mode 100755
index 0000000..9d9f9bc
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.19
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.19"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="09f73e30b2fcd1911d297fcae8d5317f2bbf0c81"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.7
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.7
new file mode 100755
index 0000000..0351d6d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.6.7
@@ -0,0 +1,5 @@
+appliedkernels="3.6"
+patchversion="${appliedkernels}.7"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="f4329a73dd2d98e29c8b30b9136f4c0c3b2d0c60"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 69a6cc6..b666dd7 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ 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.6.6
+LATEST_maintenance_patches_3=patch-3.6.7
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/mail/masqmail/DETAILS b/mail/masqmail/DETAILS
index aab8643..6dfe039 100755
--- a/mail/masqmail/DETAILS
+++ b/mail/masqmail/DETAILS
@@ -1,5 +1,6 @@
SPELL=masqmail
VERSION=0.3.4
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://marmaro.de/prog/$SPELL/files/$SOURCE
diff --git a/mail/masqmail/HISTORY b/mail/masqmail/HISTORY
index 122d387..5b53f50 100644
--- a/mail/masqmail/HISTORY
+++ b/mail/masqmail/HISTORY
@@ -1,3 +1,8 @@
+2012-11-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * INSTALL: set up /var/spool/mail under 'mail' group; changed mode to
+ 2775
+
2012-09-10 Vlad Glagolev <stealth AT sourcemage.org>
* INSTALL: corrected default config installation

diff --git a/mail/masqmail/INSTALL b/mail/masqmail/INSTALL
index 034a598..14b4119 100755
--- a/mail/masqmail/INSTALL
+++ b/mail/masqmail/INSTALL
@@ -9,7 +9,7 @@ ln -vsf "$TRACK_ROOT/usr/sbin/masqmail"
"$INSTALL_ROOT/usr/sbin/mailq" &&
ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/runq" &&
ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/mailrm" &&

-install -vm 1777 -d -o masqmail -g masqmail "$INSTALL_ROOT/var/spool/mail" &&
+install -vm 2775 -d -o masqmail -g mail "$INSTALL_ROOT/var/spool/mail" &&

if [[ -e $INSTALL_ROOT/var/spool/mail/input ]]; then
chown -R masqmail:masqmail "$INSTALL_ROOT/var/spool/mail/input"
diff --git a/net/chrony/HISTORY b/net/chrony/HISTORY
index d08d368..b026b83 100644
--- a/net/chrony/HISTORY
+++ b/net/chrony/HISTORY
@@ -1,3 +1,7 @@
+2012-11-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply the patch
+ * no-ipv6.patch: added, to fix build without IPv6 support
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/net/chrony/PRE_BUILD b/net/chrony/PRE_BUILD
new file mode 100755
index 0000000..25482b9
--- /dev/null
+++ b/net/chrony/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/no-ipv6.patch"
diff --git a/net/chrony/no-ipv6.patch b/net/chrony/no-ipv6.patch
new file mode 100644
index 0000000..0f13a0f
--- /dev/null
+++ b/net/chrony/no-ipv6.patch
@@ -0,0 +1,20 @@
+--- ntp_io.c.orig 2011-07-13 16:55:28.000000000 +0400
++++ ntp_io.c 2012-11-21 17:44:29.000000000 +0400
+@@ -355,7 +355,7 @@
+ }
+ #endif
+
+-#ifdef IPV6_PKTINFO
++#if defined(IPV6_PKTINFO) && defined(HAVE_IPV6)
+ if (cmsg->cmsg_level == IPPROTO_IPV6 && cmsg->cmsg_type ==
IPV6_PKTINFO) {
+ struct in6_pktinfo ipi;
+
+@@ -466,7 +466,7 @@
+ }
+ #endif
+
+-#ifdef IPV6_PKTINFO
++#if defined(IPV6_PKTINFO) && defined(HAVE_IPV6)
+ if (remote_addr->local_ip_addr.family == IPADDR_INET6) {
+ struct cmsghdr *cmsg;
+ struct in6_pktinfo *ipi;
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 5114f97..6c07afa 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -23,7 +23,7 @@ elif [[ $PHP5_BRANCH == alpha ]]; then
SECURITY_PATCH=19
elif [[ $PHP5_BRANCH == legacy ]]; then
VERSION=5.2.17
- SECURITY_PATCH=20
+ SECURITY_PATCH=21

SOURCE_HASH=sha512:baf3b5038468c9fa7c1a9e0506ed23559c21ba8df29380498a24e8d31c4c5f3633f29b1bc2faa3e59c6e5336536c09e19a5462b0a9d5916181c08f1f19abbca8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
@@ -37,9 +37,9 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
SOURCE3_URL="http://download.suhosin.org/$SOURCE3";
SOURCE2_GPG="suhosin.gpg:$SOURCE3:UPSTREAM_KEY"
fi
- SOURCE4=php52-backports-20120924.patch
+ SOURCE4=php52-backports-20121114.patch
SOURCE4_URL=http://php52-backports.googlecode.com/files/$SOURCE4
-
SOURCE4_HASH=sha512:1753ebbe9c5abadc13dc84ad1cb3baa7369489691016eb4a49fa51120fc7eeb9971ece34767ce4659b4b35b2b9744d7d84c20cf1ba84acab015650c7a1fd9d96
+
SOURCE4_HASH=sha512:cce9b47afd100ff0b650972fa6c7b0ed1c255da95bb8427238d336fee05fc7125cf9aacf5b9503986c3c45d57ca075e5b805dd0a2eb857917281ae4c4d715fad
else
VERSION=5.3.17
SECURITY_PATCH=19
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 85bd433..0027eb6 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+2012-11-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated backports+security patches to 20121114;
+ SECUIRTY_PATCH++
+
2012-10-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated backports+security patches to 20120924;
SECUIRTY_PATCH++
diff --git a/wm-addons/xxkb/DETAILS b/wm-addons/xxkb/DETAILS
index 259d9ce..4264b4c 100755
--- a/wm-addons/xxkb/DETAILS
+++ b/wm-addons/xxkb/DETAILS
@@ -1,6 +1,6 @@
SPELL=xxkb
VERSION=1.11
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=$SPELL-$VERSION-src.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/wm-addons/xxkb/HISTORY b/wm-addons/xxkb/HISTORY
index 16c8154..102e836 100644
--- a/wm-addons/xxkb/HISTORY
+++ b/wm-addons/xxkb/HISTORY
@@ -1,3 +1,9 @@
+2012-11-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: apply the patch
+ * missing_init.patch: added, to fix some memory issue that leads to
+ crash
+
2012-07-24 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing imake dependency

diff --git a/wm-addons/xxkb/PRE_BUILD b/wm-addons/xxkb/PRE_BUILD
index a69a2e0..843aa59 100755
--- a/wm-addons/xxkb/PRE_BUILD
+++ b/wm-addons/xxkb/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p0 < "$SPELL_DIRECTORY/missing_init.patch" &&
patch -p0 < "$SPELL_DIRECTORY/imake.patch"
diff --git a/wm-addons/xxkb/missing_init.patch
b/wm-addons/xxkb/missing_init.patch
new file mode 100644
index 0000000..52ea883
--- /dev/null
+++ b/wm-addons/xxkb/missing_init.patch
@@ -0,0 +1,22 @@
+--- xxkb.c 2012-03-06 17:49:02.888079235 +0200
++++ xxkb_fixed.c 2012-03-06 17:48:58.712462301 +0200
+@@ -667,12 +667,14 @@
+ Window rwin, parent, *children;
+ int num;
+
+- XQueryTree(dpy, temp_win, &rwin,
&parent, &children, &num);
+- AddWindow(temp_win, parent);
++ if (XQueryTree(dpy, temp_win, &rwin,
&parent, &children, &num) != 0)
++ {
++ AddWindow(temp_win, parent);
+
+- if (children != None) {
+- XFree(children);
+- }
++ if (children != None) {
++ XFree(children);
++ }
++ }
+ }
+ break;
+



  • [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (60e4a587bc08275ed2659d98ce788e3c86592b3c), Vlad Glagolev, 11/23/2012

Archive powered by MHonArc 2.6.24.

Top of Page