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

Vlad Glagolev scm at sourcemage.org
Fri Jan 13 12:01:37 EST 2012


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

 ChangeLog                       |    3 +++
 database/pgadmin3/DETAILS       |    2 +-
 database/pgadmin3/HISTORY       |    3 +++
 kernels/kmod/DEPENDS            |    3 +++
 kernels/kmod/DETAILS            |   25 +++++++++++++++++++++++++
 kernels/kmod/HISTORY            |    5 +++++
 kernels/kmod/PRE_BUILD          |    4 ++++
 kernels/kmod/lucas.demarchi.gpg |binary
 libs/gssdp/DEPENDS              |    3 ++-
 libs/gssdp/HISTORY              |    5 ++++-
 utils/util-linux/DETAILS        |   15 ++++++++-------
 utils/util-linux/FINAL          |    9 +++++++++
 utils/util-linux/HISTORY        |   13 +++++++++++++
 utils/util-linux/PRE_BUILD      |    6 +++++-
 utils/util-linux/util-linux.gpg |binary
 video/ffmpeg/DETAILS            |    6 +++---
 video/ffmpeg/HISTORY            |    3 +++
 x11-toolkits/wxgtk-new/DETAILS  |    4 ++--
 x11-toolkits/wxgtk-new/HISTORY  |    3 +++
 19 files changed, 96 insertions(+), 16 deletions(-)

New commits:
commit 58540864a446471a33e19860493e4ce03df73825
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    util-linux: => 2.20 [aes]

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

    util-linux now needs ttyX in /etc/inittab without /dev, #110

commit 228fc8df82344484785192f2b53c9e1cbd1647a7
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    Revert "util-linux now needs ttyX in /etc/inittab without /dev, #110"
    
    This reverts commit 693e163c1a9e6c1c3e43ce3cd041cadb67d0e898.
    
    FINAL is better place for this than PRE_BUILD.

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

    kernels/kmod: new spell, tool to replace module-init-tools

commit 6063e1df4ce88b7abe83dc222c2dab786c8169ba
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    ffmpeg 0.7.11, SECURITY_PATCH=10

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

    pgadmin3 1.14.1

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

    wxgtk-new 2.9.3

commit 693e163c1a9e6c1c3e43ce3cd041cadb67d0e898
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    util-linux now needs ttyX in /etc/inittab without /dev, #110

commit ca0ed72c922dbe68ff03c4fa5aa92a5ff49b2dac
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    gssdp: gtk+2 is not optional

commit 1b9773a3fcc333553f500a3bb324fb1a5daf1c12
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    gssdp: depnds on libsoup

commit 7f69b7422e8fc8368e810254a36f738b48c593a7
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    util-linux 2.20.1

commit 54417a1cd088d46f491367e1055b8e594f7c717b
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    Revert "Revert "util-linux 2.20""
    
    This reverts commit 3a8558ce923a2bc328cc3924df552109f97d4fad.

diff --git a/ChangeLog b/ChangeLog
index b6f5b0c..bbc99d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-01-13 Treeve Jelbert <treeve at sourcemage.org>
+	* kernels/kmod: new spell, tool to replace module-init-tools
+
 2012-01-13 Thomas Orgis <sobukus at sourcemage.org>
 	* kde4-apps/FUNCTIONS: ensure build finds correct QT binaries first
 
diff --git a/database/pgadmin3/DETAILS b/database/pgadmin3/DETAILS
index 848cff3..be403cd 100755
--- a/database/pgadmin3/DETAILS
+++ b/database/pgadmin3/DETAILS
@@ -1,5 +1,5 @@
            SPELL=pgadmin3
-         VERSION=1.14.0
+         VERSION=1.14.1
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/database/pgadmin3/HISTORY b/database/pgadmin3/HISTORY
index 983a03b..83920fd 100644
--- a/database/pgadmin3/HISTORY
+++ b/database/pgadmin3/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.14.1
+
 2011-10-14 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed long description wrap (scripted)
 
