[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (11cafa7ae81de44c01e69737ce0e88779448d7a4)

Eric Sandall scm at sourcemage.org
Tue Apr 19 20:29:57 EDT 2011


GIT changes to devel-xorg-modular grimoire by Eric Sandall <sandalle at sourcemage.org>:

 crypto/ccid/DETAILS                                            |    6 +++---
 crypto/ccid/HISTORY                                            |    3 +++
 crypto/pcsc-lite/BUILD                                         |    4 ++--
 crypto/pcsc-lite/CONFIGURE                                     |    2 +-
 crypto/pcsc-lite/DEPENDS                                       |    4 ++--
 crypto/pcsc-lite/DETAILS                                       |    6 +++---
 crypto/pcsc-lite/HISTORY                                       |    4 ++++
 kernels/linux/HISTORY                                          |    5 +++++
 kernels/linux/info/patches/maintenance_patches/patch-2.6.32.38 |    6 ++++++
 kernels/linux/info/patches/maintenance_patches/patch-2.6.33.11 |    6 ++++++
 kernels/linux/info/patches/maintenance_patches/patch-2.6.34.9  |    6 ++++++
 libs/orc/DETAILS                                               |    4 ++--
 libs/orc/HISTORY                                               |    3 +++
 lua-forge/lua-zlib-brimworks/CONFLICTS                         |    1 +
 lua-forge/lua-zlib-brimworks/HISTORY                           |    4 ++++
 lua-forge/lua-zlib-brimworks/PROVIDES                          |    1 +
 lua-forge/lzlib/CONFLICTS                                      |    1 +
 lua-forge/lzlib/HISTORY                                        |    4 ++++
 lua-forge/lzlib/PROVIDES                                       |    1 +
 net/wpa_supplicant/BUILD                                       |    2 +-
 net/wpa_supplicant/HISTORY                                     |    4 ++++
 security/wireshark/DETAILS                                     |    4 ++--
 security/wireshark/HISTORY                                     |    3 +++
 wm-addons/wmwifi/BUILD                                         |    4 ----
 wm-addons/wmwifi/DEPENDS                                       |    1 +
 wm-addons/wmwifi/HISTORY                                       |    4 ++++
 26 files changed, 73 insertions(+), 20 deletions(-)

New commits:
commit 4332eb4da5cd62cfdb10fbb6418dd638828b4542
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    linux 2.6.34.9

commit 5de20cb9f45331c224bcf04b2929dc5f6943678c
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    linux 2.6.33.11

commit 621682c2b60be69728e88dd9b97924c639c9616d
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    linux 2.6.32.38

commit 2f03eed4467aece4c2373dd57b50390d6f9d9886
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    pcsc-lite 1.7.2

commit 0ae112d1185dc69ae9fb150f45c67d1f0aa2f92d
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    ccid 1.4.3

commit 5cbde68ae016935653a4731dee6c171b3182d251
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    orc 0.4.13

commit 2dcb10e2856c156fa32b4fd4de221d0e4275f78c
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    wireshark 1.4.6

commit 9a8db652509a7bf2d305ed115418dc60d76c7721
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    wpa_supplicant: fixed build if qt4 is installed but qt-x11 is not

commit 190e34a0bc03f9e02a88e7f1ecd7ae9f924ff57c
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    lua-zlib-brimworks: conflicts with lzlib and provides LUA-ZLIB

commit ed7d503ab3c08362378bab9371edc200274ee437
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    lzlib: added CONFLICTS on lua-zlib-brimworks and provides LUA-ZLIB

commit 2b39786f2c01d02e969735f53c72524579dd38ef
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    wmwifi: removed obsolete BUILD and added missing dep on libxpm.
    fixed bug #13839

diff --git a/crypto/ccid/DETAILS b/crypto/ccid/DETAILS
index 8ecc144..3004696 100755
--- a/crypto/ccid/DETAILS
+++ b/crypto/ccid/DETAILS
@@ -1,9 +1,9 @@
            SPELL=ccid
-         VERSION=1.4.2
-     SOURCE_HASH=sha512:5fd59eab283e3bc0493fb88e869de84ed30a0c603dbba732a22af39ce0b853725c1c9c35360282f61ca77a7ef6c590ecb1d9d62166d7a333d5343fcdb77ea555
+         VERSION=1.4.3
+     SOURCE_HASH=sha512:7540b99fdf66390877f53d3b75251ef7456a196301226b59a70797615fd9584219b8769ee3f66588167369b9553cd9167f3d6899c0681c186a4e1db24217de29
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3518/$SOURCE
+   SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3535/$SOURCE
         WEB_SITE=http://pcsclite.alioth.debian.org/ccid.html
       LICENSE[0]=LGPL
          ENTERED=20070123
diff --git a/crypto/ccid/HISTORY b/crypto/ccid/HISTORY
index e656eb1..3ec7b31 100644
--- a/crypto/ccid/HISTORY
+++ b/crypto/ccid/HISTORY
@@ -1,3 +1,6 @@
+2011-04-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.4.3
+
 2011-02-24 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.4.2
 
diff --git a/crypto/pcsc-lite/BUILD b/crypto/pcsc-lite/BUILD
index c6fb978..4965974 100755
--- a/crypto/pcsc-lite/BUILD
+++ b/crypto/pcsc-lite/BUILD
@@ -1,5 +1,5 @@
-if [[ $PCSC_DEVICE_ACCESS != hal ]]; then
-  OPTS="--disable-libhal $OPTS"
+if [[ $PCSC_DEVICE_ACCESS != udev ]]; then
+  OPTS="--disable-libudev $OPTS"
 fi &&
 if [[ $PCSC_DEVICE_ACCESS != libusb ]]; then
   OPTS="--disable-libusb $OPTS"
diff --git a/crypto/pcsc-lite/CONFIGURE b/crypto/pcsc-lite/CONFIGURE
index f6c7ac4..a1a7ef2 100755
--- a/crypto/pcsc-lite/CONFIGURE
+++ b/crypto/pcsc-lite/CONFIGURE
@@ -1 +1 @@
-config_query_list PCSC_DEVICE_ACCESS "which library do you want to use to access devices?" none libusb hal
+config_query_list PCSC_DEVICE_ACCESS "which library do you want to use to access devices?" none libusb udev
diff --git a/crypto/pcsc-lite/DEPENDS b/crypto/pcsc-lite/DEPENDS
index 7b06d25..8d4802a 100755
--- a/crypto/pcsc-lite/DEPENDS
+++ b/crypto/pcsc-lite/DEPENDS
@@ -1,6 +1,6 @@
 depends g++ &&
 if [[ $PCSC_DEVICE_ACCESS == libusb ]]; then
   depends libusb "--enable-libusb"
-elif [[ $PCSC_DEVICE_ACCESS == hal ]]; then
-  depends hal "--enable-libhal"
+elif [[ $PCSC_DEVICE_ACCESS == udev ]]; then
+  depends udev "--enable-libudev"
 fi
diff --git a/crypto/pcsc-lite/DETAILS b/crypto/pcsc-lite/DETAILS
index e4e3fce..d16f0bc 100755
--- a/crypto/pcsc-lite/DETAILS
+++ b/crypto/pcsc-lite/DETAILS
@@ -1,9 +1,9 @@
            SPELL=pcsc-lite
-         VERSION=1.6.7
-     SOURCE_HASH=sha512:d7facbbeebdf9715de73408ce9cec4cac216a7b4dfba39eda43f6276eafad212c533f02d18a9941ad74a4fd58819b92d4e19414282d336bf98abadc83d12a172
+         VERSION=1.7.2
+     SOURCE_HASH=sha512:d6aca12da9e191a23ef06623a78205b49e4ade817e4260d422b78519067dd1765e167cbdb7f63a44e0a44d0a06f22f10372551f8cf3397a56b50bba98def6f38
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3516/$SOURCE
+   SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3533/$SOURCE
         WEB_SITE=http://pcsclite.alioth.debian.org/
       LICENSE[0]=BSD
          ENTERED=20050106
diff --git a/crypto/pcsc-lite/HISTORY b/crypto/pcsc-lite/HISTORY
index 0fd7080..ed6b5a0 100644
--- a/crypto/pcsc-lite/HISTORY
+++ b/crypto/pcsc-lite/HISTORY
@@ -1,3 +1,7 @@
+2011-04-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.7.2
+	* CONFIGURE, DEPENDS, BUILD: hal -> udev
+
 2011-02-24 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.6.7
 
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index df14866..5d4c7f5 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,8 @@
+2011-04-20 Ladislav Hagara <hgr at vabo.cz>
+	* info/patches/maintenance_patches/patch-2.6.32.38: added
+	* info/patches/maintenance_patches/patch-2.6.33.11: added
+	* info/patches/maintenance_patches/patch-2.6.34.9: added
+
 2011-04-17 Vlad Glagolev <stealth at sourcemage.org>
 	* info/patches/maintenance_patches/patch-2.6.35.12: added
 
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.38 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.38
new file mode 100755
index 0000000..be45693
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.38
@@ -0,0 +1,6 @@
+appliedkernels="2.6.32"
+patchversion="${appliedkernels}.38"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/longterm/v{appliedkernels}/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.33.11 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.33.11
new file mode 100755
index 0000000..81c9925
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.33.11
@@ -0,0 +1,6 @@
+appliedkernels="2.6.33"
+patchversion="${appliedkernels}.11"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/longterm/v${appliedkernels}/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.34.9 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.34.9
new file mode 100755
index 0000000..228fcde
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.34.9
@@ -0,0 +1,6 @@
+appliedkernels="2.6.34"
+patchversion="${appliedkernels}.9"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/longterm/v{appliedkernels}/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/libs/orc/DETAILS b/libs/orc/DETAILS
index da3d5d2..bb628bb 100755
--- a/libs/orc/DETAILS
+++ b/libs/orc/DETAILS
@@ -1,6 +1,6 @@
            SPELL=orc
-         VERSION=0.4.12
-     SOURCE_HASH=sha512:01fc0d3d9f54067eae2dd798d2bb09d36c815bf2aeb6194a9fe126842731fa9a7c26d17eb7b60bd1a557d266f41aa731c8a4d93864578a338783c9864d2f0386
+         VERSION=0.4.13
+     SOURCE_HASH=sha512:2fb9dddb55fe19809704af8253ccfa0116308b9c08743da9dec42ec24cfa26a653d8513d31dab357b9490613c67bd3b9054115a577237605404e9850e7b5e81a
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://code.entropywave.com/download/orc/$SOURCE
diff --git a/libs/orc/HISTORY b/libs/orc/HISTORY
index fb8bab1..acdb6de 100644
--- a/libs/orc/HISTORY
+++ b/libs/orc/HISTORY
@@ -1,3 +1,6 @@
+2011-04-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.4.13
+
 2011-04-17 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.4.12
 
diff --git a/lua-forge/lua-zlib-brimworks/CONFLICTS b/lua-forge/lua-zlib-brimworks/CONFLICTS
new file mode 100755
index 0000000..b3e414a
--- /dev/null
+++ b/lua-forge/lua-zlib-brimworks/CONFLICTS
@@ -0,0 +1 @@
+conflicts lzlib
diff --git a/lua-forge/lua-zlib-brimworks/HISTORY b/lua-forge/lua-zlib-brimworks/HISTORY
index 7a58353..5671114 100644
--- a/lua-forge/lua-zlib-brimworks/HISTORY
+++ b/lua-forge/lua-zlib-brimworks/HISTORY
@@ -1,3 +1,7 @@
+2011-04-14 Arjan Bouter <abouter at sourcemage.org>
+	* CONFLICTS: with lzlib
+	* PROVIDES: LUA-ZLIB
+
 2011-04-08 Arjan Bouter <abouter at sourcemage.org>
 	* BUILD, DEPENDS, DETAILS, DOWNLOAD: spell created
 
diff --git a/lua-forge/lua-zlib-brimworks/PROVIDES b/lua-forge/lua-zlib-brimworks/PROVIDES
new file mode 100755
index 0000000..82ac75c
--- /dev/null
+++ b/lua-forge/lua-zlib-brimworks/PROVIDES
@@ -0,0 +1 @@
+LUA-ZLIB
diff --git a/lua-forge/lzlib/CONFLICTS b/lua-forge/lzlib/CONFLICTS
new file mode 100755
index 0000000..b8f6973
--- /dev/null
+++ b/lua-forge/lzlib/CONFLICTS
@@ -0,0 +1 @@
+conflicts lua-zlib-brimworks
diff --git a/lua-forge/lzlib/HISTORY b/lua-forge/lzlib/HISTORY
index 4055bde..96a6749 100644
--- a/lua-forge/lzlib/HISTORY
+++ b/lua-forge/lzlib/HISTORY
@@ -1,3 +1,7 @@
+2011-04-14 Arjan Bouter <abouter at sourcemage.org>
+	* CONFLICTS: conflicts with lua-zlib-brimworks
+	* PROVIDES: added, provides LUA-ZLIB
+
 2008-06-18 Vlad Glagolev <stealth at sourcemage.org>
 	* INSTALL: added missing `&&', increase verbosity
 
diff --git a/lua-forge/lzlib/PROVIDES b/lua-forge/lzlib/PROVIDES
new file mode 100755
index 0000000..82ac75c
--- /dev/null
+++ b/lua-forge/lzlib/PROVIDES
@@ -0,0 +1 @@
+LUA-ZLIB
diff --git a/net/wpa_supplicant/BUILD b/net/wpa_supplicant/BUILD
index b4e55b0..56f5817 100755
--- a/net/wpa_supplicant/BUILD
+++ b/net/wpa_supplicant/BUILD
@@ -25,7 +25,7 @@ done &&
 make &&
 
 if is_depends_enabled $SPELL qt4; then
-  make wpa_gui-qt4
+  PATH=/usr/bin/qt4:$PATH make wpa_gui-qt4
 fi &&
 
 if is_depends_enabled $SPELL qt-x11; then
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 6b8d76d..488d572 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,7 @@
+2011-04-18 Arwed von Merkatz <v.merkatz at gmx.net>
+	* BUILD: add /usr/bin/qt4 to path when building the qt4 gui, otherwise
+	  fails to find qmake if qt-x11 is not installed
+
 2011-01-22 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.7.3
 	* DEPENDS: added qt4 dependency
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index a44c3b4..c478ab1 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
            SPELL=wireshark
-         VERSION=1.4.5
+         VERSION=1.4.6
   SECURITY_PATCH=29
           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:9008acc1efcf9990ab1a6a84e58781bbda5943a552c46ac32c07935f573124036127709326f9b9130e39b6dd855cb4b09b39c60ff9ec40bdbce3c7fece71b117
+     SOURCE_HASH=sha512:53fe11064adaf11e455b3555967f41b3b82483f26ef3b8bba3f925424374d3d9a161824d8e3bdab6490c43610856454f3f87addc3496a9c6fcd7fde3f5aeedc7
         WEB_SITE=http://www.wireshark.org/
          ENTERED=20020116
       LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 0f253cd..627d423 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,6 @@
+2011-04-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.4.6
+
 2011-04-16 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.4.5, SECURITY_PATCH++
 	  http://www.wireshark.org/security/wnpa-sec-2011-06.html
diff --git a/wm-addons/wmwifi/BUILD b/wm-addons/wmwifi/BUILD
deleted file mode 100755
index df276d3..0000000
--- a/wm-addons/wmwifi/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-aclocal  &&
-automake &&
-./configure &&
-make top_builddir=${SOURCE_DIRECTORY}
diff --git a/wm-addons/wmwifi/DEPENDS b/wm-addons/wmwifi/DEPENDS
index 4742a45..f3c779b 100755
--- a/wm-addons/wmwifi/DEPENDS
+++ b/wm-addons/wmwifi/DEPENDS
@@ -1,2 +1,3 @@
+depends libxpm &&
 depends xorg-libs &&
 depends wireless_tools
diff --git a/wm-addons/wmwifi/HISTORY b/wm-addons/wmwifi/HISTORY
index 3aea67b..940fe5f 100644
--- a/wm-addons/wmwifi/HISTORY
+++ b/wm-addons/wmwifi/HISTORY
@@ -1,3 +1,7 @@
+2011-04-14 Arjan Bouter <abouter at sourcemage.org>
+	* BUILD: removed, obsolete
+	* DEPENDS: added missing dep on libxpm
+
 2010-04-19 Sukneet Basuta <sukneet at sourcemage.org>
 	* DETAILS: Fixed SOURCE_URL[0]
 	  updated spell to 0.6



More information about the SM-Commit mailing list