[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (ef55ce83a24c4cd99c30299b6644ad8b9b988890)

Vlad Glagolev scm at sourcemage.org
Sat Nov 19 10:59:51 EST 2011


GIT changes to devel-xorg-modular grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 dev/null                                             |binary
 disk/xfsprogs/DETAILS                                |    2 +-
 disk/xfsprogs/HISTORY                                |    3 +++
 disk/xfsprogs/xfsprogs-3.1.6.tar.gz.sig              |    0 
 disk/xfsprogs/xfsprogs-3.1.7.tar.gz.sig              |binary
 ftp/netkit-ftp/CONFLICTS                             |    2 +-
 ftp/netkit-ftp/HISTORY                               |    3 +++
 gnome2-apps/gedit/DETAILS                            |    2 +-
 gnome2-apps/gedit/HISTORY                            |    3 +++
 gnome2-apps/gedit/gedit-3.2.2.tar.bz2.sig            |    0 
 gnome2-apps/gedit/gedit-3.2.3.tar.bz2.sig            |binary
 gnome2-libs/glibmm/DETAILS                           |    2 +-
 gnome2-libs/glibmm/HISTORY                           |    3 +++
 gnome2-libs/glibmm/glibmm-2.30.0.tar.bz2.sig         |    0 
 gnome2-libs/glibmm/glibmm-2.30.1.tar.bz2.sig         |binary
 graphics/imagemagick/DEPENDS                         |    1 +
 graphics/imagemagick/DETAILS                         |    3 +--
 graphics/imagemagick/HISTORY                         |    4 ++++
 graphics/imagemagick/ImageMagick-6.7.3-6.tar.bz2.sig |binary
 libs/libsigc++3/DETAILS                              |    4 ++--
 libs/libsigc++3/HISTORY                              |    4 ++++
 libs/libsigc++3/libsigc++-2.2.10.tar.bz2.sig         |binary
 libs/libsigc++3/libsigc++-2.2.9.tar.gz.sig           |    0 
 libs/rasqal/DETAILS                                  |    2 +-
 libs/rasqal/HISTORY                                  |    3 +++
 python-pypi/calibre/DEPENDS                          |    4 +++-
 python-pypi/calibre/DETAILS                          |    2 +-
 python-pypi/calibre/HISTORY                          |    4 ++++
 python-pypi/calibre/calibre-0.8.25.tar.gz.sig        |    0 
 python-pypi/calibre/calibre-0.8.27.tar.gz.sig        |binary
 python-pypi/distribute/DETAILS                       |    4 ++--
 python-pypi/distribute/HISTORY                       |    4 ++++
 python-pypi/distribute/distribute-0.6.24.tar.gz.sig  |binary
 security/wireshark/CONFIGURE                         |    5 +++++
 security/wireshark/DEPENDS                           |    2 +-
 security/wireshark/DETAILS                           |    4 ++--
 security/wireshark/HISTORY                           |    8 ++++++++
 security/wireshark/PRE_BUILD                         |    4 ++++
 security/wireshark/dumpcap.patch                     |   12 ++++++++++++
 x11/xlockmore/DETAILS                                |    2 +-
 x11/xlockmore/HISTORY                                |    3 +++
 41 files changed, 82 insertions(+), 17 deletions(-)

New commits:
commit 4dee6dcc7f5ca8e2b43f5524171fa6d099467534
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xlockmore: => 5.35

commit 35c5d1428df877a420fdd9ae6744c9e0d8c9e9e2
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    wireshark: => 1.6.4

commit b35e1bd4b1fd98e31adc4cb0fdac5b2fa23cbf9e
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfsprogs: => 3.1.7

commit ab0bb4711cb65483f791aadb66d68e524b9a9b7b
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    rasqal: => 0.9.28

commit 775b7b07ae845c1f1f6a8bd46445a6bffaabb11b
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    calibre: => 0.8.27
    added depends icu, dnspytho

commit 265e45bfd915df63789d342f57dbc02a68312b31
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    distribute: => 0.6.24
    switched to guru signed verification

commit 091b6ae0ce952a3cfb3bcbd2b8294e7983735bb7
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    imagemagick: added depends ilmbase
    switched to guru signed gpg verification

commit 04a9e9efd72ce5b48f0f11e2015c2011ac2ac92e
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    netkit-ftp: changed conflict with krb to krb-appl
    see Bug #330

commit c9d648403fdc7df3f3ed7cccd100e9952276cd58
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    gedit: => 3.2.3

commit dcc80f9220ebad57462a2d9086c1d98f41e4a700
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    glibmm: => 2.30.1

commit 660925d3d51117051352979ce52f350141c299c6
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    libsigc++3: => 2.2.10
    gz -> bz2

diff --git a/disk/xfsprogs/DETAILS b/disk/xfsprogs/DETAILS
index 2439c55..9277e1b 100755
--- a/disk/xfsprogs/DETAILS
+++ b/disk/xfsprogs/DETAILS
@@ -1,5 +1,5 @@
            SPELL=xfsprogs
-         VERSION=3.1.6
+         VERSION=3.1.7
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=ftp://oss.sgi.com/projects/xfs/cmd_tars/$SOURCE
diff --git a/disk/xfsprogs/HISTORY b/disk/xfsprogs/HISTORY
index 5ecfaa1..491116c 100644
--- a/disk/xfsprogs/HISTORY
+++ b/disk/xfsprogs/HISTORY
@@ -1,3 +1,6 @@
+2011-11-19 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 3.1.7
+
 2011-10-15 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 3.1.6
 
diff --git a/disk/xfsprogs/xfsprogs-3.1.6.tar.gz.sig b/disk/xfsprogs/xfsprogs-3.1.6.tar.gz.sig
deleted file mode 100644
index 11fa000..0000000
Binary files a/disk/xfsprogs/xfsprogs-3.1.6.tar.gz.sig and /dev/null differ
diff --git a/disk/xfsprogs/xfsprogs-3.1.7.tar.gz.sig b/disk/xfsprogs/xfsprogs-3.1.7.tar.gz.sig
new file mode 100644
index 0000000..e2ec1f6
Binary files /dev/null and b/disk/xfsprogs/xfsprogs-3.1.7.tar.gz.sig differ
diff --git a/ftp/netkit-ftp/CONFLICTS b/ftp/netkit-ftp/CONFLICTS
index 2dafa65..f095cc9 100755
--- a/ftp/netkit-ftp/CONFLICTS
+++ b/ftp/netkit-ftp/CONFLICTS
@@ -1 +1 @@
-conflicts  krb5
+conflicts  krb5-appl
diff --git a/ftp/netkit-ftp/HISTORY b/ftp/netkit-ftp/HISTORY
index c7b2cbc..467cc1f 100644
--- a/ftp/netkit-ftp/HISTORY
+++ b/ftp/netkit-ftp/HISTORY
@@ -1,3 +1,6 @@
+2011-11-18 Sukneet Basuta <sukneet at sourcemage.org>
+	* CONFLICTS: change krb to krb-appl (Bug #330)
+
 2009-03-26 George Sherwood <gsherwood at sourcemage.org>
 	* PRE_BUILD: Added to apply patch
 	* ftp-glob.patch: Added fedora patch to fix build with glibc >= 2.8
diff --git a/gnome2-apps/gedit/DETAILS b/gnome2-apps/gedit/DETAILS
index dea17d9..94328ec 100755
--- a/gnome2-apps/gedit/DETAILS
+++ b/gnome2-apps/gedit/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gedit
-         VERSION=3.2.2
+         VERSION=3.2.3
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/gedit/HISTORY b/gnome2-apps/gedit/HISTORY
index cc80fe2..8730c92 100644
--- a/gnome2-apps/gedit/HISTORY
+++ b/gnome2-apps/gedit/HISTORY
@@ -1,3 +1,6 @@
+2011-11-18 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 3.2.3
+
 2011-11-05 Sukneet Basuta <sukneet at sourcemage.org>
 	* DETAILS: updated spell to 3.2.2
 	* DEPENDS: added depends for libpeas and gsettings-desktop-schemas
diff --git a/gnome2-apps/gedit/gedit-3.2.2.tar.bz2.sig b/gnome2-apps/gedit/gedit-3.2.2.tar.bz2.sig
deleted file mode 100644
index 8f39e47..0000000
Binary files a/gnome2-apps/gedit/gedit-3.2.2.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/gedit/gedit-3.2.3.tar.bz2.sig b/gnome2-apps/gedit/gedit-3.2.3.tar.bz2.sig
new file mode 100644
index 0000000..9740a13
Binary files /dev/null and b/gnome2-apps/gedit/gedit-3.2.3.tar.bz2.sig differ
diff --git a/gnome2-libs/glibmm/DETAILS b/gnome2-libs/glibmm/DETAILS
index fc2b105..84176a4 100755
--- a/gnome2-libs/glibmm/DETAILS
+++ b/gnome2-libs/glibmm/DETAILS
@@ -1,5 +1,5 @@
            SPELL=glibmm
-         VERSION=2.30.0
+         VERSION=2.30.1
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/glibmm/HISTORY b/gnome2-libs/glibmm/HISTORY
index 3a214bc..f5fadb4 100644
--- a/gnome2-libs/glibmm/HISTORY
+++ b/gnome2-libs/glibmm/HISTORY
@@ -1,3 +1,6 @@
+2011-11-18 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 2.30.1
+
 2011-10-02 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.30.0
 
diff --git a/gnome2-libs/glibmm/glibmm-2.30.0.tar.bz2.sig b/gnome2-libs/glibmm/glibmm-2.30.0.tar.bz2.sig
deleted file mode 100644
index b79de04..0000000
Binary files a/gnome2-libs/glibmm/glibmm-2.30.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/glibmm/glibmm-2.30.1.tar.bz2.sig b/gnome2-libs/glibmm/glibmm-2.30.1.tar.bz2.sig
new file mode 100644
index 0000000..2c274d5
Binary files /dev/null and b/gnome2-libs/glibmm/glibmm-2.30.1.tar.bz2.sig differ
diff --git a/graphics/imagemagick/DEPENDS b/graphics/imagemagick/DEPENDS
index 800d498..db29756 100755
--- a/graphics/imagemagick/DEPENDS
+++ b/graphics/imagemagick/DEPENDS
@@ -1,4 +1,5 @@
 depends  libtool    "--disable-ltdl-install"  &&
+depends  ilmbase &&
 
 if [[ "$IMAGEMAGICK_X" == "y" ]]; then
    depends libx11 '--with-x' &&
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 1864b07..31f527d 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -7,8 +7,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
    SOURCE_URL[1]=ftp://ftp.surfnet.nl/pub/ImageMagick/$SOURCE
    SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
    SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
-#     SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-     SOURCE_HASH=sha512:3b507b4aed64d006b31711edb8388e352385d3bbec3e5d7aef08055b49af0981202ba4f21060e6b4e7fa03289620b6a3c8b9501b34d9c915bcfb2b4c845054a0
+     SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
           CCACHE="off"
         WEB_SITE=http://www.imagemagick.org/
          ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index bbdae2d..b8909ba 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,7 @@
+2011-11-18 Sukneet Basuta <sukneet at sourcemage.org>
+	* DEPENDS: added depends ilmbase
+	  switched to gpg verification
+
 2011-11-15 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 6.7.3-6
 
diff --git a/graphics/imagemagick/ImageMagick-6.7.3-6.tar.bz2.sig b/graphics/imagemagick/ImageMagick-6.7.3-6.tar.bz2.sig
new file mode 100644
index 0000000..888741b
Binary files /dev/null and b/graphics/imagemagick/ImageMagick-6.7.3-6.tar.bz2.sig differ
diff --git a/libs/libsigc++3/DETAILS b/libs/libsigc++3/DETAILS
index 1d5038a..ef10af8 100755
--- a/libs/libsigc++3/DETAILS
+++ b/libs/libsigc++3/DETAILS
@@ -1,7 +1,7 @@
            SPELL=libsigc++3
-         VERSION=2.2.9
+         VERSION=2.2.10
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
-          SOURCE=libsigc++-$VERSION.tar.gz
+          SOURCE=libsigc++-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/libsigc++-$VERSION"
    SOURCE_URL[0]=$GNOME_URL/sources/libsigc++/$BRANCH/$SOURCE
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
diff --git a/libs/libsigc++3/HISTORY b/libs/libsigc++3/HISTORY
index 47b8eae..107a126 100644
--- a/libs/libsigc++3/HISTORY
+++ b/libs/libsigc++3/HISTORY
@@ -1,3 +1,7 @@
+2011-11-18 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 2.2.10
+	  gz -> bz2
+
 2011-07-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
 	  sub-depends on CXX (scripted)
diff --git a/libs/libsigc++3/libsigc++-2.2.10.tar.bz2.sig b/libs/libsigc++3/libsigc++-2.2.10.tar.bz2.sig
new file mode 100644
index 0000000..b66a0ff
Binary files /dev/null and b/libs/libsigc++3/libsigc++-2.2.10.tar.bz2.sig differ
diff --git a/libs/libsigc++3/libsigc++-2.2.9.tar.gz.sig b/libs/libsigc++3/libsigc++-2.2.9.tar.gz.sig
deleted file mode 100644
index 05bae5c..0000000
Binary files a/libs/libsigc++3/libsigc++-2.2.9.tar.gz.sig and /dev/null differ
diff --git a/libs/rasqal/DETAILS b/libs/rasqal/DETAILS
index 1200e4c..06d1e79 100755
--- a/libs/rasqal/DETAILS
+++ b/libs/rasqal/DETAILS
@@ -1,5 +1,5 @@
            SPELL=rasqal
-         VERSION=0.9.26
+         VERSION=0.9.28
           SOURCE="${SPELL}-${VERSION}.tar.gz"
          SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=http://download.librdf.org/source/$SOURCE
diff --git a/libs/rasqal/HISTORY b/libs/rasqal/HISTORY
index ce8ea92..d0d47bb 100644
--- a/libs/rasqal/HISTORY
+++ b/libs/rasqal/HISTORY
@@ -1,3 +1,6 @@
+2011-11-19 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.9.28
+
 2011-10-19 Thomas Orgis <sobukus at sourcemage.org>
 	* CONFIGURE, BUILD: drop that query language query, it was
 	  outdated and actually wrong (typo), also the upstream
diff --git a/python-pypi/calibre/DEPENDS b/python-pypi/calibre/DEPENDS
index 233d356..03e9690 100755
--- a/python-pypi/calibre/DEPENDS
+++ b/python-pypi/calibre/DEPENDS
@@ -18,4 +18,6 @@ depends fontconfig &&
 depends pythonmagick &&
 depends -sub "QT4 XPDF_HEADERS" poppler &&
 depends libwmf &&
-depends sqlite
+depends sqlite &&
+depends icu &&
+depends dnspython
diff --git a/python-pypi/calibre/DETAILS b/python-pypi/calibre/DETAILS
index 4208f18..e1a3108 100755
--- a/python-pypi/calibre/DETAILS
+++ b/python-pypi/calibre/DETAILS
@@ -1,5 +1,5 @@
            SPELL=calibre
-         VERSION=0.8.25
+         VERSION=0.8.27
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://calibre-ebook.googlecode.com/files/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/python-pypi/calibre/HISTORY b/python-pypi/calibre/HISTORY
index 2acd8b3..dbfc662 100644
--- a/python-pypi/calibre/HISTORY
+++ b/python-pypi/calibre/HISTORY
@@ -1,3 +1,7 @@
+2011-11-18 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 0.8.27
+	* DEPENDS: added depends icu, dnspython 
+
 2011-11-07 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: version 0.8.25
 
diff --git a/python-pypi/calibre/calibre-0.8.25.tar.gz.sig b/python-pypi/calibre/calibre-0.8.25.tar.gz.sig
deleted file mode 100644
index bb58d70..0000000
Binary files a/python-pypi/calibre/calibre-0.8.25.tar.gz.sig and /dev/null differ
diff --git a/python-pypi/calibre/calibre-0.8.27.tar.gz.sig b/python-pypi/calibre/calibre-0.8.27.tar.gz.sig
new file mode 100644
index 0000000..e34e0df
Binary files /dev/null and b/python-pypi/calibre/calibre-0.8.27.tar.gz.sig differ
diff --git a/python-pypi/distribute/DETAILS b/python-pypi/distribute/DETAILS
index 6f45e33..1f8d093 100755
--- a/python-pypi/distribute/DETAILS
+++ b/python-pypi/distribute/DETAILS
@@ -1,8 +1,8 @@
            SPELL=distribute
-         VERSION=0.6.16
+         VERSION=0.6.24
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://pypi.python.org/packages/source/d/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:2a562f1418d5c3a1454ce0b56665d7342f631a1ae413f9f243b399b32a0bcd82744fa7aca405b90a28b958cbcce32c0cbdbd213d57eecff4f46fcb15ba21ce4c
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://packages.python.org/distribute/"
       LICENSE[0]="PSF, ZPL"
diff --git a/python-pypi/distribute/HISTORY b/python-pypi/distribute/HISTORY
index b71d335..b3c1937 100644
--- a/python-pypi/distribute/HISTORY
+++ b/python-pypi/distribute/HISTORY
@@ -1,3 +1,7 @@
+2011-11-18 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 0.6.24
+	  switched to guru signed verification
+
 2011-05-22 Sukneet Basuta <sukneet at sourcemage.org>
 	* BUILD, DEPENDS, DETAILS, INSTALL: spell created
 	  Note that distribute works with either python or
diff --git a/python-pypi/distribute/distribute-0.6.24.tar.gz.sig b/python-pypi/distribute/distribute-0.6.24.tar.gz.sig
new file mode 100644
index 0000000..4bff251
Binary files /dev/null and b/python-pypi/distribute/distribute-0.6.24.tar.gz.sig differ
diff --git a/security/wireshark/CONFIGURE b/security/wireshark/CONFIGURE
index cf67d9b..5d4e1cc 100755
--- a/security/wireshark/CONFIGURE
+++ b/security/wireshark/CONFIGURE
@@ -4,5 +4,10 @@ config_query_option WIRESHARK_OPTS \
                     "--disable-ipv6" &&
 
 config_query_option WIRESHARK_OPTS \
+                    "Enable threads support?" n \
+                    "--enable-threads" \
+                    "--disable-threads" &&
+
+config_query_option WIRESHARK_OPTS \
                     "Install dumpcap as setuid?" n \
                     "--enable-setuid-install" ""
diff --git a/security/wireshark/DEPENDS b/security/wireshark/DEPENDS
index c79165f..0a77ad6 100755
--- a/security/wireshark/DEPENDS
+++ b/security/wireshark/DEPENDS
@@ -1,4 +1,4 @@
-depends glibc "--enable-threads" &&
+depends glibc &&
 depends glib2 &&
 depends libpcap &&
 
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index 1a2cb70..78cab64 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
            SPELL=wireshark
-         VERSION=1.6.3
+         VERSION=1.6.4
   SECURITY_PATCH=33
           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:fb2c231bd5d90db769d3d571b75085a3722399e2f94f1d4e518a4137e26444db6381b229eef3cae4000e38b3cec4f56f4bc0d644a8adebf595f5d24d9bc44eb6
+     SOURCE_HASH=sha512:544d88e680395dd622925a6c0e185f23a6e55416d887a797e91787adc4f363fa7b32428fdc94c1f76920ac9236a7a641619dfb204f1dbb34590331431e989ebb
         WEB_SITE=http://www.wireshark.org/
          ENTERED=20020116
       LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 8501af9..02422ab 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,11 @@
+2011-11-19 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.6.4
+	* DEPENDS: made threads support optional
+	* CONFIGURE: added option for thread support (officially disabled by
+	  default)
+	* PRE_BUILD: added, to apply the patch
+	* dumpcap.patch: added, to fix compilation with threads support
+
 2011-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.6.3, SECURITY_PATCH=33
 	  http://www.wireshark.org/docs/relnotes/wireshark-1.6.3.html
diff --git a/security/wireshark/PRE_BUILD b/security/wireshark/PRE_BUILD
new file mode 100755
index 0000000..4b11f80
--- /dev/null
+++ b/security/wireshark/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/dumpcap.patch"
diff --git a/security/wireshark/dumpcap.patch b/security/wireshark/dumpcap.patch
new file mode 100644
index 0000000..e967e43
--- /dev/null
+++ b/security/wireshark/dumpcap.patch
@@ -0,0 +1,12 @@
+--- dumpcap.c.orig	2011-11-18 23:14:44.000000000 +0400
++++ dumpcap.c	2011-11-19 18:44:22.406486465 +0400
+@@ -2488,9 +2488,7 @@
+     int       inpkts;
+     gint      packet_count_before;
+     guchar    pcap_data[WTAP_MAX_PACKET_SIZE];
+-#ifndef USE_THREADS
+     int       sel_ret;
+-#endif
+ 
+     packet_count_before = ld->packet_count;
+     if (ld->from_cap_pipe) {
diff --git a/x11/xlockmore/DETAILS b/x11/xlockmore/DETAILS
index 9e032fd..128855e 100755
--- a/x11/xlockmore/DETAILS
+++ b/x11/xlockmore/DETAILS
@@ -1,5 +1,5 @@
            SPELL=xlockmore
-         VERSION=5.34
+         VERSION=5.35
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/x11/xlockmore/HISTORY b/x11/xlockmore/HISTORY
index 28c42ce..f3a1dfa 100644
--- a/x11/xlockmore/HISTORY
+++ b/x11/xlockmore/HISTORY
@@ -1,3 +1,6 @@
+2011-11-19 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 5.35
+
 2011-09-12 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 5.34
 


More information about the SM-Commit mailing list