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

Vlad Glagolev scm at sourcemage.org
Fri Jan 20 11:36:46 EST 2012


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

 dev/null                                               |binary
 devel/binutils/HISTORY                                 |    3 +
 devel/binutils/INSTALL                                 |    4 +-
 devel/git/DETAILS                                      |    8 ++--
 devel/git/HISTORY                                      |    3 +
 disk/ntfs-3g/BUILD                                     |    2 -
 disk/ntfs-3g/CONFIGURE                                 |    6 +++
 disk/ntfs-3g/DEPENDS                                   |    7 +++-
 disk/ntfs-3g/DETAILS                                   |    2 -
 disk/ntfs-3g/HISTORY                                   |    6 +++
 disk/sg3_utils/DETAILS                                 |    4 +-
 disk/sg3_utils/HISTORY                                 |    3 +
 gnome3-libs/gnome-shell/DETAILS                        |    2 -
 gnome3-libs/gnome-shell/HISTORY                        |    3 +
 gnome3-libs/gnome-shell/gnome-shell-3.2.2.1.tar.xz.sig |binary
 gnome3-libs/gnome-shell/gnome-shell-3.2.2.tar.xz.sig   |    0 
 net/iproute2/DETAILS                                   |   15 ++++-----
 net/iproute2/HISTORY                                   |    4 ++
 net/iproute2/PRE_BUILD                                 |    2 -
 net/iproute2/m_xt.patch                                |   28 -----------------
 shell-term-fm/shared-mime-info/DETAILS                 |    4 +-
 shell-term-fm/shared-mime-info/HISTORY                 |    4 ++
 shell-term-fm/shared-mime-info/PRE_BUILD               |    5 ---
 video/guvcview/DETAILS                                 |    4 +-
 video/guvcview/HISTORY                                 |    3 +
 25 files changed, 63 insertions(+), 59 deletions(-)

New commits:
commit 71b01ca70dc0d0018147c104ff0a3b49929d331f
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    ntfs-3g: renewed dependencies and options

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

    iproute2 3.2.0

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

    shared-mime-info 1.0

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

    sg3_utils 1.33

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

    guvcview: berlios -> sourceforge

commit fb53a259a0efa3b0dc6d5f594e418402489c4759
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    binutils: install libiberty.h (some code wants to use it, LFS recommends installing, too)

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

    git 1.7.8.4

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

    gnome-shell 3.2.2.1

diff --git a/devel/binutils/HISTORY b/devel/binutils/HISTORY
index 364f4f0..78f80ea 100644
--- a/devel/binutils/HISTORY
+++ b/devel/binutils/HISTORY
@@ -1,3 +1,6 @@
+2012-01-20 Thomas Orgis <sobukus at sourcemage.org>
+	* INSTALL: install libiberty.h
+
 2011-11-21 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.22
 
diff --git a/devel/binutils/INSTALL b/devel/binutils/INSTALL
index fe69cc0..b805f67 100755
--- a/devel/binutils/INSTALL
+++ b/devel/binutils/INSTALL
@@ -1,3 +1,5 @@
 make_single &&
-make DESTDIR=${INSTALL_ROOT} install &&
+make DESTDIR="$INSTALL_ROOT" install &&
+# other apps want to use the lib
+cp -v ../include/libiberty.h "$INSTALL_ROOT/usr/include" &&
 make_normal
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index a5fdd37..b9ae433 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,10 +1,10 @@
            SPELL=git
-         VERSION=1.7.8.3
+         VERSION=1.7.8.4
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
 #         SOURCE2=$SOURCE.sign
 #      SOURCE_GPG=kernel.gpg:$SOURCE.sign:UPSTREAM_KEY
-     SOURCE_HASH=sha512:e2e4dc6d94b77ef74bf7e327fadb0b19494aa1d73acd9994b8c36471808dd80a5c2eb23065ae7f852a9269a45f5f6e311fe05a7ada2801966533e82891cd453a
+     SOURCE_HASH=sha512:d1ca22acd4a3d1b4b3b257fd2417d09df662865101a3d42bf6a22ae6f28053505124340ca129200e2c3bf1074a0ec9a245dbacf56c50301045010ef4530ebf23
       SOURCE_URL=http://git-core.googlecode.com/files/$SOURCE
 #     SOURCE2_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE2
 #  SOURCE2_IGNORE=signature
