Hello community,

here is the log from the commit of package rocksndiamonds for openSUSE:Factory 
checked in at 2018-07-28 12:43:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rocksndiamonds (Old)
 and      /work/SRC/openSUSE:Factory/.rocksndiamonds.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "rocksndiamonds"

Sat Jul 28 12:43:46 2018 rev:29 rq:625695 version:4.1.0.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/rocksndiamonds/rocksndiamonds.changes    
2017-04-11 09:45:10.916921997 +0200
+++ /work/SRC/openSUSE:Factory/.rocksndiamonds.new/rocksndiamonds.changes       
2018-07-28 12:43:55.548828978 +0200
@@ -1,0 +2,8 @@
+Mon Jul 23 07:37:55 UTC 2018 - [email protected]
+
+- Update to version 4.1.0.0
+  - Drop upstreamed reproducible.patch
+  - Rebase half-upstreamed 
rocksndiamonds-3.3.1.2-src_libgame_setup.c-CVE-2011-4606.patch
+  - many fixes and improvements
+
+-------------------------------------------------------------------
@@ -372 +380 @@
-       - added Boulder Dash style "snap-pushing" (thanks to Achim H�rtel)
+       - added Boulder Dash style "snap-pushing" (thanks to Achim Haertel)
@@ -493 +501 @@
-  Anpassungen im Makefile, zus�tzliche defines angelegt
+  Anpassungen im Makefile, zusaetzliche defines angelegt

Old:
----
  reproducible.patch
  rocksndiamonds-3.3.1.2.tar.gz

New:
----
  rocksndiamonds-4.1.0.0.tar.gz

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

Other differences:
------------------
++++++ rocksndiamonds.spec ++++++
--- /var/tmp/diff_new_pack.0K6jLk/_old  2018-07-28 12:43:56.328830394 +0200
+++ /var/tmp/diff_new_pack.0K6jLk/_new  2018-07-28 12:43:56.328830394 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           rocksndiamonds
-Version:        3.3.1.2
+Version:        4.1.0.0
 Release:        0
 Summary:        Colorful Boulderdash'n'Emerald Mine'n'Sokoban'n'Stuff
 License:        GPL-2.0+
@@ -27,9 +27,7 @@
 Source1:        %{name}-icons.tar
 Source2:        %{name}.desktop
 # PATCH-FIX-UPSTREAM Permissions
-Patch0:         %{name}-%{version}-src_libgame_setup.c-CVE-2011-4606.patch
-# PATCH-FIX-OPENSUSE bmwiedemann -- fix build-compare
-Patch1:         reproducible.patch
+Patch0:         %{name}-3.3.1.2-src_libgame_setup.c-CVE-2011-4606.patch
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  pkgconfig(SDL_image)
@@ -56,8 +54,7 @@
 
 %prep
 %setup -q -b 1
-%patch0
-%patch1 -p1
+%patch0 -p1
 
 # Remove not needed files
 find levels -name '*.orig' -delete
@@ -74,7 +71,6 @@
 %install
 # install executable
 install -Dm 0755 %{name} %{buildroot}%{_bindir}/%{name}
-install -Dm 0644 %{name}.1 %{buildroot}%{_mandir}/man6/%{name}.6
 
 # install directories
 mkdir -p %{buildroot}%{_datadir}/%{name}/{graphics,levels,music,sounds}
@@ -105,9 +101,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING CREDITS ChangeLog README
+%doc COPYING CREDITS ChangeLog
 %{_bindir}/%{name}
-%{_mandir}/man6/%{name}.6%{ext_man}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/
 %{_datadir}/%{name}

++++++ rocksndiamonds-3.3.1.2-src_libgame_setup.c-CVE-2011-4606.patch ++++++
--- /var/tmp/diff_new_pack.0K6jLk/_old  2018-07-28 12:43:56.344830423 +0200
+++ /var/tmp/diff_new_pack.0K6jLk/_new  2018-07-28 12:43:56.344830423 +0200
@@ -1,6 +1,8 @@
---- src/libgame/setup.c.orig   2013-11-13 01:13:27.000000000 +0100
-+++ src/libgame/setup.c        2014-10-02 23:47:07.762894564 +0200
-@@ -1290,11 +1290,14 @@
+Index: rocksndiamonds-4.1.0.0/src/libgame/setup.c
+===================================================================
+--- rocksndiamonds-4.1.0.0.orig/src/libgame/setup.c
++++ rocksndiamonds-4.1.0.0/src/libgame/setup.c
+@@ -1380,11 +1380,14 @@ void sortTreeInfo(TreeInfo **node_first)
  #define MODE_W_ALL            (S_IWUSR | S_IWGRP | S_IWOTH)
  #define MODE_X_ALL            (S_IXUSR | S_IXGRP | S_IXOTH)
  
@@ -8,21 +10,11 @@
  #define MODE_W_PRIVATE                (S_IWUSR)
 +#define MODE_X_PRIVATE                (S_IXUSR)
 +
- #define MODE_W_PUBLIC         (S_IWUSR | S_IWGRP)
+ #define MODE_W_PUBLIC_FILE    (S_IWUSR | S_IWGRP)
  #define MODE_W_PUBLIC_DIR     (S_IWUSR | S_IWGRP | S_ISGID)
  
 -#define DIR_PERMS_PRIVATE     (MODE_R_ALL | MODE_X_ALL | MODE_W_PRIVATE)
 +#define DIR_PERMS_PRIVATE     (MODE_R_PRIVATE | MODE_X_PRIVATE | 
MODE_W_PRIVATE)
  #define DIR_PERMS_PUBLIC      (MODE_R_ALL | MODE_X_ALL | MODE_W_PUBLIC_DIR)
+ #define DIR_PERMS_PUBLIC_ALL  (MODE_R_ALL | MODE_X_ALL | MODE_W_ALL)
  
- #define FILE_PERMS_PRIVATE    (MODE_R_ALL | MODE_W_PRIVATE)
-@@ -1453,7 +1456,8 @@
-   if (running_setgid)
-     posix_umask(last_umask & group_umask);
-   else
--    dir_mode |= MODE_W_ALL;
-+    if (permission_class == PERMS_PUBLIC)
-+      dir_mode |= MODE_W_ALL;
- 
-   if (!fileExists(dir))
-     if (posix_mkdir(dir, dir_mode) != 0)

++++++ rocksndiamonds-3.3.1.2.tar.gz -> rocksndiamonds-4.1.0.0.tar.gz ++++++
++++ 112744 lines of diff (skipped)


Reply via email to