Hello community,

here is the log from the commit of package flash-player for 
openSUSE:Factory:NonFree checked in at 2015-03-16 07:01:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory:NonFree/flash-player (Old)
 and      /work/SRC/openSUSE:Factory:NonFree/.flash-player.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "flash-player"

Changes:
--------
--- /work/SRC/openSUSE:Factory:NonFree/flash-player/flash-player.changes        
2015-02-06 22:38:35.000000000 +0100
+++ /work/SRC/openSUSE:Factory:NonFree/.flash-player.new/flash-player.changes   
2015-03-16 07:01:30.000000000 +0100
@@ -1,0 +2,11 @@
+Thu Mar 12 16:08:11 UTC 2015 - sbra...@suse.com
+
+- Security update to 11.2.202.451 (bsc#922033):
+  * APSB15-05, CVE-2015-0332, CVE-2015-0333, CVE-2015-0334,
+    CVE-2015-0335, CVE-2015-0336, CVE-2015-0337, CVE-2015-0338,
+    CVE-2015-0339, CVE-2015-0340, CVE-2015-0341, CVE-2015-0342
+- Improve update.sh:
+  * format changes
+  * support for reuse of update data in other directory
+
+-------------------------------------------------------------------
@@ -9 +20 @@
-    CVE-2015-0328, CVE-2015-0329, CVE-2015-0330
+    CVE-2015-0328, CVE-2015-0329, CVE-2015-0330, CVE-2015-0331

Old:
----
  flashplayer_11.2.202.442_sa.i386.tar.gz
  install_flash_player_11.2.202.442_linux.i386.tar.gz
  install_flash_player_11.2.202.442_linux.x86_64.tar.gz

New:
----
  flashplayer_11.2.202.451_sa.i386.tar.gz
  install_flash_player_11.2.202.451_linux.i386.tar.gz
  install_flash_player_11.2.202.451_linux.x86_64.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ flash-player.spec ++++++
--- /var/tmp/diff_new_pack.3tHeyE/_old  2015-03-16 07:01:34.000000000 +0100
+++ /var/tmp/diff_new_pack.3tHeyE/_new  2015-03-16 07:01:34.000000000 +0100
@@ -19,7 +19,7 @@
 %define build_standalone 1
 
 Name:           flash-player
-Version:        11.2.202.442
+Version:        11.2.202.451
 Release:        0
 Summary:        Adobe Flash Plugin and Standalone Player
 License:        SUSE-NonFree


++++++ flashplayer_11.2.202.442_sa.i386.tar.gz -> 
flashplayer_11.2.202.451_sa.i386.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/LGPL/LGPL.txt new/LGPL/LGPL.txt
--- old/LGPL/LGPL.txt   1970-01-01 01:00:00.000000000 +0100
+++ new/LGPL/LGPL.txt   2015-03-04 01:34:42.000000000 +0100
@@ -0,0 +1,65 @@
+GNU LESSER GENERAL PUBLIC LICENSE
+
+Version 3, 29 June 2007
+
+Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this license 
document, but changing it is not allowed.
+
+This version of the GNU Lesser General Public License incorporates the terms 
and conditions of version 3 of the GNU General Public License, supplemented by 
the additional permissions listed below.
+0. Additional Definitions.
+
+As used herein, "this License" refers to version 3 of the GNU Lesser General 
Public License, and the "GNU GPL" refers to version 3 of the GNU General Public 
License.
+
+"The Library" refers to a covered work governed by this License, other than an 
Application or a Combined Work as defined below.
+
+An "Application" is any work that makes use of an interface provided by the 
Library, but which is not otherwise based on the Library. Defining a subclass 
of a class defined by the Library is deemed a mode of using an interface 
provided by the Library.
+
+A "Combined Work" is a work produced by combining or linking an Application 
with the Library. The particular version of the Library with which the Combined 
Work was made is also called the "Linked Version".
+
+The "Minimal Corresponding Source" for a Combined Work means the Corresponding 
Source for the Combined Work, excluding any source code for portions of the 
Combined Work that, considered in isolation, are based on the Application, and 
not on the Linked Version.
+
+The "Corresponding Application Code" for a Combined Work means the object code 
and/or source code for the Application, including any data and utility programs 
needed for reproducing the Combined Work from the Application, but excluding 
the System Libraries of the Combined Work.
+1. Exception to Section 3 of the GNU GPL.
+
+You may convey a covered work under sections 3 and 4 of this License without 
being bound by section 3 of the GNU GPL.
+2. Conveying Modified Versions.
+
+If you modify a copy of the Library, and, in your modifications, a facility 
refers to a function or data to be supplied by an Application that uses the 
facility (other than as an argument passed when the facility is invoked), then 
you may convey a copy of the modified version:
+
+    a) under this License, provided that you make a good faith effort to 
ensure that, in the event an Application does not supply the function or data, 
the facility still operates, and performs whatever part of its purpose remains 
meaningful, or
+    b) under the GNU GPL, with none of the additional permissions of this 
License applicable to that copy.
+
+3. Object Code Incorporating Material from Library Header Files.
+
+The object code form of an Application may incorporate material from a header 
file that is part of the Library. You may convey such object code under terms 
of your choice, provided that, if the incorporated material is not limited to 
numerical parameters, data structure layouts and accessors, or small macros, 
inline functions and templates (ten or fewer lines in length), you do both of 
the following:
+
+    a) Give prominent notice with each copy of the object code that the 
Library is used in it and that the Library and its use are covered by this 
License.
+    b) Accompany the object code with a copy of the GNU GPL and this license 
document.
+
+4. Combined Works.
+
+You may convey a Combined Work under terms of your choice that, taken 
together, effectively do not restrict modification of the portions of the 
Library contained in the Combined Work and reverse engineering for debugging 
such modifications, if you also do each of the following:
+
+    a) Give prominent notice with each copy of the Combined Work that the 
Library is used in it and that the Library and its use are covered by this 
License.
+    b) Accompany the Combined Work with a copy of the GNU GPL and this license 
document.
+    c) For a Combined Work that displays copyright notices during execution, 
include the copyright notice for the Library among these notices, as well as a 
reference directing the user to the copies of the GNU GPL and this license 
document.
+    d) Do one of the following:
+        0) Convey the Minimal Corresponding Source under the terms of this 
License, and the Corresponding Application Code in a form suitable for, and 
under terms that permit, the user to recombine or relink the Application with a 
modified version of the Linked Version to produce a modified Combined Work, in 
the manner specified by section 6 of the GNU GPL for conveying Corresponding 
Source.
+        1) Use a suitable shared library mechanism for linking with the 
Library. A suitable mechanism is one that (a) uses at run time a copy of the 
Library already present on the user's computer system, and (b) will operate 
properly with a modified version of the Library that is interface-compatible 
with the Linked Version.
+    e) Provide Installation Information, but only if you would otherwise be 
required to provide such information under section 6 of the GNU GPL, and only 
to the extent that such information is necessary to install and execute a 
modified version of the Combined Work produced by recombining or relinking the 
Application with a modified version of the Linked Version. (If you use option 
4d0, the Installation Information must accompany the Minimal Corresponding 
Source and Corresponding Application Code. If you use option 4d1, you must 
provide the Installation Information in the manner specified by section 6 of 
the GNU GPL for conveying Corresponding Source.)
+
+5. Combined Libraries.
+
+You may place library facilities that are a work based on the Library side by 
side in a single library together with other library facilities that are not 
Applications and are not covered by this License, and convey such a combined 
library under terms of your choice, if you do both of the following:
+
+    a) Accompany the combined library with a copy of the same work based on 
the Library, uncombined with any other library facilities, conveyed under the 
terms of this License.
+    b) Give prominent notice with the combined library that part of it is a 
work based on the Library, and explaining where to find the accompanying 
uncombined form of the same work.
+
+6. Revised Versions of the GNU Lesser General Public License.
+
+The Free Software Foundation may publish revised and/or new versions of the 
GNU Lesser General Public License from time to time. Such new versions will be 
similar in spirit to the present version, but may differ in detail to address 
new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library as you 
received it specifies that a certain numbered version of the GNU Lesser General 
Public License "or any later version" applies to it, you have the option of 
following the terms and conditions either of that published version or of any 
later version published by the Free Software Foundation. If the Library as you 
received it does not specify a version number of the GNU Lesser General Public 
License, you may choose any version of the GNU Lesser General Public License 
ever published by the Free Software Foundation.
+
+If the Library as you received it specifies that a proxy can decide whether 
future versions of the GNU Lesser General Public License shall apply, that 
proxy's public statement of acceptance of any version is permanent 
authorization for you to choose that version for the Library.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/LGPL/notice.txt new/LGPL/notice.txt
--- old/LGPL/notice.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/LGPL/notice.txt 2015-03-04 01:34:42.000000000 +0100
@@ -0,0 +1 @@
+This product links to certain Linux system libraries licensed under LGPL.
\ No newline at end of file
Files old/flashplayer and new/flashplayer differ

