From 555510a7791fb8196f01fad3f78e7f42d42a0c6c Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 08:53:49 +0000 Subject: [PATCH] =?UTF-8?q?auto-import=20changelog=20data=20from=20mysql-3?= =?UTF-8?q?.23.24-1.src.rpm=20Tue=20Sep=2012=202000=20Trond=20Eivind=20Glo?= =?UTF-8?q?msr=C3=B8d=20=20-=20rename=20config=20file=20to?= =?UTF-8?q?=20/etc/my.cnf,=20which=20is=20what=20mysqld=20wants...=20doh.?= =?UTF-8?q?=20=20=20=20=20(#17432)=20-=20include=20a=20changed=20safe=5Fmy?= =?UTF-8?q?sqld,=20so=20the=20pid=20file=20option=20works.=20-=20make=20my?= =?UTF-8?q?sql=20dir=20world=20readable=20to=20they=20can=20access=20the?= =?UTF-8?q?=20mysql=20socket.=20=20=20=20=20(#17432)=20-=203.23.24=20Wed?= =?UTF-8?q?=20Sep=2006=202000=20Trond=20Eivind=20Glomsr=C3=B8d=20=20-=203.23.23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- mysql.init | 6 +++--- mysql.spec | 32 ++++++++++++++++++++++++-------- sources | 2 +- 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 67cda3b..1520130 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mysql-3.23.22-beta.tar.gz +mysql-3.23.24-beta.tar.gz diff --git a/mysql.init b/mysql.init index 8847871..32b4415 100644 --- a/mysql.init +++ b/mysql.init @@ -6,7 +6,7 @@ # chkconfig: - 85 15 # description: MySQL database server. # processname: mysqld -# config: /etc/my.conf +# config: /etc/my.cnf # pidfile: /var/run/mysqld.pid # Source function library. @@ -19,8 +19,8 @@ [ -f /etc/sysconfig/subsys/mysqld ] && . /etc/sysconfig/subsys/mysqld start(){ - touch /var/log/mysqld.log /var/run/mysqld.pid - chown mysql.mysql /var/log/mysqld.log /var/run/mysqld.pid + touch /var/log/mysqld.log + chown mysql.mysql /var/log/mysqld.log if [ ! -d /var/lib/mysql/mysql ] ; then action "Initializing MySQL database" /usr/bin/mysql_install_db ret=$? diff --git a/mysql.spec b/mysql.spec index cd7a78e..009281f 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,9 +1,10 @@ Name: mysql -Version: 3.23.22 -Release: 6 +Version: 3.23.24 +Release: 1 Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}-beta.tar.gz Source1: mysql.init Source2: mysql.logrotate +Source3: safe_mysqld URL: http://www.mysql.com BuildRoot: %{_tmppath}/mysql-%{version}-root Summary: MySQL client program and shared library @@ -73,17 +74,20 @@ make rm -rf $RPM_BUILD_ROOT %makeinstall +install -m755 %{SOURCE3} $RPM_BUILD_ROOT/usr/bin/safe_mysqld + # List the installed tree for RPM package maintenance purposes. find $RPM_BUILD_ROOT -print | sed "s|^$RPM_BUILD_ROOT||" | sort > ROOTFILES gzip $RPM_BUILD_ROOT/%{_infodir}/* rm -f $RPM_BUILD_ROOT/usr/share/mysql/mysql-*.spec rm -f $RPM_BUILD_ROOT/usr/share/mysql/mysql-log-rotate + mkdir -p $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d} install -m 0755 -d $RPM_BUILD_ROOT/var/lib/mysql install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysqld install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/mysqld -touch $RPM_BUILD_ROOT/etc/my.conf +touch $RPM_BUILD_ROOT/etc/my.cnf rm -f $RPM_BUILD_ROOT/%{_infodir}/dir* %clean @@ -139,7 +143,7 @@ fi %files %defattr(-,root,root) -%doc INSTALL* PUBLIC README Docs/INSTALL* Docs/MySQL-for-dummies +%doc INSTALL* PUBLIC README COPYING* %doc Docs/manual* Docs/mysqld_error.txt # /usr/bin/* except mysqladmin and safe_mysqld @@ -155,12 +159,12 @@ fi %{_infodir}/* %{_mandir}/man1/* %dir /usr/lib/mysql -/usr/lib/mysql/libmysqlclient.so.* +/usr/lib/mysql/libmysqlclient*.so.* %dir /usr/share/mysql /usr/share/mysql/* -%config /etc/my.conf +%config /etc/my.cnf %files server %defattr(-,root,root) @@ -170,16 +174,28 @@ fi %config /etc/rc.d/init.d/mysqld %config /etc/logrotate.d/mysqld -%attr(0700,mysql,mysql) %dir /var/lib/mysql +%attr(0755,mysql,mysql) %dir /var/lib/mysql %files devel %defattr(-,root,root) /usr/include/mysql %dir /usr/lib/mysql /usr/lib/mysql/*.a -/usr/lib/mysql/libmysqlclient.so +/usr/lib/mysql/libmysqlclient*.so %changelog +* Thu Sep 12 2000 Trond Eivind Glomsrød +- rename config file to /etc/my.cnf, which is what + mysqld wants... doh. (#17432) +- include a changed safe_mysqld, so the pid file option + works. +- make mysql dir world readable to they can access the + mysql socket. (#17432) +- 3.23.24 + +* Wed Sep 06 2000 Trond Eivind Glomsrød +- 3.23.23 + * Sun Aug 27 2000 Trond Eivind Glomsrød - Add "|| :" to condrestart to avoid non-zero exit code diff --git a/sources b/sources index 4801cf2..f943648 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dfb40c467219de80ed767ad372e34acf mysql-3.23.22-beta.tar.gz +a4d1e1075db34675d91280bfe81aa891 mysql-3.23.24-beta.tar.gz