sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to stable-0.43 grimoire by George Sherwood (21d32ca9fb1585f865bc07aa04c20d88bec484a1)
- From: George Sherwood <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to stable-0.43 grimoire by George Sherwood (21d32ca9fb1585f865bc07aa04c20d88bec484a1)
- Date: Wed, 28 Apr 2010 20:16:43 -0500
GIT changes to stable-0.43 grimoire by George Sherwood
<gsherwood AT sourcemage.org>:
chat-irc/irssi/DETAILS | 3 +
chat-irc/irssi/HISTORY | 4 ++
net/cacti/DETAILS | 1
net/cacti/HISTORY | 4 ++
net/cacti/patches/sql_injection_template_export.patch | 13 +++++++
printer/pycups/HISTORY | 6 +++
printer/pycups/PRE_BUILD | 3 +
printer/pycups/python2.5.patch | 33
++++++++++++++++++
python-pypi/moinmoin/DETAILS | 6 +--
python-pypi/moinmoin/HISTORY | 4 ++
utils/grep/DETAILS | 2 -
utils/grep/HISTORY | 3 +
12 files changed, 77 insertions(+), 5 deletions(-)
New commits:
commit 21d32ca9fb1585f865bc07aa04c20d88bec484a1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
grep: => 2.6.3
(cherry picked from commit ed3fd25968a1052bfbfc76d649927aeca0e089cb)
commit 1465f06377d9c3bca6beb2f98df55a322f1f95b1
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
python-pypi/moinmoin: updated to 1.9.2, SECURITY_PATCH=4
(cherry picked from commit 28ee7fbf27e70c7b149641310c464c2a579b254f)
commit 2a522b80f69cbd830363a79aa660970be7530203
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
cacti: added official patch, security update
commit 14d808281216653974bed8df3270d01d587c4700
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: George Sherwood <gsherwood AT sourcemage.org>
irssi: update to 0.8.15
(cherry picked from commit 0a7063c002d1478938063847c1e11b3dae4f5796)
commit 67c2e761b878bd78129ac8b47de882d1931bcdee
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
pycups: Apply python2.5.patch (Fixes Bug #15656)
Based on
http://git.fedorahosted.org/git/?p=pycups.git;a=commit;h=fefe4d6b50c5f1c0bcafa40da60170f42217de82
https://fedorahosted.org/pycups/ticket/14
(cherry picked from commit c0f62794ef171fc432102672ccbab59fe1f81129)
diff --git a/chat-irc/irssi/DETAILS b/chat-irc/irssi/DETAILS
index 4c97e5a..1e105ee 100755
--- a/chat-irc/irssi/DETAILS
+++ b/chat-irc/irssi/DETAILS
@@ -12,7 +12,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=svn://svn.irssi.org/repos/irssi/trunk:irssi-svn
SOURCE_IGNORE=volatile
else
- VERSION=0.8.14
+ VERSION=0.8.15
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.irssi.org/files/$SOURCE
diff --git a/chat-irc/irssi/HISTORY b/chat-irc/irssi/HISTORY
index 5df1b84..1084b6e 100644
--- a/chat-irc/irssi/HISTORY
+++ b/chat-irc/irssi/HISTORY
@@ -1,3 +1,7 @@
+2010-04-03 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated spell to 0.8.15
+ SECURITY_PATCH++
+
2009-07-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.8.14
diff --git a/net/cacti/DETAILS b/net/cacti/DETAILS
index 4fb7d2a..5bbb0ae 100755
--- a/net/cacti/DETAILS
+++ b/net/cacti/DETAILS
@@ -1,5 +1,6 @@
SPELL=cacti
VERSION=0.8.7e
+ SECURITY_PATCH=1
PATCHLEVEL=2
SOURCE=$SPELL-$VERSION.tar.gz
if [[ $CACTI_PA == y ]]; then
diff --git a/net/cacti/HISTORY b/net/cacti/HISTORY
index 91e7582..bccb42a 100644
--- a/net/cacti/HISTORY
+++ b/net/cacti/HISTORY
@@ -1,3 +1,7 @@
+2010-04-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH=1
+ * patches/sql_injection_template_export.patch: added
+
2009-12-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=2; updated Plugin Architecture to 2.6
* PRE_BUILD: apply official patches first; corrected PA source dir
diff --git a/net/cacti/patches/sql_injection_template_export.patch
b/net/cacti/patches/sql_injection_template_export.patch
new file mode 100644
index 0000000..397990c
--- /dev/null
+++ b/net/cacti/patches/sql_injection_template_export.patch
@@ -0,0 +1,13 @@
+--- cacti-0.8.7e/templates_export.php 2009-06-28 12:07:11.000000000 -0400
++++ cacti-fixed/templates_export.php 2010-04-17 14:08:42.000000000 -0400
+@@ -49,6 +49,10 @@
+ function form_save() {
+ global $export_types;
+
++ /* ================= input validation ================= */
++ input_validate_input_number(get_request_var_post("export_item_id"));
++ /* ==================================================== */
++
+ if (isset($_POST["save_component_export"])) {
+ $xml_data = get_item_xml($_POST["export_type"],
$_POST["export_item_id"], (((isset($_POST["include_deps"]) ?
$_POST["include_deps"] : "") == "") ? false : true));
+
diff --git a/printer/pycups/HISTORY b/printer/pycups/HISTORY
index 488bb47..8a36ea3 100644
--- a/printer/pycups/HISTORY
+++ b/printer/pycups/HISTORY
@@ -1,3 +1,9 @@
+2010-04-28 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply python2.5.patch (Fixes Bug #15656)
+ * python2.5.patch: Based on
+
http://git.fedorahosted.org/git/?p=pycups.git;a=commit;h=fefe4d6b50c5f1c0bcafa40da60170f42217de82
+ https://fedorahosted.org/pycups/ticket/14
+
2010-03-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.9.49
diff --git a/printer/pycups/PRE_BUILD b/printer/pycups/PRE_BUILD
new file mode 100755
index 0000000..1ffd20b
--- /dev/null
+++ b/printer/pycups/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/python2.5.patch
diff --git a/printer/pycups/python2.5.patch b/printer/pycups/python2.5.patch
new file mode 100644
index 0000000..ed7fc48
--- /dev/null
+++ b/printer/pycups/python2.5.patch
@@ -0,0 +1,33 @@
+#
+# Based on
+#
http://git.fedorahosted.org/git/?p=pycups.git;a=commit;h=fefe4d6b50c5f1c0bcafa40da60170f42217de82
+# https://fedorahosted.org/pycups/ticket/14
+#
+diff -Naur pycups-1.9.49.orig/Makefile pycups-1.9.49/Makefile
+--- pycups-1.9.49.orig/Makefile 2010-04-28 12:25:05.016799280 -0700
++++ pycups-1.9.49/Makefile 2010-04-28 12:34:20.275799057 -0700
+@@ -1,5 +1,4 @@
+ NAME=pycups
+-VERSION=1.9.49
+
+ SOURCES=cupsmodule.c cupsconnection.c cupsppd.c cupsipp.c setup.py \
+ cupsppd.h cupsipp.h cupsconnection.h cupsmodule.h
+@@ -9,7 +8,7 @@
+ COPYING NEWS README TODO ChangeLog
+
+ cups.so: $(SOURCES)
+- CFLAGS=-DVERSION=\\\"$(VERSION)\\\" python setup.py build
++ python setup.py build
+ mv build/lib*/$@ .
+
+ doc: cups.so
+diff -Naur pycups-1.9.49.orig/setup.py pycups-1.9.49/setup.py
+--- pycups-1.9.49.orig/setup.py 2010-04-28 12:25:05.016799280 -0700
++++ pycups-1.9.49/setup.py 2010-04-28 12:35:39.438674099 -0700
+@@ -3,4 +3,5 @@
+ ext_modules=[Extension("cups",
+ ["cupsmodule.c", "cupsconnection.c",
+ "cupsppd.c", "cupsipp.c"],
+- libraries=["cups"])])
++ libraries=["cups"],
++ define_macros=[("VERSION", '"1.9.49"')])])
diff --git a/python-pypi/moinmoin/DETAILS b/python-pypi/moinmoin/DETAILS
index 8267d21..70fea5a 100755
--- a/python-pypi/moinmoin/DETAILS
+++ b/python-pypi/moinmoin/DETAILS
@@ -1,9 +1,9 @@
SPELL=moinmoin
- VERSION=1.8.4
- SECURITY_PATCH=3
+ VERSION=1.9.2
+ SECURITY_PATCH=4
SOURCE=${SPELL%%moin}-$VERSION.tar.gz
SOURCE_URL[0]=http://static.moinmo.in/files/$SOURCE
-
SOURCE_HASH=sha512:c765e91ed44bda6cff3c52ab61e9f71cc383aa3082ceaca743947abc7c8ca152fff4e7a034a06c1d2c2cda5eb7b125cba46c7ec65bb276865e1634336ec440a5
+
SOURCE_HASH=sha512:80312c3a2f3e42799c4e43afb20e25cd67612dec12ac3c2d0361850feb3430afa73c3e1f168d4ade94381b1b2d8b441527e5fa6355aed546c2777a6f0715e12c
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL%%moin}-$VERSION
LICENSE[0]=GPL
WEB_SITE=http://moinmo.in/
diff --git a/python-pypi/moinmoin/HISTORY b/python-pypi/moinmoin/HISTORY
index 09e61a8..97131f3 100644
--- a/python-pypi/moinmoin/HISTORY
+++ b/python-pypi/moinmoin/HISTORY
@@ -1,3 +1,7 @@
+2010-04-22 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: updated to 1.9.2, SECURITY_PATCH=4
+ See: http://moinmo.in/SecurityFixes
+
2009-06-11 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated 1.8.4, SECURITY_PATCH=3
diff --git a/utils/grep/DETAILS b/utils/grep/DETAILS
index 378f95c..f31fa09 100755
--- a/utils/grep/DETAILS
+++ b/utils/grep/DETAILS
@@ -1,5 +1,5 @@
SPELL=grep
- VERSION=2.6.2
+ VERSION=2.6.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/grep/HISTORY b/utils/grep/HISTORY
index df97b1a..a49fa11 100644
--- a/utils/grep/HISTORY
+++ b/utils/grep/HISTORY
@@ -1,3 +1,6 @@
+2010-04-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.3
+
2010-03-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.6.2
- [SM-Commit] GIT changes to stable-0.43 grimoire by George Sherwood (21d32ca9fb1585f865bc07aa04c20d88bec484a1), George Sherwood, 04/28/2010
Archive powered by MHonArc 2.6.24.