++++++ install_flash_player_11.2.202.442_linux.i386.tar.gz -> 
install_flash_player_11.2.202.451_linux.i386.tar.gz ++++++
/work/SRC/openSUSE:Factory:NonFree/flash-player/install_flash_player_11.2.202.442_linux.i386.tar.gz
 
/work/SRC/openSUSE:Factory:NonFree/.flash-player.new/install_flash_player_11.2.202.451_linux.i386.tar.gz
 differ: char 5, line 1

++++++ install_flash_player_11.2.202.442_linux.x86_64.tar.gz -> 
install_flash_player_11.2.202.451_linux.x86_64.tar.gz ++++++
/work/SRC/openSUSE:Factory:NonFree/flash-player/install_flash_player_11.2.202.442_linux.x86_64.tar.gz
 
/work/SRC/openSUSE:Factory:NonFree/.flash-player.new/install_flash_player_11.2.202.451_linux.x86_64.tar.gz
 differ: char 5, line 1

++++++ update.sh ++++++
--- /var/tmp/diff_new_pack.3tHeyE/_old  2015-03-16 07:01:34.000000000 +0100
+++ /var/tmp/diff_new_pack.3tHeyE/_new  2015-03-16 07:01:34.000000000 +0100
@@ -1,18 +1,42 @@
 #!/bin/bash
 # vim: sw=4 et
 
