[SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (53c3d950bd69e83cf7b0f4cd971e6717f7b8d571)

Florian Franzmann scm at sourcemage.org
Sat Mar 31 07:47:27 EDT 2012


GIT changes to master z-rejected grimoire by Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>:

 dev/null                                                     |binary
 z-http/flash/DETAILS                                         |   11 ++++++-----
 z-http/flash/HISTORY                                         |    3 +++
 z-http/flash/flashplayer10_1_rc_linux_040510.tar.gz.sig      |    0 
 z-http/flash/install_flash_player_11_linux.i386.tar.gz.sig   |    0 
 z-http/flash/install_flash_player_11_linux.x86_64.tar.gz.sig |    0 
 z-kernels/nvidia_driver/PRE_BUILD                            |    2 --
 7 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 53c3d950bd69e83cf7b0f4cd971e6717f7b8d571
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    z-http/flash: version 11.2.202.228

commit 475bec19254b921c4ee25165298222a8989da21d
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    z-kernels/nvidia_driver: version 295.33

diff --git a/z-http/flash/DETAILS b/z-http/flash/DETAILS
index 28cbc0c..a6c348b 100755
--- a/z-http/flash/DETAILS
+++ b/z-http/flash/DETAILS
@@ -1,8 +1,8 @@
            SPELL=flash
 if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
-         VERSION=11.1.102.55
+         VERSION=11.2.202.228
           SOURCE=install_flash_player_11_linux.x86_64.tar.gz
-      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+     SOURCE_HASH=abd5a625762de8dd6cd065e8168655a7836a4ab3bef18e8a517e929bcfd5cfb60ff088f66212d3440efc18b114cac33aee16bd089f4db9dc2cb2f939cc00e81c
    SOURCE_URL[0]=http://fpdownload.macromedia.com/get/flashplayer/pdc/$VERSION/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
 else
@@ -12,14 +12,14 @@ else
    SOURCE_URL[0]=http://download.macromedia.com/pub/labs/flashplayer10/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/install_flash_player_10_linux
 else
-         VERSION=11.1.102.63
-  SECURITY_PATCH=20
+         VERSION=11.2.202.228
+  SECURITY_PATCH=21
           SOURCE=install_flash_player_11_linux.i386.tar.gz
    SOURCE_URL[0]=http://fpdownload.macromedia.com/get/flashplayer/pdc/$VERSION/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
   FORCE_DOWNLOAD="on"
  fi
-      SOURCE_GPG=gurus.gpg:$SOURCE.sig
+     SOURCE_HASH=abd5a625762de8dd6cd065e8168655a7836a4ab3bef18e8a517e929bcfd5cfb60ff088f66212d3440efc18b114cac33aee16bd089f4db9dc2cb2f939cc00e81c
 fi
       LICENSE[0]=http://www.macromedia.com/shockwave/download/license/desktop/
      GATHER_DOCS=off
@@ -30,3 +30,4 @@ fi
 cat << EOF
 Macromedia Flash Plugin for web browsers.
 EOF
+abd5a625762de8dd6cd065e8168655a7836a4ab3bef18e8a517e929bcfd5cfb60ff088f66212d3440efc18b114cac33aee16bd089f4db9dc2cb2f939cc00e81c  /var/spool/sorcery/install_flash_player_11_linux.i386.tar.gz
diff --git a/z-http/flash/HISTORY b/z-http/flash/HISTORY
index c41f051..c3cd52a 100644
--- a/z-http/flash/HISTORY
+++ b/z-http/flash/HISTORY
@@ -1,3 +1,6 @@
+2012-03-31 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 11.2.202.228, SECURITY_PATCH=21
+
 2012-03-09 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 11.1.102.63 (i386), SECURITY_PATCH=20
 
diff --git a/z-http/flash/flashplayer10_1_rc_linux_040510.tar.gz.sig b/z-http/flash/flashplayer10_1_rc_linux_040510.tar.gz.sig
deleted file mode 100644
index 0a59ffb..0000000
Binary files a/z-http/flash/flashplayer10_1_rc_linux_040510.tar.gz.sig and /dev/null differ
diff --git a/z-http/flash/install_flash_player_11_linux.i386.tar.gz.sig b/z-http/flash/install_flash_player_11_linux.i386.tar.gz.sig
deleted file mode 100644
index dc4021f..0000000
Binary files a/z-http/flash/install_flash_player_11_linux.i386.tar.gz.sig and /dev/null differ
diff --git a/z-http/flash/install_flash_player_11_linux.x86_64.tar.gz.sig b/z-http/flash/install_flash_player_11_linux.x86_64.tar.gz.sig
deleted file mode 100644
index d1a7f0b..0000000
Binary files a/z-http/flash/install_flash_player_11_linux.x86_64.tar.gz.sig and /dev/null differ
diff --git a/z-kernels/nvidia_driver/PRE_BUILD b/z-kernels/nvidia_driver/PRE_BUILD
index 7860c83..50450ce 100755
--- a/z-kernels/nvidia_driver/PRE_BUILD
+++ b/z-kernels/nvidia_driver/PRE_BUILD
@@ -4,8 +4,6 @@ sh  $SOURCE_CACHE/$SOURCE  --extract-only                     \
                --target $SOURCE_DIRECTORY                     &&
 cd $SOURCE_DIRECTORY                                          &&
 
-sedit 's/CFLAGS="$CFLAGS -I$SOURCES\/arch\/x86\/include"/CFLAGS="$CFLAGS -I$SOURCES\/arch\/x86\/include -I$SOURCES\/arch\/x86\/include\/generated"/' kernel/conftest.sh &&
-
 if [[ $VIA4X == "y" ]]; then
   sedit  "s/NV_DEFINE_REG_ENTRY(__NV_ENABLE_VIA_4X, 0)/NV_DEFINE_REG_ENTRY(__NV_ENABLE_VIA_4X, 1)/" \
       kernel/nv-reg.h


More information about the SM-Commit mailing list