openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package mysql (Revision 3d9f28209966fb8f882fe67891a13612)

Currently displaying revision 3d9f28209966fb8f882fe67891a13612 , Show latest

--- mysql.changes.orig
+++ mysql.changes
@@ -1,4 +1,23 @@
 -------------------------------------------------------------------
+Tue Dec  1 17:52:18 CET 2009 - mhrusecky@suse.cz
+
+- removing compatibility symlink
+  - intended for 11.2 but never get there
+- fixing various security issues (bnc#557669, 
+  - upstream #47320 - checking server certificates (CVE-2009-4028)
+  - upstream #48291 - error handling in subqueries (CVE-2009-4019)
+  - upstream #47780 - preserving null_value flag in GeomFromWKB()
+                      (CVE-2009-4019)
+  - upstream #39277 - symlink behaviour fixed (CVE-2008-7247)
+  - upstream #32167 - symlink behaviour refixed (CVE-2009-4030)
+
+-------------------------------------------------------------------
+Wed Nov 11 14:23:43 CET 2009 - mhrusecky@suse.cz
+
+- making pid file readable by everybody
+- fixing 'rcmysql status' for non-root
+
+-------------------------------------------------------------------
 Thu Oct 29 14:11:09 CET 2009 - mhrusecky@suse.cz
 
 - adding /var/lib/mysql/mysql.sock symlink for compatibility with
--- mysql.spec.orig
+++ mysql.spec
@@ -94,8 +94,22 @@ Patch37:        mysql-5.1.36-bmove512.pa
 Patch38:        mysql-5.1.36-hotcopy.patch
 # PATCH-FIX-UPSTREAM mysql_config.patch [ upstream#39175, bnc#420313 ] mhrusecky@suse.cz -- Fix linking options.
 Patch39:        mysql_config.patch
+# PATCH-FIX-UPSTREAM mysql-5.1.36-no-ssl-callback.patch [ upstream#47320, bnc#557669 ] mhrusecky@suse.cz -- Check server certificate (CVE-2009-4028)
+Patch40:        mysql-5.1.36-no-ssl-verify-callback.patch
+# PATCH-FIX-UPSTREAM mysql-5.1.36-select-subqueries.patch [ upstream#48291, bnc#557669 ] mhrusecky@suse.cz -- Error handling for subqueries (CVE-2009-4019)
+Patch41:        mysql-5.1.36-subqueries-errors.patch
+# PATCH-FIX-UPSTREAM mysql-5.1.36-gis.patch [ upstream#47780, bnc#557669 ] mhrusecky@suse.cz -- Preserving null_value flag in GeomFromWKB() (CVE-2009-4019)
+Patch42:        mysql-5.1.36-gis.patch
+# PATCH-FIX-UPSTREAM mysql-5.1.36-CVE-2008-7247.patch [ upstream#39277, bnc#557669 ] mhrusecky@suse.cz -- Symlink behaviour fixed CVE-2008-7247
+Patch43:        mysql-5.1.36-CVE-2008-7247.patch
+# PATCH-FIX-UPSTREAM mysql-5.1.36-CVE-2009-4030.patch [ upstream#32167, bnc#557669 ] mhrusecky@suse.cz -- Symlink behaviour refixed CVE-2009-4030
+Patch44:        mysql-5.1.36-CVE-2009-4030.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version}
 PreReq:         pwdutils
+%else
+PreReq:         /usr/sbin/useradd /usr/sbin/usermod /usr/sbin/groupadd 
+%endif
 PreReq:         coreutils sed grep
 %if 0%{?suse_version}
 PreReq:         %install_info_prereq %insserv_prereq
@@ -372,6 +386,11 @@ cp %_sourcedir/suse-test-run .
 %patch37 
 %patch38 
 %patch39 
+%patch40
+%patch41
+%patch42
+%patch43 -p1
+%patch44
 # remove unneeded manpages ('make install' basically installs everything under
 # man/*)
 rm -f man/mysqlman.1        # dummy fallback manpage
--- rc.mysql-multi.orig
+++ rc.mysql-multi
@@ -413,15 +413,11 @@ else
 			fi
 			chown mysql:mysql "$log_upgrade"
 			chmod 660 "$log_upgrade"
-			# Backward compatibility
-			[ "$socket" \!= "/var/run/mysql/mysql.sock" ] || ln -sf ../../run/mysql/mysql.sock /var/lib/mysql/mysql.sock
 		fi 
 
 
 		echo -n "Starting service MySQL "
 		
-		[ "$socket" = "/var/run/mysql/mysql.sock" ] || ( [ "`readlink /var/lib/mysql/mysql.sock`" \!= "../../run/mysql/mysql.sock" ] || rm -f /var/lib/mysql/mysql.sock )
-
 		$SAFE_MYSQLD \
 			--mysqld=${MYSQLD#/usr/sbin/} \
 			$debug_flags \
@@ -434,6 +430,7 @@ else
 			# let's not treat this as a fatal error
 			echo "warning: $socket didn't appear within 30 seconds"
 		}
+		chmod a+r "$pid_file"
 
 		# Rmember status and be verbose
 		rc_status -v
@@ -496,13 +493,11 @@ else
 				test -e /proc/version || set_return_value 100
 			fi
 			pid="`cat "$pid_file"`"
-			if [ -d "/proc/$pid" ]; then
-				if exe=`readlink "/proc/$pid/exe"`; then
-					if [ "`echo "$exe" | grep "^$MYSQLD"`" ]; then
-						set_return_value 0
-					else
-						set_return_value 1
-					fi
+			if [ "$pid" ] && [ -d "/proc/$pid" ]; then
+				cmd=`cat "/proc/$pid/cmdline" 2> /dev/null`
+				exe=`readlink "/proc/$pid/exe" 2> /dev/null`
+				if [ "`echo "$exe" | grep "^$MYSQLD"`" ] || [ "`echo "$cmd" | grep "^$MYSQLD"`" ]; then
+					set_return_value 0
 				else
 					set_return_value 1
 				fi

Places

File project.diff of Package mysql (Revision 3d9f28209966fb8f882fe67891a13612)

Places