Author: arekm Date: Sun Dec 2 20:50:25 2007 GMT Module: SPECS Tag: MYSQL_4_1 ---- Log message: - add patch from bk; fixes some important security things
---- Files affected: SPECS: mysql.spec (1.300.2.16 -> 1.300.2.17) ---- Diffs: ================================================================ Index: SPECS/mysql.spec diff -u SPECS/mysql.spec:1.300.2.16 SPECS/mysql.spec:1.300.2.17 --- SPECS/mysql.spec:1.300.2.16 Sun Dec 2 21:21:55 2007 +++ SPECS/mysql.spec Sun Dec 2 21:50:20 2007 @@ -4,6 +4,7 @@ # - trigger /etc/mysqld.conf into /etc/mysql/mysqld.conf. Solve possible # conflict with /var/lib/mysql/mysqld.conf # - package man1/mysqlman.1, and make programs without manpage '.so mysqlman' +# - generate and package man pages from svn # # Conditional build: %bcond_with bdb # Berkeley DB support @@ -13,6 +14,7 @@ %bcond_without ssl # Without OpenSSL %bcond_without tcpd # Without libwrap (tcp_wrappers) support %bcond_with big_tables # enable '--with-big-tables', some performance loss on 32bit arch, but can do >= 4GB database tables. +%bcond_with doc # %include /usr/lib/rpm/macros.perl Summary: MySQL: a very fast and reliable SQL database engine @@ -29,8 +31,8 @@ License: GPL + MySQL FLOSS Exception Group: Applications/Databases # Newer releases from bk only, see how to fetch mysql from bk repo tag: -# http://dev.mysql.com/doc/refman/4.1/en/installing-source-tree.html -# Manual pages repository location is unfortunately knknown. +# http://dev.mysql.com/doc/refman/4.1/en/installing-source-tree.html . +# Manual pages are at http://svn.mysql.com/svnpublic/mysqldoc/refman-4.1/ . Source0: %{name}-%{version}.tar.bz2 # Source0-md5: 146ab42a1c066156a8dcbd25abbe564a Source1: %{name}.init @@ -46,6 +48,7 @@ Source11: %{name}-ndb-cpc.init Source12: %{name}-ndb-cpc.sysconfig Source13: %{name}-client.conf +Patch100: %{name}-bk-20071202.patch Patch0: %{name}-libs.patch Patch1: %{name}-libwrap.patch Patch2: %{name}-c++.patch @@ -420,10 +423,11 @@ %prep %setup -q +%patch100 -p1 %patch0 -p1 %{?with_tcpd:%patch1 -p1} %patch2 -p1 -%patch3 -p1 +%{?with_doc:%patch3 -p1} %ifarch alpha # this is strange: mysqld functions for UDF modules are not explicitly defined, # so -rdynamic is used; in such case gcc3+ld on alpha doesn't like C++ vtables @@ -508,7 +512,7 @@ %{__make} \ benchdir=$RPM_BUILD_ROOT%{_datadir}/sql-bench -%{__make} -C Docs mysql.info +%{?with_doc:%{__make} -C Docs mysql.info} %install rm -rf $RPM_BUILD_ROOT @@ -527,7 +531,7 @@ libsdir=/tmp # libsdir is to avoid installing innodb static libs in $RPM_BUILD_ROOT../libs -install Docs/mysql.info $RPM_BUILD_ROOT%{_infodir} +%{?with_doc:install Docs/mysql.info $RPM_BUILD_ROOT%{_infodir}} install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysql install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/mysql @@ -761,7 +765,7 @@ %attr(750,mysql,mysql) %dir /var/log/archiv/mysql %attr(640,mysql,mysql) %ghost /var/log/mysql/* -%{_infodir}/mysql.info* +%{?with_doc:%{_infodir}/mysql.info*} %dir %{_datadir}/mysql # This is template for configuration file which is created after 'service mysql init' %{_datadir}/mysql/mysqld.conf @@ -909,6 +913,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.300.2.17 2007-12-02 20:50:20 arekm +- add patch from bk; fixes some important security things + Revision 1.300.2.16 2007-12-02 20:21:55 arekm - up to 4.1.23 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mysql.spec?r1=1.300.2.16&r2=1.300.2.17&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