@@ -12,7 +12,7 @@ if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
          SOURCE3=$SPELL-manpages-$VERSION.tar.gz
 #         SOURCE4=$SOURCE3.sign
 #     SOURCE3_GPG=kernel.gpg:$SOURCE3.sign:UPSTREAM_KEY
-     SOURCE3_HASH=sha512:5eca7e853d7ed21cf810c273e5f930f4cbc388c839773d974faeba07148272acfaea874f2c297e35a71e6ffb3612305ccc845a5155f180773354d0cb8ff00c7c
+     SOURCE3_HASH=sha512:d376d90e41139e896409f1631415f3528c5843452b2b9910257a3d121056d7071380ba556375c10c77be4eea7b8f6cf878d0702cc84215ff1c81f7e902f7717f
      SOURCE3_URL=http://git-core.googlecode.com/files/$SOURCE3
 #     SOURCE4_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE4
 #  SOURCE4_IGNORE=signature
@@ -21,7 +21,7 @@ if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
          SOURCE5=$SPELL-htmldocs-$VERSION.tar.gz
 #         SOURCE6=$SOURCE5.sign
 #     SOURCE5_GPG=kernel.gpg:$SOURCE5.sign:UPSTREAM_KEY
-     SOURCE5_HASH=sha512:bef36c8f98921bdaf66fe4f7183b89c7153bf9bb2317989d70bcd85c6eb5ac232ce818b49f8db1a3e717bfa7d5ed407225b4819a56fced1b29eec586188ff07d
+     SOURCE5_HASH=sha512:d520a9b34920ffd844849e071575e80ddc9c911e12c77db6f9b8999ec8fc909eb4a9de882126453df574b84e38e3a537cb07b196760839bd264a910a428d25a7
      SOURCE5_URL=http://git-core.googlecode.com/files/$SOURCE5
 #     SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
 #  SOURCE6_IGNORE=signature
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index bd06e3e..a4c32e2 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2012-01-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.7.8.4
+
 2012-01-08 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.7.8.3
 
diff --git a/disk/ntfs-3g/BUILD b/disk/ntfs-3g/BUILD
index 440db21..56377fb 100755
--- a/disk/ntfs-3g/BUILD
+++ b/disk/ntfs-3g/BUILD
@@ -1,2 +1,2 @@
-OPTS="${OPTS} $NTFS3G_ACL $NTFS3G_MTAB" &&
+OPTS="$NTFS3G_ACL $NTFS3G_XATTR $NTFS3G_MTAB ${OPTS}" &&
 default_build
diff --git a/disk/ntfs-3g/CONFIGURE b/disk/ntfs-3g/CONFIGURE
index 1406ca6..5105f89 100755
--- a/disk/ntfs-3g/CONFIGURE
+++ b/disk/ntfs-3g/CONFIGURE
@@ -1,7 +1,11 @@
 config_query_option NTFS3G_ACL  'Enable POSIX ACL support?' y \
                                 '--enable-posix-acls'  \
                                 '--disable-posix-acls' &&
+
+config_query_option NTFS3G_XATTR "Enable system extended attributes mappings?" y \
+                                 "--enable-xattr-mappings" \
+                                 "--disable-xattr-mappings" &&
+
 config_query_option NTFS3G_MTAB 'Enable usage of /etc/mtab ?' y \
                                 '--enable-mtab'  \
                                 '--disable-mtab'