-t=$(mktemp  -d XXXXXXX)
+# If you want to update more than one repository at once, set
+# FLASH_PLAYER_UPDATE_COMMON_DESC variable to a place in writable
+# directory. If the file exists, it will be used, otherwise it will be
+# created.
+if test -n "$FLASH_PLAYER_UPDATE_COMMON_DESC" ; then
+       if test -f "$FLASH_PLAYER_UPDATE_COMMON_DESC" ; then
+               . $FLASH_PLAYER_UPDATE_COMMON_DESC
+       else
+               echo -n >$FLASH_PLAYER_UPDATE_COMMON_DESC
+       fi
+fi
+
+function cache_set() {
+if test -n "$FLASH_PLAYER_UPDATE_COMMON_DESC" ; then
+    echo >>$FLASH_PLAYER_UPDATE_COMMON_DESC "$1=\"$2\""
+fi
+}
 
 set -e
 
-pushd $t &>/dev/null
+if test -z "$UPDATE_EXISTS" ; then
+    # Unknown status of UPDATE_EXISTS means no FLASH_PLAYER_UPDATE_COMMON_DESC
 
+    t=$(mktemp  -d XXXXXXX)
 
-    tar xf ../install_flash_player_11*_linux.i386.tar.gz libflashplayer.so
+    mkdir ORIG_FLASH_SAVE
+    mv *.tar.gz ORIG_FLASH_SAVE
+    pushd $t &>/dev/null
+
+    UPDATE_EXISTS=false
+
+    tar xf ../ORIG_FLASH_SAVE/install_flash_player_11*_linux.i386.tar.gz 
libflashplayer.so
     md5sum libflashplayer.so > ORIG_FLASH
     rm libflashplayer.so
     # fetch the current download url
