summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2012-01-27 11:34:42 +0100
committerTreeve Jelbert2012-01-27 11:34:42 +0100
commit29a11d7bfb1566d1b8e6145e90c2649396fd467e (patch)
treea6d3355e9ee0847ff96b6534ab11613dd65a6f5c
parent64fd84f041ddbd751b8c9cee5564f986d4320689 (diff)
parent3e87b29b409a39484f5e6ccf26225a3c76f2c1f8 (diff)
Merge branch 'master' into devel-xorg-modular
Diffstat
-rwxr-xr-xdisk/grub2/DETAILS1
-rw-r--r--disk/grub2/HISTORY7
-rwxr-xr-xdisk/grub2/PRE_BUILD3
-rw-r--r--disk/grub2/fix-udev.patch21
-rwxr-xr-xgnome3-apps/gnome-color-manager/DETAILS4
-rw-r--r--gnome3-apps/gnome-color-manager/HISTORY3
-rw-r--r--gnome3-apps/gnome-color-manager/gnome-color-manager-3.2.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome3-apps/gnome-color-manager/gnome-color-manager-3.2.2.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xgraphics-libs/freeglut/DETAILS4
-rw-r--r--graphics-libs/freeglut/HISTORY3
-rw-r--r--kernels/linux/HISTORY4
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches_3/patch-3.2.25
-rw-r--r--kernels/linux/latest.defaults2
-rwxr-xr-xnet/samba/DETAILS4
-rw-r--r--net/samba/HISTORY3
-rwxr-xr-xpython-pypi/twisted/DETAILS4
-rw-r--r--python-pypi/twisted/HISTORY3
-rwxr-xr-xpython-pypi/zopeinterface/DETAILS4
-rw-r--r--python-pypi/zopeinterface/HISTORY3
-rwxr-xr-xx11/colord/DETAILS4
-rw-r--r--x11/colord/HISTORY3
-rwxr-xr-xx11/colord/PRE_BUILD5
22 files changed, 71 insertions, 19 deletions
diff --git a/disk/grub2/DETAILS b/disk/grub2/DETAILS
index 83c13e8e4d..039516800f 100755
--- a/disk/grub2/DETAILS
+++ b/disk/grub2/DETAILS
@@ -12,6 +12,7 @@
# SOURCE_IGNORE=volatile
#else
VERSION=1.99
+ PATCHLEVEL=1
SOURCE=grub-$VERSION.tar.gz
SOURCE2=grub-$VERSION.tar.gz.sig
SOURCE_URL[0]=${GNU_URL}/grub/$SOURCE
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index ab87621349..15140c00e9 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,10 @@
+2012-01-26 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * fix-udev.patch: added
+ * PRE_BUILD: apply patch
+ fixes bug #341, pathc found by Eric Sandalle
+ /boot/grub/grub.cfg generated correctly with udev-179
+
2012-01-20 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: lzo support was removed in 2009
diff --git a/disk/grub2/PRE_BUILD b/disk/grub2/PRE_BUILD
index 457375e6e8..3cd048f132 100755
--- a/disk/grub2/PRE_BUILD
+++ b/disk/grub2/PRE_BUILD
@@ -4,4 +4,5 @@ if [[ "${GRUB2_SVN}" = 'y' ]]; then
./autogen.sh
else
rm -rf autom4te.cache
-fi
+fi &&
+patch -p0 <$SPELL_DIRECTORY/fix-udev.patch
diff --git a/disk/grub2/fix-udev.patch b/disk/grub2/fix-udev.patch
new file mode 100644
index 0000000000..fcfef34ef0
--- /dev/null
+++ b/disk/grub2/fix-udev.patch
@@ -0,0 +1,21 @@
+=== modified file 'grub-core/kern/emu/getroot.c'
+--- grub-core/kern/emu/getroot.c 2011-05-21 05:03:55 +0000
++++ grub-core/kern/emu/getroot.c 2011-05-30 23:56:40 +0000
+@@ -220,9 +220,17 @@ grub_find_root_device_from_mountinfo (co
+ /* Now scan visible mounts for the ones we're interested in. */
+ for (i = entry_len - 1; i >= 0; i--)
+ {
++ struct stat st;
++
+ if (!*entries[i].device)
+ continue;
+
++ if (stat (entries[i].device, &st) < 0)
++ /* The root filesystem device recorded in mountinfo does not
++ exist, perhaps due to a udev bug. Fall back to more primitive
++ methods. */
++ break;
++
+ ret = strdup (entries[i].device);
+ if (relroot)
+ *relroot = strdup (entries[i].enc_root);
diff --git a/gnome3-apps/gnome-color-manager/DETAILS b/gnome3-apps/gnome-color-manager/DETAILS
index 6ff6299cf8..27393dea47 100755
--- a/gnome3-apps/gnome-color-manager/DETAILS
+++ b/gnome3-apps/gnome-color-manager/DETAILS
@@ -1,7 +1,7 @@
SPELL=gnome-color-manager
- VERSION=3.2.0
+ VERSION=3.2.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome3-apps/gnome-color-manager/HISTORY b/gnome3-apps/gnome-color-manager/HISTORY
index 0308e962b2..43b8888894 100644
--- a/gnome3-apps/gnome-color-manager/HISTORY
+++ b/gnome3-apps/gnome-color-manager/HISTORY
@@ -1,2 +1,5 @@
+2012-01-26 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.2.2
+
2011-10-06 Ladislav Hagara <hgr@vabo.cz>
* DETAILS, DEPENDS, BUILD: spell created, version 3.2.0
diff --git a/gnome3-apps/gnome-color-manager/gnome-color-manager-3.2.0.tar.bz2.sig b/gnome3-apps/gnome-color-manager/gnome-color-manager-3.2.0.tar.bz2.sig
deleted file mode 100644
index 6f9a213d55..0000000000
--- a/gnome3-apps/gnome-color-manager/gnome-color-manager-3.2.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome3-apps/gnome-color-manager/gnome-color-manager-3.2.2.tar.xz.sig b/gnome3-apps/gnome-color-manager/gnome-color-manager-3.2.2.tar.xz.sig
new file mode 100644
index 0000000000..1caf282578
--- /dev/null
+++ b/gnome3-apps/gnome-color-manager/gnome-color-manager-3.2.2.tar.xz.sig
Binary files differ
diff --git a/graphics-libs/freeglut/DETAILS b/graphics-libs/freeglut/DETAILS
index b02ee8fbc1..dc4c4832e3 100755
--- a/graphics-libs/freeglut/DETAILS
+++ b/graphics-libs/freeglut/DETAILS
@@ -1,6 +1,6 @@
SPELL=freeglut
- VERSION=2.6.0
- SOURCE_HASH=sha512:685d55979c1fb420593d4b9f8d01ba9853288df0c3df9fa60ed9c4dfcb469dcf6c3142a9306073fac9e75fde1fb81ace325d6a9eebce227d95220e82217fda26
+ VERSION=2.8.0
+ SOURCE_HASH=sha512:ae2918d1ed7370ba3345f6416f70678cdf2346f61ce118102dc449d365163fcf238b76474178f57687592dacf41657b064e588e378c562ce878e92eaed17a665
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION/-rc*/}
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
diff --git a/graphics-libs/freeglut/HISTORY b/graphics-libs/freeglut/HISTORY
index 20a312039e..cf4e7d2412 100644
--- a/graphics-libs/freeglut/HISTORY
+++ b/graphics-libs/freeglut/HISTORY
@@ -1,3 +1,6 @@
+2012-01-26 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.8.0
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 4814ee6036..0e2e73cf10 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2012-01-26 Ladislav Hagara <hgr@vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.2.2
+ * info/patches/maintenance_patches_3/patch-3.2.2: added
+
2012-01-13 Ladislav Hagara <hgr@vabo.cz>
* latest.defaults: LATEST_maintenance_patches_3=patch-3.2.1
* info/patches/maintenance_patches_3/patch-3.2.1: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.2 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.2
new file mode 100755
index 0000000000..f1e0c50044
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.2
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.2"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="9e503b4f6d00fa65a3da472373f5c0f2072b6a64"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index a7c0e2ea5e..dad1ff7edb 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.2
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.2.1
+LATEST_maintenance_patches_3=patch-3.2.2
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index a11018d04a..b38ceaeea3 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,11 +1,11 @@
SPELL=samba
- VERSION=3.6.1
+ VERSION=3.6.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
- SOURCE_HASH=sha512:e8afb3d74eef73eaaf016638e141e3b7cd42e907fc63ed3848337bdf3810b9232ac9241c347a4dc9bd76283cf91073aeed9f9b6805b5e569165c702dd2255fd7
+ SOURCE_HASH=sha512:c8b9d82fe664d3630ebc8b2cb5819cf6ecbe73cea6eb10afd6fccad70d622d65b5b866df4ca4dd1550e845b2f86fefadf4c25884017e15fef53422c5080dbbca
if [[ "$SAMBA_VSCAN" == "y" ]] ; then
VSCAN_VERSION=0.3.6c-beta4
SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index cee9267733..c86504e26c 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,6 @@
+2012-01-26 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.6.2
+
2011-10-21 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 3.6.1
diff --git a/python-pypi/twisted/DETAILS b/python-pypi/twisted/DETAILS
index afb59ed8f9..df79b99cc8 100755
--- a/python-pypi/twisted/DETAILS
+++ b/python-pypi/twisted/DETAILS
@@ -1,6 +1,6 @@
SPELL=twisted
- VERSION=10.1.0
- SOURCE_HASH=sha512:25c0e38ae8b206b8397b0d190fc1c5a6afb4f134f4bea2360361a68e2086a1ab0f2038728e69b1caad1475399b9b29d59a4a039fa6bc7ffc897eea587d1f022c
+ VERSION=10.2.0
+ SOURCE_HASH=sha512:ee361df24d789af8ddb6d2f84512431ea73b7f7754d41be4acdae376785a808a74bb341e320f8551c5636d1767b9d5d71a4793accb15ecd7fcc2410820013c45
SOURCE=Twisted-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Twisted-$VERSION
SOURCE_URL[0]=http://tmrc.mit.edu/mirror/twisted/Twisted/${VERSION%.*}/$SOURCE
diff --git a/python-pypi/twisted/HISTORY b/python-pypi/twisted/HISTORY
index 1837b3fcfc..6a052097f8 100644
--- a/python-pypi/twisted/HISTORY
+++ b/python-pypi/twisted/HISTORY
@@ -1,3 +1,6 @@
+2012-01-26 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 10.2.0
+
2011-05-23 Sukneet Basuta <sukneet@sourcemage.org>
* DEPENDS: updated setuptools dependency to SETUPTOOLS provider
diff --git a/python-pypi/zopeinterface/DETAILS b/python-pypi/zopeinterface/DETAILS
index cb9e32db06..07912f4abf 100755
--- a/python-pypi/zopeinterface/DETAILS
+++ b/python-pypi/zopeinterface/DETAILS
@@ -1,7 +1,7 @@
SPELL=zopeinterface
SPELLX=zope.interface
- VERSION=3.6.1
- SOURCE_HASH=sha512:db825cf380d0c5e9d99af4dad36d87b765acac9feccbed841a242e65a94c6f8081ec93d1faf3feaf938b1d1ea49eed0b72418d8a285ae78301088407579f7a73
+ VERSION=3.8.0
+ SOURCE_HASH=sha512:7874d46cf23c4525e4bab3c91408966cc2f813ec91ff65c9428ca0e355f5334206e87eee1e7d37705ca3f2294dd162aa4ab239222ab45fee575c2dee6bd0e776
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=http://pypi.python.org/packages/source/z/$SPELLX/$SOURCE
diff --git a/python-pypi/zopeinterface/HISTORY b/python-pypi/zopeinterface/HISTORY
index 7d2e5da5fb..ef57e8a355 100644
--- a/python-pypi/zopeinterface/HISTORY
+++ b/python-pypi/zopeinterface/HISTORY
@@ -1,3 +1,6 @@
+2012-01-26 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 3.8.0
+
2011-05-23 Sukneet Basuta <sukneet@sourcemage.org>
* DEPENDS: updated setuptools dependency to SETUPTOOLS provider
diff --git a/x11/colord/DETAILS b/x11/colord/DETAILS
index c24cd735c6..c80cc40b15 100755
--- a/x11/colord/DETAILS
+++ b/x11/colord/DETAILS
@@ -1,6 +1,6 @@
SPELL=colord
- VERSION=0.1.13
- SOURCE_HASH=sha512:53b2f3d31344b0480e014f4a90ab065e906219ea3d8e996c9e02dda58cfb24c5080712f13fe7dd60bf8b02e5833ec3e8a0e4f7bf2214e90ffa072cebe60cce8b
+ VERSION=0.1.16
+ SOURCE_HASH=sha512:948be787b13f54fb31060fb91b92de03b54f6a00141d42d0312c430cb79cf89864fb62d3ae9da37b05f398938a87f2654e58241cca3889fde9cf86b4953301b8
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.freedesktop.org/software/colord/releases/$SOURCE
diff --git a/x11/colord/HISTORY b/x11/colord/HISTORY
index 06a3bc4a35..11e8ec5d87 100644
--- a/x11/colord/HISTORY
+++ b/x11/colord/HISTORY
@@ -1,2 +1,5 @@
+2012-01-26 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.1.16
+
2011-10-03 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: spell created, version 0.1.13
diff --git a/x11/colord/PRE_BUILD b/x11/colord/PRE_BUILD
deleted file mode 100755
index 6f545045d8..0000000000
--- a/x11/colord/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 20:23:04 +0000