-                               
diff --git a/disk/ntfs-3g/DEPENDS b/disk/ntfs-3g/DEPENDS
index 1decb7a..5668791 100755
--- a/disk/ntfs-3g/DEPENDS
+++ b/disk/ntfs-3g/DEPENDS
@@ -1,5 +1,8 @@
-depends attr    &&
-depends gnutls  &&
+optional_depends gnutls \
+                 "--enable-crypto" \
+                 "--disable-crypto" \
+                 "for crypto related code and utilities" &&
+
 message 'If you want to allow normal users to mount ntfs filesystems,' &&
 message 'then you need internal fuse support' &&
 optional_depends fuse '--with-fuse=external' \
diff --git a/disk/ntfs-3g/DETAILS b/disk/ntfs-3g/DETAILS
index 8435bb4..a35bff4 100755
--- a/disk/ntfs-3g/DETAILS
+++ b/disk/ntfs-3g/DETAILS
@@ -3,7 +3,7 @@
          VERSION=2011.4.12
      SOURCE_HASH=sha512:0bff1d39c84ce774e147dab0a8f7094bb7df8d7bd45a7a4d60ab25b230284ca67cd1746fbe2d063c080a346b40ea6a5960f1fbcae14468c30dcdc66639fc16d9
           SOURCE=$SPELLX-$VERSION.tgz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
         WEB_SITE=http://www.tuxera.com
    SOURCE_URL[0]=$WEB_SITE/opensource/$SOURCE
       LICENSE[0]=GPL
diff --git a/disk/ntfs-3g/HISTORY b/disk/ntfs-3g/HISTORY
index 97c666d..41ecc1e 100644
--- a/disk/ntfs-3g/HISTORY
+++ b/disk/ntfs-3g/HISTORY
@@ -1,3 +1,9 @@
+2012-01-20 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: quoting paths
+	* DEPENDS: gnutls and is optional, attr isn't required
+	* CONFIGURE: xattr is configured here
+	* BUILD: use NTFS3G_XATTR; moved OPTS to the end
+
 2011-04-11 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2011.4.12, ntfsprogs has been merged
 	* CONFLICTS: added
diff --git a/disk/sg3_utils/DETAILS b/disk/sg3_utils/DETAILS
index 4a46979..2ea654f 100755
--- a/disk/sg3_utils/DETAILS
+++ b/disk/sg3_utils/DETAILS
@@ -1,6 +1,6 @@
            SPELL=sg3_utils
-         VERSION=1.32
-     SOURCE_HASH=sha512:99868cefd8d28313ac436cf067a60838d50287a76511ffffd9c2f944398992cc96747f7ecd6d311cde9d4aa27c1deccafc50e7a0304486a6a2ec45885af9fd19
+         VERSION=1.33
+     SOURCE_HASH=sha512:3973f91a0d9d28425ed9f9a01b1b17276914be9fd96c1314fcc49044478901bc885245bd1e8dcd3e86a271293d90efd2a66cb7746d0c0d1166ae82a7f3ae8c69
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://sg.danny.cz/sg/p/$SOURCE
diff --git a/disk/sg3_utils/HISTORY b/disk/sg3_utils/HISTORY
index 95161fb..abeb9ce 100644
--- a/disk/sg3_utils/HISTORY
+++ b/disk/sg3_utils/HISTORY
@@ -1,3 +1,6 @@
+2012-01-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.33
+
 2011-08-05 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.32
 
diff --git a/gnome3-libs/gnome-shell/DETAILS b/gnome3-libs/gnome-shell/DETAILS
index 6e308d8..e83ecf7 100755
--- a/gnome3-libs/gnome-shell/DETAILS
+++ b/gnome3-libs/gnome-shell/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnome-shell
-         VERSION=3.2.2
+         VERSION=3.2.2.1
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome3-libs/gnome-shell/HISTORY b/gnome3-libs/gnome-shell/HISTORY
index c97103b..d3e5294 100644
--- a/gnome3-libs/gnome-shell/HISTORY
+++ b/gnome3-libs/gnome-shell/HISTORY
@@ -1,3 +1,6 @@
+2012-01-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.2.2.1
+
 2012-01-18 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.2.2, bz2 -> xz
 
