[Pkg-fglrx-devel] r1591 - in fglrx-driver/branches/15.9-jessie-backports: . debian debian/patches

Andreas Beckmann anbe at moszumanska.debian.org
Fri Jan 29 22:21:01 UTC 2016 

Author: anbe
Date: 2016-01-29 22:21:01 +0000 (Fri, 29 Jan 2016)
New Revision: 1591

Added:
   fglrx-driver/branches/15.9-jessie-backports/debian/patches/12-4.3.0-build.patch
Modified:
   fglrx-driver/branches/15.9-jessie-backports/
   fglrx-driver/branches/15.9-jessie-backports/debian/amd-opencl-icd.lintian-overrides
   fglrx-driver/branches/15.9-jessie-backports/debian/changelog
   fglrx-driver/branches/15.9-jessie-backports/debian/control
   fglrx-driver/branches/15.9-jessie-backports/debian/fglrx-atieventsd.fglrx-atieventsd.init
   fglrx-driver/branches/15.9-jessie-backports/debian/libgl1-fglrx-glx.lintian-overrides
   fglrx-driver/branches/15.9-jessie-backports/debian/patches/series
   fglrx-driver/branches/15.9-jessie-backports/debian/rules
   fglrx-driver/branches/15.9-jessie-backports/debian/rules.defs
Log:
merge 1:15.9-3


Property changes on: fglrx-driver/branches/15.9-jessie-backports
___________________________________________________________________
Added: svn:mergeinfo
   + /fglrx-driver/trunk:1531-1551

Modified: fglrx-driver/branches/15.9-jessie-backports/debian/amd-opencl-icd.lintian-overrides
===================================================================
--- fglrx-driver/branches/15.9-jessie-backports/debian/amd-opencl-icd.lintian-overrides	2016-01-29 22:05:36 UTC (rev 1590)
+++ fglrx-driver/branches/15.9-jessie-backports/debian/amd-opencl-icd.lintian-overrides	2016-01-29 22:21:01 UTC (rev 1591)
@@ -3,9 +3,12 @@
 hardening-no-fortify-functions
 hardening-no-relro
 sharedobject-in-library-directory-missing-soname
+[i386]: spelling-error-in-binary usr/lib*/libamdocl12cl32.so ment meant
+[i386]: spelling-error-in-binary usr/lib*/libamdocl12cl32.so nam name
 [i386]: spelling-error-in-binary usr/lib*/libamdocl32.so ment meant
 [i386]: spelling-error-in-binary usr/lib*/libamdocl32.so nam name
-[i386]: spelling-error-in-binary usr/lib/*/libamdocl32.so treshold threshold
+[i386]: spelling-error-in-binary usr/lib*/libamdocl32.so treshold threshold
+[amd64]: spelling-error-in-binary usr/lib*/libamdocl12cl64.so ment meant
 [amd64]: spelling-error-in-binary usr/lib*/libamdocl64.so ment meant
-[amd64]: spelling-error-in-binary usr/lib/*/libamdocl64.so treshold threshold
-[amd64]: spelling-error-in-binary usr/lib/*/libamdocl64.so Nam Name
+[amd64]: spelling-error-in-binary usr/lib*/libamdocl64.so Nam Name
+[amd64]: spelling-error-in-binary usr/lib*/libamdocl64.so treshold threshold