-    download_url=$(curl -s 
'http://get.adobe.com/flashplayer/download/?installer=Flash_Player_11.2_for_other_Linux_%28.tar.gz%29_32-bit&standalone=1'
 | egrep  -o 
'http:\/\/fpdownload.macromedia.com\/get\/flashplayer\/pdc\/11.*\/install_flash_player_11_linux.i386.tar.gz')
+    download_url=$(curl -s 
'http://get.adobe.com/flashplayer/download/?installer=Flash_Player_11.2_for_other_Linux_%28.tar.gz%29_32-bit&standalone=1'
 | egrep  -o 
'https*:\/\/fpdownload.macromedia.com\/get\/flashplayer\/pdc\/11.*\/install_flash_player_11_linux.i386.tar.gz')
     echo "Trying download $download_url";
     wget $download_url
     tar xf install_flash_player_11_linux.i386.tar.gz libflashplayer.so
@@ -24,32 +48,32 @@
 
     else
         echo "*** NEW flashplugin UPDATE AVAILABLE!"
-        version=$(strings libflashplayer.so | grep "LNX 11," | cut -d' ' -f2 | 
sed -e 's#,#.#g')
-        echo "new version is $version"
+        VERSION=$(strings libflashplayer.so | grep "LNX 11," | cut -d' ' -f2 | 
sed -e 's#,#.#g')
+        echo "new version is $VERSION"
         download_url=$(echo $download_url | sed -e 's,i386,ARCH,')
 
         for arch in i386 x86_64; do
             wget -q $(echo $download_url | sed -e "s,ARCH,$arch,")
-            mv install_flash_player_11_linux.$arch.tar.gz 
install_flash_player_${version}_linux.$arch.tar.gz
-            mv install_flash_player_${version}_linux.$arch.tar.gz ..
+            mv install_flash_player_11_linux.$arch.tar.gz 
install_flash_player_${VERSION}_linux.$arch.tar.gz
+            mv install_flash_player_${VERSION}_linux.$arch.tar.gz ..
+           cache_set UPDATE_EXISTS "true"
+           cache_set VERSION "$VERSION"
+           cache_set INSTALL_FLASH_PLAYER_FILENAME_$arch 
install_flash_player_${VERSION}_linux.$arch.tar.gz
         done
-        sed -i -e "s,Version:.*,Version:        $version," ../flash-player.spec
-        ( cd ..; 
-        osc vc -m "Security update to $version (bsc#XXXXXX):"
-        )
+        UPDATE_EXISTS=true
     fi
 
     for arch in i386; do
-       if tar tf ../flashplayer_*_sa.$arch.tar.gz | grep -q -F 
install_flash_player_linux_sa/flashplayer ; then
-            tar xf ../flashplayer_*_sa.$arch.tar.gz 
install_flash_player_linux_sa/flashplayer
+       if tar tf ../ORIG_FLASH_SAVE/flashplayer_*_sa.$arch.tar.gz | grep -q -F 
install_flash_player_linux_sa/flashplayer ; then
+            tar xf ../ORIG_FLASH_SAVE/flashplayer_*_sa.$arch.tar.gz 
install_flash_player_linux_sa/flashplayer
             md5sum install_flash_player_linux_sa/flashplayer > ORIG_FLASH
             rm -r install_flash_player_linux_sa
         else
-            tar xf ../flashplayer_*_sa.$arch.tar.gz flashplayer
+            tar xf ../ORIG_FLASH_SAVE/flashplayer_*_sa.$arch.tar.gz flashplayer
             md5sum flashplayer > ORIG_FLASH
             rm flashplayer
         fi
-        wget 
http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_sa.$arch.tar.gz
+        wget 
https://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_sa.$arch.tar.gz
         if tar xvf flashplayer_11_sa.$arch.tar.gz | grep -q -F 
install_flash_player_linux_sa/flashplayer ; then
             md5sum install_flash_player_linux_sa/flashplayer > NEW_FLASH
        else
@@ -60,18 +84,86 @@
 
             echo "no new update available"
 