diff --git a/gnome3-libs/gnome-shell/gnome-shell-3.2.2.1.tar.xz.sig b/gnome3-libs/gnome-shell/gnome-shell-3.2.2.1.tar.xz.sig
new file mode 100644
index 0000000..65943e7
Binary files /dev/null and b/gnome3-libs/gnome-shell/gnome-shell-3.2.2.1.tar.xz.sig differ
diff --git a/gnome3-libs/gnome-shell/gnome-shell-3.2.2.tar.xz.sig b/gnome3-libs/gnome-shell/gnome-shell-3.2.2.tar.xz.sig
deleted file mode 100644
index a8b7270..0000000
Binary files a/gnome3-libs/gnome-shell/gnome-shell-3.2.2.tar.xz.sig and /dev/null differ
diff --git a/net/iproute2/DETAILS b/net/iproute2/DETAILS
index 34e77d9..e7408ff 100755
--- a/net/iproute2/DETAILS
+++ b/net/iproute2/DETAILS
@@ -1,13 +1,14 @@
            SPELL=iproute2
-         VERSION=2.6.39
-          SOURCE=$SPELL-$VERSION.tar.gz
-         SOURCE2=${SOURCE}.sign
-  SOURCE2_IGNORE=signature
+         VERSION=3.2.0
+          SOURCE=$SPELL-$VERSION.tar.xz
+     SOURCE_HASH=sha512:daa82498a81c0afa322878b4d6d3a448c361a1bb21c1e2f323d8ff4fdf43030106c4e5c9f4c8381f81dd66df2b2d162ac7d62b361b79914e9416d9bfb0c30762
+#         SOURCE2=${SOURCE}.sign
+#  SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://developer.osdl.org/dev/iproute2/download/$SOURCE
-  SOURCE2_URL[0]=http://developer.osdl.org/dev/iproute2/download/$SOURCE2
+   SOURCE_URL[0]=${KERNEL_URL}/pub/linux/utils/net/iproute2/$SOURCE
+#  SOURCE2_URL[0]=http://developer.osdl.org/dev/iproute2/download/$SOURCE2
       PATCHLEVEL=0
-      SOURCE_GPG="iproute2.gpg:${SOURCE2}:VERIFIED_UPSTREAM_KEY"
+#      SOURCE_GPG="iproute2.gpg:${SOURCE2}:VERIFIED_UPSTREAM_KEY"
       LICENSE[0]=GPL
         WEB_SITE=http://linux-net.osdl.org/index.php/Iproute2
          ENTERED=20020528
diff --git a/net/iproute2/HISTORY b/net/iproute2/HISTORY
index 0462b34..b74e909 100644
--- a/net/iproute2/HISTORY
+++ b/net/iproute2/HISTORY
@@ -1,3 +1,7 @@
+2012-01-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.2.0, SOURCE_URL[0] updated
+	* PRE_BUILD, m_xt.patch: patch removed
+
 2011-07-19 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.6.39, bz2 -> gz, sig -> sign
 
diff --git a/net/iproute2/PRE_BUILD b/net/iproute2/PRE_BUILD
index 0f624ed..305a26d 100755
--- a/net/iproute2/PRE_BUILD
+++ b/net/iproute2/PRE_BUILD
@@ -1,8 +1,6 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-patch -p0 < "$SPELL_DIRECTORY/m_xt.patch" &&
-
 sedit  "s/-O2/$CFLAGS/"  Makefile                             &&
 sedit  "s:DESTDIR=/usr/:DESTDIR=:"     Makefile               &&
 sedit  "s:/share/:/usr/share/:"        Makefile               &&