diff --git a/kernels/kmod/DEPENDS b/kernels/kmod/DEPENDS
new file mode 100755
index 0000000..8d4650e
--- /dev/null
+++ b/kernels/kmod/DEPENDS
@@ -0,0 +1,3 @@
+depends xz-utils '--with-xz'  &&
+depends zlib     '--with-zlib'
+
diff --git a/kernels/kmod/DETAILS b/kernels/kmod/DETAILS
new file mode 100755
index 0000000..3675065
--- /dev/null
+++ b/kernels/kmod/DETAILS
@@ -0,0 +1,25 @@
+           SPELL=kmod
+         VERSION=3
+#     SOURCE_HASH=sha512:
+          SOURCE=$SPELL-$VERSION.tar.xz
+         SOURCE2=$SOURCE.sign
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=http://packages.profusion.mobi/kmod/$SOURCE
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.sign
+      SOURCE_GPG=lucas.demarchi.gpg:$SOURCE.sign:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+        
+#WEB_SITE=
+      LICENSE[0]=GPL
+         ENTERED=20120113
+        KEYWORDS=""
+           SHORT="kernel support tools"
+cat << EOF
+kmod is a set of tools to handle common tasks with Linux kernel modules like
+insert, remove, list, check properties, resolve dependencies and aliases.
+
+These tools are designed on top of libkmod, a library that is shipped with
+kmod. See libkmod/README for more details on this library and how to use it.
+The aim is to be compatible with tools, configurations and indexes from
+module-init-tools project.
+EOF
diff --git a/kernels/kmod/HISTORY b/kernels/kmod/HISTORY
new file mode 100644
index 0000000..b483ba2
--- /dev/null
+++ b/kernels/kmod/HISTORY
@@ -0,0 +1,5 @@
+2012-01-13 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3
+	  using key 30CBEA53: public key "Lucas De Marchi <lucas.demarchi at profusion.mobi>"
+	  spell created
+
diff --git a/kernels/kmod/PRE_BUILD b/kernels/kmod/PRE_BUILD
new file mode 100755
index 0000000..089ae35
--- /dev/null
+++ b/kernels/kmod/PRE_BUILD
@@ -0,0 +1,4 @@
+cd $BUILD_DIRECTORY &&
+# special case for xz tarballs
+verify_file ''  &&
+xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
diff --git a/kernels/kmod/lucas.demarchi.gpg b/kernels/kmod/lucas.demarchi.gpg
new file mode 100644
index 0000000..ea21eab
Binary files /dev/null and b/kernels/kmod/lucas.demarchi.gpg differ
diff --git a/libs/gssdp/DEPENDS b/libs/gssdp/DEPENDS
index d8dcd8f..0d3313a 100755
--- a/libs/gssdp/DEPENDS
+++ b/libs/gssdp/DEPENDS
@@ -1,4 +1,5 @@
+depends gtk+2 &&
 depends glib2 &&
+depends libsoup &&
 optional_depends gtk-doc '--enable-gtk-doc' '--disable-gtk-doc' \
                  'for documentation generation' &&
-optional_depends GTK2 '' '--without-gtk' 'for GTK+2 support'
diff --git a/libs/gssdp/HISTORY b/libs/gssdp/HISTORY
index 001428b..10ab6bf 100644
--- a/libs/gssdp/HISTORY
+++ b/libs/gssdp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS: gtk+2 is not optional
+	* DEPENDS: depends on libsoup
+
 2009-10-08 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS, DEPENDS: spell created
-
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index aa1b621..48d0ef8 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -1,8 +1,8 @@
            SPELL=util-linux
 if [[ $UL_VERSION == aes ]]; then
-         VERSION=2.19.1
+         VERSION=2.20
   SECURITY_PATCH=2
-         SOURCE3=$SPELL-$VERSION-20110510.diff.bz2
+         SOURCE3=$SPELL-$VERSION-20110905.diff.bz2
          SOURCE4=$SOURCE3.sign
   SOURCE3_URL[0]=http://loop-aes.sourceforge.net/updates/$SOURCE3
   SOURCE3_URL[1]=http://koti.tnnet.fi/jari.ruusu/linux/$SOURCE3
@@ -11,16 +11,17 @@ if [[ $UL_VERSION == aes ]]; then
      SOURCE3_GPG=loop-AES.gpg:$SOURCE4:UPSTREAM_KEY
   SOURCE4_IGNORE=signature
 else
-         VERSION=2.19.1
+         VERSION=2.20.1
   SECURITY_PATCH=2
 fi
           BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
-         SOURCE2=$SOURCE.sign
+         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/$SPELL/v$BRANCH/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.sign
-      SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
+   SOURCE_URL[0]=ftp://ftp.infradead.org/pub/util-linux/v$BRANCH/$SOURCE
+#   SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/$SPELL/v$BRANCH/$SOURCE
+  SOURCE2_URL[0]=$SOURCE_URL.asc
+      SOURCE_GPG=util-linux.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
         WEB_SITE=http://userweb.kernel.org/~kzak/util-linux-ng/
          ENTERED=20010922
