[SM-Commit] GIT changes to stable-0.60 grimoire by Vlad Glagolev (3f28475d4b7000d39aaea23c9322452fffadf4ab)

Vlad Glagolev scm at sourcemage.org
Thu Feb 23 07:30:28 EST 2012


GIT changes to stable-0.60 grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 VERSION                                                  |    2 +-
 disk/jfsutils/BUILD                                      |    3 +++
 disk/jfsutils/DETAILS                                    |   10 ++++++++--
 disk/jfsutils/HISTORY                                    |    7 +++++++
 gnome2-libs/pygobject/DEPENDS                            |    1 +
 gnome2-libs/pygobject/HISTORY                            |    3 +++
 graphics-libs/libpng/DETAILS                             |    8 ++++----
 graphics-libs/libpng/HISTORY                             |    3 +++
 security/shadow/DETAILS                                  |    9 ++++-----
 security/shadow/HISTORY                                  |    8 ++++++++
 security/shadow/PRE_BUILD                                |    5 +++--
 security/shadow/copydir.c.patch                          |   10 ++++++++++
 security/shadow/shadow-4.1.4.3-dup-install-targets.patch |   15 ---------------
 13 files changed, 55 insertions(+), 29 deletions(-)

New commits:
commit 3f28475d4b7000d39aaea23c9322452fffadf4ab
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    VERSION: 0.60-8

commit 560b3f08e89d7390716d02bf105f787c1953a725
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    libpng 1.2.47, SECURITY_PATCH=7, CVE-2011-3026
    (cherry picked from commit c07eecf81bd14574187288cd7dfe98e20bccbcbc)

commit 4af210a7ef8d5d5e0fed7aa16b644b9119dc6e94
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    shadow: upstream patch added
    
    Building on newer systems fails due to using stdargs but not including
    the header file:
    http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2012-February/009119.html
    (cherry picked from commit 1240158cdfa3dfaa6f3c4933f1391ab609834dd7)

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

    shadow: => 4.1.5 (security)
    (cherry picked from commit 75e717957193f8b26e0c5c8eac5d2a6fce675d0e)

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

    pygobject: fixed bug #361
    (cherry picked from commit b8dca3979434c6048c18c0a9ec45c40a5eb3f83d)

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

    jfsutils: moved binaries to /sbin
    (cherry picked from commit 1d00457ee8a077ba5f1af47fca4ed3ab4fefdf6d)

commit 4388f928266d51ac4ec9221c484e5f0673f10db2
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    jfsutils: fixed long description wrap (scripted)
    (cherry picked from commit aabbb87b5c9b389215d12ca627fa3c16358bf9e0)

diff --git a/VERSION b/VERSION
index a5b777a..4411905 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.60-6
+0.60-8
diff --git a/disk/jfsutils/BUILD b/disk/jfsutils/BUILD
new file mode 100755
index 0000000..1c893e8
--- /dev/null
+++ b/disk/jfsutils/BUILD
@@ -0,0 +1,3 @@
+OPTS="--sbindir=$DEFAULT_ROOT/sbin $OPTS" &&
+
+default_build
diff --git a/disk/jfsutils/DETAILS b/disk/jfsutils/DETAILS
index 5e53561..228473e 100755
--- a/disk/jfsutils/DETAILS
+++ b/disk/jfsutils/DETAILS
@@ -1,7 +1,8 @@
            SPELL=jfsutils
          VERSION=1.1.15
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://jfs.sourceforge.net/project/pub/$SOURCE
      SOURCE_HASH=sha512:fa8ba7f4997471da3e6ea7239564f3395046222cfbb2b10e37b24ad0bd107b7eadbb51ce328d89d193034360b4035ca5e0e5b0b416a74483d7a2c0a2b9c65858
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
@@ -11,5 +12,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         KEYWORDS="filesystem disk"
            SHORT="Tools for the JFS filesystem by IBM"
 cat << EOF