Modified: fglrx-driver/branches/15.9-jessie-backports/debian/changelog
===================================================================
--- fglrx-driver/branches/15.9-jessie-backports/debian/changelog	2016-01-29 22:05:36 UTC (rev 1590)
+++ fglrx-driver/branches/15.9-jessie-backports/debian/changelog	2016-01-29 22:21:01 UTC (rev 1591)
@@ -1,3 +1,18 @@
+fglrx-driver (1:15.9-3) unstable; urgency=high
+
+  [ Andreas Beckmann ]
+  * d/rules: Move tar option --no-recursion before the list of files.
+  * fglrx-atieventsd.init: Fix 'stop' and implement 'status', thanks to
+    D. Leggett.  (Closes: #803494)
+  * Reinstate breaks between fglrx-driver and libgl1-fglrx-glx.
+  * Update lintian overrides.
+
+  [ Patrick Matthäi ]
+  * Add Ubuntu patch 12-4.3.0-build.
+    Closes: #807965
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 31 Dec 2015 11:16:59 +0100
+
 fglrx-driver (1:15.9-2~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
@@ -14,6 +29,7 @@
 
   [ Andreas Beckmann ]
   * New upstream release 15.9 (2015-09-15) (15.201.1151).  (Closes: #799439)
+  * Fixes CVE-2015-7724.  (Closes: #803517)
   * Use signature from 15.7.
   * Update watch file.
   * Update lintian overrides.
@@ -71,6 +87,7 @@
     - Rewrite patch 05-4.0.0-build.
     - Xorg 1.17 is supported now.
       Closes: #784903
+  * Fixes CVE-2015-7723.
   * Use signature from upstream package.
   * Remove breaks between fglrx-driver and libgl1-fglrx-glx, since it confuses
     dpkg.

Modified: fglrx-driver/branches/15.9-jessie-backports/debian/control
===================================================================
--- fglrx-driver/branches/15.9-jessie-backports/debian/control	2016-01-29 22:05:36 UTC (rev 1590)
+++ fglrx-driver/branches/15.9-jessie-backports/debian/control	2016-01-29 22:21:01 UTC (rev 1591)
@@ -46,13 +46,15 @@
  ${fglrx}-atieventsd,
 Suggests:
  ${fglrx}-control,
- xvba-va-driver,
+ lib${fglrx}-amdxvba1,
  amd-opencl-icd${fglrx:Variant},
 Provides:
  xorg-driver-video,
  xserver-xorg-video-fglrx,
 Conflicts:
  xserver-xorg-video-fglrx,
+Breaks:
+ libgl1-${fglrx}-glx (<< ${binary:Version}),
 Replaces:
  xserver-xorg-video-fglrx,
 Description: non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
@@ -155,6 +157,7 @@
  fglrx-glx,
  fglrx-glx-ia32,
 Breaks:
+ ${fglrx}-driver (<< ${binary:Version}),
  ia32-libs (<< 1:0),
 Replaces:
  libgl1-fglrx-glx-virtual,

Modified: fglrx-driver/branches/15.9-jessie-backports/debian/fglrx-atieventsd.fglrx-atieventsd.init
===================================================================
--- fglrx-driver/branches/15.9-jessie-backports/debian/fglrx-atieventsd.fglrx-atieventsd.init	2016-01-29 22:05:36 UTC (rev 1590)
+++ fglrx-driver/branches/15.9-jessie-backports/debian/fglrx-atieventsd.fglrx-atieventsd.init	2016-01-29 22:21:01 UTC (rev 1591)
@@ -50,14 +50,13 @@
 			exit 0
 		fi
         log_daemon_msg "Starting $DESC" "$DAEMONNAME"
-        start-stop-daemon --start --name $DAEMONNAME --oknodo \
-            --quiet --exec $DAEMONPATH -- $DAEMONOPTS
+        start-stop-daemon --quiet --start --name $DAEMONNAME --exec $DAEMONPATH --oknodo -- $DAEMONOPTS
 	log_end_msg $?
         ;;
 
     stop)
         log_daemon_msg "Stopping $DESC" "$DAEMONNAME"
-        start-stop-daemon --quiet --stop --exec $DAEMONPATH --oknodo
+        start-stop-daemon --quiet --stop --name $DAEMONNAME --exec $DAEMONPATH --oknodo
 	log_end_msg $?
         ;;
 
@@ -66,9 +65,11 @@
         sleep 1
         $0 start
         ;;
+
     status)
-		exit 4
-		;;
+        status_of_proc $DAEMONPATH atieventsd && exit 0 || exit $?
+        ;;
+
     *)
         echo "$0 {start|stop|restart|force-reload|status}"
         exit 3

Modified: fglrx-driver/branches/15.9-jessie-backports/debian/libgl1-fglrx-glx.lintian-overrides
===================================================================
--- fglrx-driver/branches/15.9-jessie-backports/debian/libgl1-fglrx-glx.lintian-overrides	2016-01-29 22:05:36 UTC (rev 1590)
+++ fglrx-driver/branches/15.9-jessie-backports/debian/libgl1-fglrx-glx.lintian-overrides	2016-01-29 22:21:01 UTC (rev 1591)
@@ -5,5 +5,4 @@
 shlib-calls-exit usr/lib*/fglrx/fglrx-libGL.so.1.2
 [i386]: shlib-with-non-pic-code usr/lib*/fglrx/fglrx-libGL.so.1.2
 shlibs-declares-dependency-on-other-package libgl1-mesa-glx | libgl1
-postrm-has-useless-call-to-ldconfig
 postinst-has-useless-call-to-ldconfig

Copied: fglrx-driver/branches/15.9-jessie-backports/debian/patches/12-4.3.0-build.patch (from rev 1551, fglrx-driver/trunk/debian/patches/12-4.3.0-build.patch)
===================================================================
--- fglrx-driver/branches/15.9-jessie-backports/debian/patches/12-4.3.0-build.patch	                        (rev 0)
+++ fglrx-driver/branches/15.9-jessie-backports/debian/patches/12-4.3.0-build.patch	2016-01-29 22:21:01 UTC (rev 1591)
@@ -0,0 +1,45 @@
+From 62071ebe1c86ff439ed0bc4b6bdd4f6f9f2737fa Mon Sep 17 00:00:00 2001
+From: Alberto Milone <alberto.milone at canonical.com>
+Date: Mon, 16 Nov 2015 11:34:16 +0100
+Subject: [PATCH 1/1] Add support for Linux 4.3
+
+diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-12-31 11:12:34.000000000 +0100
++++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-12-31 11:14:25.485800244 +0100
+@@ -636,7 +636,11 @@
+ 
+     len = snprintf(buf, request, "%d\n", major);
+ #else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+     len = seq_printf(m, "%d\n", major);
++#else
++    seq_printf(m, "%d\n", major);
++#endif
+ #endif
+ 
+     KCL_DEBUG1(FN_FIREGL_PROC, "return len=%i\n",len);
+@@ -3440,7 +3444,11 @@
+ int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size)
+ {
+ #ifdef CONFIG_MTRR
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+     return mtrr_add(base, size, MTRR_TYPE_WRCOMB, 1);
++#else
++    return arch_phys_wc_add(base, size);
++#endif
+ #else /* !CONFIG_MTRR */
+     return -EPERM;
+ #endif /* !CONFIG_MTRR */
+@@ -3449,7 +3457,12 @@
+ int ATI_API_CALL KCL_MEM_MTRR_DeleteRegion(int reg, unsigned long base, unsigned long size)
+ {
+ #ifdef CONFIG_MTRR
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+     return mtrr_del(reg, base, size);
++#else
++    arch_phys_wc_del(reg);
++    return reg;
++#endif
+ #else /* !CONFIG_MTRR */
+     return -EPERM;
+ #endif /* !CONFIG_MTRR */

Modified: fglrx-driver/branches/15.9-jessie-backports/debian/patches/series
===================================================================
--- fglrx-driver/branches/15.9-jessie-backports/debian/patches/series	2016-01-29 22:05:36 UTC (rev 1590)
+++ fglrx-driver/branches/15.9-jessie-backports/debian/patches/series	2016-01-29 22:21:01 UTC (rev 1591)
@@ -8,3 +8,4 @@
 09-4.2.0-build.fpregs_active.patch
 10-4.2.0-build.copy_xregs_to_kernel.patch
 11-4.1.0-gpl-only.patch
+12-4.3.0-build.patch

Modified: fglrx-driver/branches/15.9-jessie-backports/debian/rules
===================================================================
--- fglrx-driver/branches/15.9-jessie-backports/debian/rules	2016-01-29 22:05:36 UTC (rev 1590)
+++ fglrx-driver/branches/15.9-jessie-backports/debian/rules	2016-01-29 22:21:01 UTC (rev 1591)
@@ -149,7 +149,7 @@
 	    tar cfj debian/$(fglrx)-source/usr/src/$(fglrx).tar.bz2 \
 		--owner=root --group=src \
 		--directory debian/$(fglrx)-source/usr/src/ \
-		--null -T - --no-recursion
+		--no-recursion --null -T -
 	$(RM) -r debian/$(fglrx)-source/usr/src/modules
 	mv debian/$(fglrx)-control/usr/sbin/atigetsysteminfo.sh \
 		debian/$(fglrx)-control/usr/sbin/atigetsysteminfo

Modified: fglrx-driver/branches/15.9-jessie-backports/debian/rules.defs
===================================================================
--- fglrx-driver/branches/15.9-jessie-backports/debian/rules.defs	2016-01-29 22:05:36 UTC (rev 1590)
+++ fglrx-driver/branches/15.9-jessie-backports/debian/rules.defs	2016-01-29 22:21:01 UTC (rev 1591)
@@ -2,7 +2,7 @@
 SIGNATURE_VERSION	 = 15.9
 XORG_ABI_LIST		 = 19 18 15 14 13 12 11 10 8 6.0
 
-LINUX_KMOD_TESTED	 = 4.2
+LINUX_KMOD_TESTED	 = 4.3
 
 #INSTALLER_PREFIX	 = amd-driver-installer-catalyst
 INSTALLER_PREFIX.zip	 = amd-catalyst-omega

More information about the Pkg-fglrx-devel mailing list