diff --git a/utils/util-linux/FINAL b/utils/util-linux/FINAL
index 3d4d117..7ebc168 100755
--- a/utils/util-linux/FINAL
+++ b/utils/util-linux/FINAL
@@ -1,3 +1,12 @@
+# util-linux 2.20 needs ttyX in /etc/inittab without /dev
+# http://www.sourcemage.org/issues/110
+if [ "${VERSION:0:4}" == "2.20" ] && [ "${OLD_SPELL_VERSION:0:4}" == "2.19" ]; then
+  message "New version of util-linux needs to update /etc/inittab ..." &&
+  cp $INSTALL_ROOT/etc/inittab $INSTALL_ROOT/etc/inittab-$(date +'%Y%m%d%H%M') &&
+  sed -i "s:/dev/tty:tty:" $INSTALL_ROOT/etc/inittab &&
+  message "Updated"
+fi &&
+
 if test -f "$INSTALL_ROOT/etc/sysconfig/hwclock" && [[ $UTC ]]; then
   sed -i "s/^UTC=.*$/UTC=$UTC/" "$INSTALL_ROOT/etc/sysconfig/hwclock"
 fi
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 052d3a4..bacd50d 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,16 @@
+2012-01-13 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated aes version to 2.20; updated aes patch to 20110905
+
+2012-01-13 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.20.1, SOURCE_URL[0] updated, sign -> asc
+	* util-linux.gpg: added with key EC39C284 (Karel Zak <kzak at redhat.com>)
+	  http://www.spinics.net/lists/util-linux-ng/msg05331.html
+	  http://people.redhat.com/kzak/README.html
+	* PRE_BUILD, FINAL: /etc/inittab updated for util-linux 2.20, #110
+
+2011-08-30 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.20
+
 2011-05-13 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated aes version to 2.19.1 (security); updated aes patch
 	  to 20110510
diff --git a/utils/util-linux/PRE_BUILD b/utils/util-linux/PRE_BUILD
index 5757181..56366db 100755
--- a/utils/util-linux/PRE_BUILD
+++ b/utils/util-linux/PRE_BUILD
@@ -3,4 +3,8 @@ cd "$SOURCE_DIRECTORY" &&
 
 if [[ $UL_VERSION == aes ]]; then
   bzcat "$SOURCE_CACHE/$SOURCE3" | patch -p1
-fi
+fi &&
+
+# OLD_SPELL_VERSION is needed in FINAL
+local OLD_SPELL_VERSION=""
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
diff --git a/utils/util-linux/util-linux.gpg b/utils/util-linux/util-linux.gpg
new file mode 100644
index 0000000..8627b8b
Binary files /dev/null and b/utils/util-linux/util-linux.gpg differ
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index c2060b5..5a47e72 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,10 +1,10 @@
            SPELL=ffmpeg
-         VERSION=0.7.10
-  SECURITY_PATCH=9
+         VERSION=0.7.11
+  SECURITY_PATCH=10
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://ffmpeg.org/releases/$SOURCE
-     SOURCE_HASH=sha512:73d54f41b3f20450ea98010de433eea5f8be5805754795291c81b70c778fa7a02a7ed3ed92a5febf72c3ee8d19c20c3a1aa93889c692fdee5cbbf20e5c49bd9b
+     SOURCE_HASH=sha512:2078e13d40d660a85540349681c7a9a8d2648812167775c2d28cd1be3e29eb34aae944e18e1c798e4cf52f631737af1831eb508634e47e6ae0dee5c0cf9fe0fa
 #case $FFAMR in 
 #      none);;
 #      *)
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index c01102b..b4687aa 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.7.11, SECURITY_PATCH=10
+
 2012-01-05 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.7.10
 
diff --git a/x11-toolkits/wxgtk-new/DETAILS b/x11-toolkits/wxgtk-new/DETAILS
index 933c101..c669a14 100755
--- a/x11-toolkits/wxgtk-new/DETAILS
+++ b/x11-toolkits/wxgtk-new/DETAILS
@@ -1,8 +1,8 @@
            SPELL=wxgtk-new
           SPELLX=wxGTK
           SPELLX=wxWidgets
-         VERSION=2.9.2
-    SOURCE_HASH=sha512:364169f5ca3552f9c0a33b0ae45af36927b128070a93cd80ab8d914660eb95c4066a089971191e31ac5a741fda1c5b878bef78f67ef43f22f4e6a8a476711af7
+         VERSION=2.9.3
+    SOURCE_HASH=sha512:f81d0b8f6b8964d2b98d630bdd14266fb69534eba6e613d2bb14451449097b84f98d841abc857cd3f0e228ec8bc300b1c1d01baa211be61babf04fcd1fe0bf91
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION}
    SOURCE_URL[0]=$SOURCEFORGE_URL/wxwindows/$SOURCE
diff --git a/x11-toolkits/wxgtk-new/HISTORY b/x11-toolkits/wxgtk-new/HISTORY
index 00fb178..573fe73 100644
--- a/x11-toolkits/wxgtk-new/HISTORY
+++ b/x11-toolkits/wxgtk-new/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.9.3
+
 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)


More information about the SM-Commit mailing list