diff --git a/net/iproute2/m_xt.patch b/net/iproute2/m_xt.patch
deleted file mode 100644
index 43ea142..0000000
--- a/net/iproute2/m_xt.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- tc/m_xt.c.orig
-+++ tc/m_xt.c
-@@ -162,7 +162,11 @@ static int parse_ipt(struct action_util *a,int *argc_p,
- 					return -1;
- 				}
- 				tcipt_globals.opts =
--				    xtables_merge_options(tcipt_globals.opts,
-+				    xtables_merge_options(
-+#if XTABLES_VERSION_CODE > 5
-+				                          tcipt_globals.orig_opts,
-+#endif
-+				                          tcipt_globals.opts,
- 				                          m->extra_opts,
- 				                          &m->option_offset);
- 			} else {
-@@ -307,7 +311,11 @@ print_ipt(struct action_util *au,FILE * f, struct rtattr *arg)
- 			}
- 
- 			tcipt_globals.opts =
--			    xtables_merge_options(tcipt_globals.opts,
-+			    xtables_merge_options(
-+#if XTABLES_VERSION_CODE > 5
-+			                          tcipt_globals.orig_opts,
-+#endif
-+			                          tcipt_globals.opts,
- 			                          m->extra_opts,
- 			                          &m->option_offset);
- 		} else {
diff --git a/shell-term-fm/shared-mime-info/DETAILS b/shell-term-fm/shared-mime-info/DETAILS
index 6249422..1221843 100755
--- a/shell-term-fm/shared-mime-info/DETAILS
+++ b/shell-term-fm/shared-mime-info/DETAILS
@@ -1,6 +1,6 @@
            SPELL=shared-mime-info
-         VERSION=0.91
-     SOURCE_HASH=sha512:c4cd4934e1ead7f14b839212820baa145b524c234ae197c363a262d843e2efa29603ddb151230702f497e732476e71acddd71ff479c805b7319668e76b44c49c
+         VERSION=1.0
+     SOURCE_HASH=sha512:d4b8ad9a982519681fa0fb5b25d8e6b5c4701bca96785b2729e34330a75668c65b0303ad882c7a1928f48cafc7e5a5803f4bdee4db3cfd76dd58e61435c7e6ca
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://freedesktop.org/~hadess/$SOURCE
diff --git a/shell-term-fm/shared-mime-info/HISTORY b/shell-term-fm/shared-mime-info/HISTORY
index 9002a0b..689511f 100644
--- a/shell-term-fm/shared-mime-info/HISTORY
+++ b/shell-term-fm/shared-mime-info/HISTORY
@@ -1,3 +1,7 @@
+2012-01-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.0
+	* PRE_BUILD: removed
+
 2011-11-27 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.91, bz2 -> xz
 	* PRE_BUILD: added due to bz2 -> xz
diff --git a/shell-term-fm/shared-mime-info/PRE_BUILD b/shell-term-fm/shared-mime-info/PRE_BUILD
deleted file mode 100755
index 6f54504..0000000
--- a/shell-term-fm/shared-mime-info/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $BUILD_DIRECTORY &&
-verify_file '' &&
-xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
-cd $SOURCE_DIRECTORY
diff --git a/video/guvcview/DETAILS b/video/guvcview/DETAILS
index ac855dd..37501a3 100755
--- a/video/guvcview/DETAILS
+++ b/video/guvcview/DETAILS
@@ -1,10 +1,10 @@
            SPELL=guvcview
          VERSION=1.5.0
           SOURCE=${SPELL}-src-${VERSION}.tar.gz
-   SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
      SOURCE_HASH=sha512:c5d266eb0165eab0973b78ad527bf7806dc1e77d8a4e8d318c613acfaf764677c7a560156b25eb0a6fae5651d1a3e38ed83bb675885be4d1dcc63e57746d886a
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-src-${VERSION}"
-        WEB_SITE=http://guvcview.berlios.de/
+        WEB_SITE=http://guvcview.sourceforge.net/
       LICENSE[0]=GPL
          ENTERED=20090402
         KEYWORDS="video"
diff --git a/video/guvcview/HISTORY b/video/guvcview/HISTORY
index 3239bda..b41680e 100644
--- a/video/guvcview/HISTORY
+++ b/video/guvcview/HISTORY
@@ -1,3 +1,6 @@
+2012-01-20 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: WEB_SITE and SOURCE_URL[0] updated, berlios -> sourceforge
+
 2011-08-15 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.5.0
 


More information about the SM-Commit mailing list