-IBM's journaled file system technology, currently used in IBM enterprise servers, is designed for high-throughput server environments, key to running intranet and other high-performance e-business file servers. IBM is contributing this technology to the Linux open source community with the hope that some or all of it will be useful in bringing the best of journaling capabilities to the Linux operating system.
+IBM's journaled file system technology, currently used in IBM enterprise
+servers, is designed for high-throughput server environments, key to
+running intranet and other high-performance e-business file servers. IBM
+is contributing this technology to the Linux open source community with the
+hope that some or all of it will be useful in bringing the best of journaling
+capabilities to the Linux operating system.
 EOF
diff --git a/disk/jfsutils/HISTORY b/disk/jfsutils/HISTORY
index 6733824..1446a9f 100644
--- a/disk/jfsutils/HISTORY
+++ b/disk/jfsutils/HISTORY
@@ -1,3 +1,10 @@
+2012-02-04 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: PATCHLEVEL=1; quoting paths
+	* BUILD: added, all *fsck* stuff must go into /sbin
+
+2011-10-14 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: fixed long description wrap (scripted)
+
 2011-03-11 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.1.15
 
diff --git a/gnome2-libs/pygobject/DEPENDS b/gnome2-libs/pygobject/DEPENDS
index 559fd57..909d1a4 100755
--- a/gnome2-libs/pygobject/DEPENDS
+++ b/gnome2-libs/pygobject/DEPENDS
@@ -1,5 +1,6 @@
 depends python &&
 depends glib2 &&
+depends pycairo &&
 
 optional_depends gobject-introspection      \
                  "--enable-introspection"   \