+           if $UPDATE_EXISTS ; then
+               "UPDATE WARNING: Update of install_flash_player exists but 
update of flashplayer does not."
+               "UPDATE WARNING: You have to edit spec file manually!"
+           fi
         else
             echo "*** NEW flashplayer UPDATE AVAILABLE!"
             if test -f install_flash_player_linux_sa/flashplayer ; then
-                version=$(strings install_flash_player_linux_sa/flashplayer | 
grep "LNX 11," | cut -d' ' -f2 | sed -e 's#,#.#g')
+                VERSION=$(strings install_flash_player_linux_sa/flashplayer | 
grep "LNX 11," | cut -d' ' -f2 | sed -e 's#,#.#g')
             else
-                version=$(strings flashplayer | grep "LNX 11," | cut -d' ' -f2 
| sed -e 's#,#.#g')
+                VERSION=$(strings flashplayer | grep "LNX 11," | cut -d' ' -f2 
| sed -e 's#,#.#g')
             fi
-            echo "new version is $version"
-            mv flashplayer_11_sa.$arch.tar.gz 
flashplayer_${version}_sa.$arch.tar.gz
-            mv flashplayer_${version}_sa.$arch.tar.gz ..
+            echo "new version is $VERSION"
+            mv flashplayer_11_sa.$arch.tar.gz 
flashplayer_${VERSION}_sa.$arch.tar.gz
+            mv flashplayer_${VERSION}_sa.$arch.tar.gz ..
+           cache_set FLASH_PLAYER_FILENAME_$arch 
flashplayer_${VERSION}_sa.$arch.tar.gz
         fi
     done
 
-popd &>/dev/null
-rm -rf $t
+    cd ..
+    popd &>/dev/null
+    rm -rf $t
+
+    cache_set FLASH_PLAYER_DIRNAME $PWD
+    if $UPDATE_EXISTS ; then
+       rm -r ORIG_FLASH_SAVE
+    else
+       cache_set UPDATE_EXISTS false
+       mv ORIG_FLASH_SAVE/* .
+       rmdir ORIG_FLASH_SAVE
+       exit 2
+    fi
+
+    # Create changelog entry.
+    echo -n "Please enter BSC# (number only${BSC:+, press Enter for 
\"$BSC\"}): "
+    read BSC
+    if test -z "$BSC" ; then
+       echo >&2 "BSC is empty!"
+       exit 1
+    fi
+    cache_set BSC "$BSC"
+
+    echo -n "Please enter Adobe Vulnerability identifier (including 
APSA/APSB): "
+    read APSA
+    if test -z "$APSA" ; then
+       echo >&2 "APSA is empty!"
+    fi
+    cache_set APSA "$APSA"
+
+    echo -n "Please enter list of CVE (\", \" separated): "
+    read CVE
+    if test -z "$CVE" ; then
+       echo >&2 "CVE is empty!"
+       exit 1
+    fi
+    cache_set CVE "$CVE"
+
+    osc vc -m "Security update to $VERSION (bsc#$BSC):
+  * $(echo "    $APSA, $CVE" | fmt -w 67 | tail -c +5)"
+
+else # Update was already done in another repository.
+
+    if $UPDATE_EXISTS ; then
+       # ./update.sh was already called in another directory. Reuse its output.
+
+       rm *.tar.gz
+       cp -a $FLASH_PLAYER_DIRNAME/$INSTALL_FLASH_PLAYER_FILENAME_i386 .
+       cp -a $FLASH_PLAYER_DIRNAME/$INSTALL_FLASH_PLAYER_FILENAME_x86_64 .
+       cp -a $FLASH_PLAYER_DIRNAME/$FLASH_PLAYER_FILENAME_i386 .
+
+       sed -n '1p;1,/^-----/{/^-----/d;p}' 
<$FLASH_PLAYER_DIRNAME/flash-player.changes >flash-player.changes.add
+       cat flash-player.changes.add flash-player.changes 
>flash-player.changes.new
+       mv flash-player.changes.new flash-player.changes
+       rm flash-player.changes.add
+    else
+       exit 2
+    fi
+fi
+
+sed -i -e "s,Version:.*,Version:        $VERSION," flash-player.spec
+
+osc addremove
+
+echo "Done. Please call \"osc ci\"."

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to