diff --git a/gnome2-libs/pygobject/HISTORY b/gnome2-libs/pygobject/HISTORY
index 042f516..45aed17 100644
--- a/gnome2-libs/pygobject/HISTORY
+++ b/gnome2-libs/pygobject/HISTORY
@@ -1,3 +1,6 @@
+2012-02-13 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS: added missing pycairo dep (fixes #361)
+
 2011-07-29 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.28.6
 
diff --git a/graphics-libs/libpng/DETAILS b/graphics-libs/libpng/DETAILS
index 936beee..eb855bf 100755
--- a/graphics-libs/libpng/DETAILS
+++ b/graphics-libs/libpng/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libpng
-         VERSION=1.2.46
-     SOURCE_HASH=sha512:57ddc72f3f13987864f80c79617a064e87bcc699c5ea8146b986ff8529067bdc458be647092ad1f7bb68a6dbd14e08fd8906d20ba875c38d556e7f80ff99a885
+         VERSION=1.2.47
+     SOURCE_HASH=sha512:b3a12a50367dac35dd9a15993c8aebf2a88e00a0569fd092d10b6b5b7f15f278aa21da162d73708e2070714261f949719114c4d840018b07ccc303e8d51a174a
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
@@ -8,12 +8,12 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 if [[ $ANI_PNG == y ]]; then
          SOURCE2=$SPELL-$VERSION-apng.patch.gz
   SOURCE2_URL[0]=$SOURCEFORGE_URL/$SPELL-apng/$SOURCE2
-    SOURCE2_HASH=sha512:67dedea610de196282e50e902db9106e820996bb575659ca413e9a886b3996995257c69cea93396864eaa23decf6f5bee6fa44b295e01aeaf135bbddf368b0b2
+    SOURCE2_HASH=sha512:4b3e91253b0a8fa8c004080335109b29486068d62b55bdef8c74214e88a89cd2513ba52ae4c28c89f42cc78eadc90077b385ae77d9ecc812cb531a4af906ae96
 fi
       LICENSE[0]=ZLIB
         WEB_SITE=http://www.libpng.org/pub/png/libpng.html
          ENTERED=20010922
-  SECURITY_PATCH=6
+  SECURITY_PATCH=7
         KEYWORDS="graphics libs"
            SHORT="library that supports the PNG graphics format"
 cat << EOF
diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY
index d91c653..5fd47e4 100644
--- a/graphics-libs/libpng/HISTORY
+++ b/graphics-libs/libpng/HISTORY
@@ -1,3 +1,6 @@
+2012-02-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.2.47, SECURITY_PATCH=7, CVE-2011-3026
+
 2011-09-01 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.2.46
 	  SECURITY_PATCH=6
diff --git a/security/shadow/DETAILS b/security/shadow/DETAILS
index f360ac1..b5eb739 100755
--- a/security/shadow/DETAILS
+++ b/security/shadow/DETAILS
@@ -1,13 +1,12 @@
            SPELL=shadow
-         VERSION=4.1.4.3
-     SOURCE_HASH=sha512:b9707d8bd4a934461898a2474bda8e66a3ec92b450236f0f4a6a13a7337600e816e972de51beed7833f16ba056b90e56af9cd971f90172e440daabce2cc53859
+         VERSION=4.1.5
+     SOURCE_HASH=sha512:c830958bf25f633ac41273acac62a62d755ab8fa4e9d01b9498fe4701890797bf81fef6a8bd5cabbd052ca33a9b8fb20072f40f97dcb9efbbf8ae0e1cccf8df8
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/$SOURCE
+   SOURCE_URL[0]=http://pkg-shadow.alioth.debian.org/releases/$SOURCE
         WEB_SITE=http://pkg-shadow.alioth.debian.org/
          ENTERED=20050303
-      PATCHLEVEL=0
-  SECURITY_PATCH=5
+  SECURITY_PATCH=6
         KEYWORDS="security password"
            SHORT="Shadow password file utilities"
 
diff --git a/security/shadow/HISTORY b/security/shadow/HISTORY
index 23e6e71..1393838 100644
--- a/security/shadow/HISTORY
+++ b/security/shadow/HISTORY
@@ -1,3 +1,11 @@
+2012-02-15 Ladislav Hagara <hgr at vabo.cz>
+	* PRE_BUILD, copydir.c.patch: upstream patch added
+
+2012-02-15 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 4.1.5; SECURITY_PATCH++ (CVE-2005-4890);
+	  renewed SOURCE_URL
+	* PRE_BUILD, shadow-4.1.4.3-dup-install-targets.patch: removed
+
 2011-04-11 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: added gettext optional dependency
 
diff --git a/security/shadow/PRE_BUILD b/security/shadow/PRE_BUILD
index 699ae35..2d7980c 100755
--- a/security/shadow/PRE_BUILD
+++ b/security/shadow/PRE_BUILD
@@ -1,3 +1,4 @@
 default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/shadow-4.1.4.3-dup-install-targets.patch
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p2 < "$SPELL_DIRECTORY/copydir.c.patch"
diff --git a/security/shadow/copydir.c.patch b/security/shadow/copydir.c.patch
new file mode 100644
index 0000000..57fef5f
--- /dev/null
+++ b/security/shadow/copydir.c.patch
@@ -0,0 +1,10 @@
+--- upstream/trunk/libmisc/copydir.c	2011/12/09 22:13:02	3655
++++ upstream/trunk/libmisc/copydir.c	2012/02/13 19:16:29	3706
+@@ -46,6 +46,7 @@
+ #include <selinux/selinux.h>
+ #endif				/* WITH_SELINUX */
+ #if defined(WITH_ACL) || defined(WITH_ATTR)
++#include <stdarg.h>
+ #include <attr/error_context.h>
+ #endif				/* WITH_ACL || WITH_ATTR */
+ #ifdef WITH_ACL
diff --git a/security/shadow/shadow-4.1.4.3-dup-install-targets.patch b/security/shadow/shadow-4.1.4.3-dup-install-targets.patch
deleted file mode 100644
index 6452d17..0000000
--- a/security/shadow/shadow-4.1.4.3-dup-install-targets.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-the Makefile.am manualy adds man_nopam to the install list, and then also
-optionally appends it which leads to the `install` error:
-	... will not overwrite just-created ...
-
---- shadow-4.1.4.3/man/ru/Makefile.in
-+++ shadow-4.1.4.3/man/ru/Makefile.in
-@@ -222,7 +222,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--man_MANS = $(man_nopam) chage.1 chfn.1 chgpasswd.8 chpasswd.8 chsh.1 \
-+man_MANS = chage.1 chfn.1 chgpasswd.8 chpasswd.8 chsh.1 \
- 	expiry.1 faillog.5 faillog.8 getspnam.3 gpasswd.1 groupadd.8 \
- 	groupdel.8 groupmems.8 groupmod.8 groups.1 grpck.8 grpconv.8 \
- 	grpunconv.8 gshadow.5 lastlog.8 login.1 login.defs.5 logoutd.8 \


More information about the SM-Commit mailing list