rpms/firebird/F-11 firebird-fix-initscript.patch, 1.1, 1.2 firebird.spec, 1.2, 1.3 firebird-profile.csh, 1.1, NONE firebird-profile.sh, 1.1, NONE
Philippe Makowski
makowski at fedoraproject.org
Sat Jul 11 16:11:43 UTC 2009
Author: makowski
Update of /cvs/pkgs/rpms/firebird/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24065
Modified Files:
firebird-fix-initscript.patch firebird.spec
Removed Files:
firebird-profile.csh firebird-profile.sh
Log Message:
- change xinetd script (rh #506528)
- add missing library (and header files) for build php4-interbase module (rh #506728)
- update README.fedora
- automatically created user now have /bin/nologin as shell to make things a little more secure
firebird-fix-initscript.patch:
Index: firebird-fix-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/F-11/firebird-fix-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- firebird-fix-initscript.patch 4 May 2009 09:14:37 -0000 1.1
+++ firebird-fix-initscript.patch 11 Jul 2009 16:11:42 -0000 1.2
@@ -8,10 +8,15 @@
# No changes needed below for multiple instances
FBRunUser=firebird
-@@ -39,18 +40,22 @@
- echo $MANAGER -pidfile $pidfile -start -forever | su $FBRunUser
+@@ -37,21 +37,25 @@
+ case "$1" in
+ start)
+ echo -n "Starting $FULLNAME "
+- echo $MANAGER -pidfile $pidfile -start -forever | su $FBRunUser
++ daemon --user=$FBRunUser $MANAGER -pidfile $pidfile -start -forever
RETVAL=$?
- [ $RETVAL -eq 0 ] && success || failure
+- [ $RETVAL -eq 0 ] && success || failure
++ echo
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name
echo
;;
Index: firebird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/F-11/firebird.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- firebird.spec 12 May 2009 11:18:07 -0000 1.2
+++ firebird.spec 11 Jul 2009 16:11:43 -0000 1.3
@@ -6,7 +6,7 @@
Summary: SQL relational database management system
Name: firebird
Version: 2.1.2.18118.0
-Release: 7%{?dist}
+Release: 9%{?dist}
Group: Applications/Databases
License: Interbase
@@ -14,15 +14,14 @@ URL: http://www.firebirdsql.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
Source0: http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2
-Source1: firebird-profile.sh
-Source2: firebird-profile.csh
-Source3: firebird-logrotate
-Source4: README.Fedora
+Source1: firebird-logrotate
+Source2: README.Fedora
Patch0: firebird-mcpu-to-mtune.patch
Patch1: firebird-2.1.2-doc.patch
Patch2: firebird-fix-initscript.patch
Patch3: firebird_lock-file-location.patch
+Patch4: firebird-gcc-icu.patch
BuildRequires: autoconf
@@ -32,6 +31,7 @@ BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: libtermcap-devel
BuildRequires: libicu-devel
+BuildRequires: gcc-c++
Requires: %{name}-arch = %{version}-%{release}
Requires: grep
@@ -131,13 +131,29 @@ iconv -f ISO-8859-1 -t utf-8 -c ./doc/RE
%patch1
%patch0
%patch3
+%patch4
%build
# classic
+%ifarch sparc64
+export CXXFLAGS='-m64'
+export CFLAGS='-m64'
+export LDFLAGS='-m64'
+%endif
+%ifarch sparcv9
+export CXXFLAGS='-m32'
+export CFLAGS='-m32'
+export LDFLAGS='-m32'
+%endif
+
autoreconf -vfi
-%configure --prefix=%{fbroot} \
+%configure --prefix=%{fbroot} \
--with-system-icu
+
+%ifarch sparc64
+sed "s at COMMON_FLAGS=-m32 at COMMON_FLAGS=-m64@" -i ./gen/make.platform
+%endif
# Can't use make %{?_smp_mflags} as parallel build is broken
make
@@ -156,10 +172,15 @@ chmod 644 ./buildroot-classic%{fbroot}/h
cd ..
# superserver
-%configure --prefix=%{fbroot} \
+autoreconf -vfi
+%configure --prefix=%{fbroot} \
--enable-superserver \
--with-system-icu
+%ifarch sparc64
+sed "s at COMMON_FLAGS=-m32 at COMMON_FLAGS=-m64@" -i ./gen/make.platform
+%endif
+
# Can't use make %{?_smp_mflags} as parallel build is broken
make
@@ -191,6 +212,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/logr
mkdir -p %{buildroot}%{_var}/run/%{name}
mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/data
+mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/system
mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
mkdir -p %{buildroot}%{_includedir}/%{name}
mkdir -p %{buildroot}%{_libdir}
@@ -218,14 +240,14 @@ cp %{_builddir}/%{pkgname}/gen/buildroot
cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/UDF/* %{buildroot}%{fbroot}/UDF-superserver/
cd %{buildroot}%{fbroot}/bin-superserver/
-ln -s ./fbmgr.bin ./fbmgr
+ln -s fbmgr.bin fbmgr
cd %{buildroot}
cd %{buildroot}%{fbroot}/lib/
-ln -s %{fbroot}/lib/libfbembed.so.%{major} libfbembed.so.2.1
-ln -s %{fbroot}/lib/libfbembed.so.2.1 libfbembed.so
-ln -s %{fbroot}/lib/libfbclient.so.%{major} libfbclient.so.2
-ln -s %{fbroot}/lib/libfbclient.so.2 libfbclient.so
+ln -s libfbembed.so.%{major} libfbembed.so.2.1
+ln -s libfbembed.so.2.1 libfbembed.so
+ln -s libfbclient.so.%{major} libfbclient.so.2
+ln -s libfbclient.so.2 libfbclient.so
cd %{buildroot}
cd %{buildroot}%{_libdir}
@@ -235,12 +257,14 @@ ln -s %{fbroot}/lib/libfbembed.so.%{majo
ln -s %{fbroot}/lib/libfbclient.so libfbclient.so
ln -s %{fbroot}/lib/libfbclient.so.2 libfbclient.so.2
ln -s %{fbroot}/lib/libfbclient.so.%{major} libfbclient.so.%{major}
+ln -s %{fbroot}/lib/libfbclient.so.%{major} libgds.so.0
+ln -s %{fbroot}/lib/libfbclient.so libgds.so
ln -s %{fbroot}/lib/libib_util.so libib_util.so
cd %{buildroot}
echo 1 > %{buildroot}%{_localstatedir}/log/%{name}/%{name}.log
ln -s %{_localstatedir}/log/%{name}/%{name}.log .%{fbroot}/%{name}.log
-sed "s@%{name}.log@%{_localstatedir}/log/%{name}/%{name}.log at g" %{SOURCE3} > %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+sed "s@%{name}.log@%{_localstatedir}/log/%{name}/%{name}.log at g" %{SOURCE1} > %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/include/* %{buildroot}%{_includedir}/%{name}/
cd %{buildroot}%{fbroot}/include/
@@ -248,29 +272,31 @@ ln -s %{_includedir}/%{name}/ibase.h iba
ln -s %{_includedir}/%{name}/iberror.h iberror.h
ln -s %{_includedir}/%{name}/ib_util.h ib_util.h
ln -s %{_includedir}/%{name}/perf.h perf.h
+cd %{buildroot}%{_includedir}
+ln -s %{_includedir}/%{name}/ibase.h ibase.h
+ln -s %{_includedir}/%{name}/iberror.h iberror.h
+ln -s %{_includedir}/%{name}/ib_util.h ib_util.h
+ln -s %{_includedir}/%{name}/perf.h perf.h
cd %{buildroot}
cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/aliases.conf .%{_sysconfdir}/%{name}/aliases.conf
sed "s@%{fbroot}/examples/empbuild@%{_localstatedir}/lib/%{name}/data@" -i .%{_sysconfdir}/%{name}/aliases.conf
cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/firebird.conf .%{_sysconfdir}/%{name}/firebird.conf
cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/intl/fbintl.conf .%{_sysconfdir}/%{name}/fbintl.conf
-cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/security2.fdb .%{_sysconfdir}/%{name}/security2.fdb
+cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/security2.fdb .%{_localstatedir}/lib/%{name}/system/security2.fdb
ln -s %{_sysconfdir}/%{name}/aliases.conf .%{fbroot}/aliases.conf
ln -s %{_sysconfdir}/%{name}/firebird.conf .%{fbroot}/firebird.conf
-ln -s %{_sysconfdir}/%{name}/security2.fdb .%{fbroot}/security2.fdb
+ln -s %{_localstatedir}/lib/%{name}/system/security2.fdb .%{fbroot}/security2.fdb
ln -s %{_sysconfdir}/%{name}/fbintl.conf .%{fbroot}/intl/fbintl.conf
-sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE1} > %{buildroot}%{_sysconfdir}/profile.d/firebird.sh
-sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE2} > %{buildroot}%{_sysconfdir}/profile.d/firebird.csh
-
-cp %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/misc/%{name}.xinetd %{buildroot}%{_sysconfdir}/xinetd.d/%{name}
+sed "s@= root@= %{name}@" %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/misc/%{name}.xinetd > %{buildroot}%{_sysconfdir}/xinetd.d/%{name}
cp %{_builddir}/%{pkgname}/gen/buildroot-superserver%{fbroot}/misc/%{name}.init.d.mandrake %{buildroot}%{_initrddir}/%{name}
sed "s at chkconfig: 345 at chkconfig: -@" -i %{buildroot}%{_initrddir}/%{name}
-sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE4} > %{_builddir}/%{pkgname}/doc/README.Fedora
+sed "s@%%{fbroot}@%{fbroot}@g" %{SOURCE2} > %{_builddir}/%{pkgname}/doc/README.Fedora
ln -s %{_var}/run/%{name} .%{fbroot}/run
-ln -s %{fbroot}/bin/isql .%{_bindir}/fbsql
+ln -s %{fbroot}/bin/isql .%{_bindir}/isql-fb
ln -s %{fbroot}/bin/gbak .%{_bindir}/gbak
ln -s %{fbroot}/bin/gfix .%{_bindir}/gfix
ln -s %{fbroot}/bin/gsec .%{_bindir}/gsec
@@ -290,10 +316,12 @@ rm -Rf %{buildroot}
%postun libfbembed -p /sbin/ldconfig
%post classic
-if test ! -e %{fbroot}/bin; then
+if [ "$(readlink %{fbroot}/bin 2> /dev/null)" \!= "%{fbroot}/bin-classic" ]; then
+ [ -e %{fbroot}/bin ] && rm -f %{fbroot}/bin
ln -s %{fbroot}/bin{-classic,}
fi
-if test ! -e %{fbroot}/UDF; then
+if [ "$(readlink %{fbroot}/UDF 2> /dev/null)" \!= "%{fbroot}/UDF-classic" ]; then
+ [ -e %{fbroot}/UDF ] && rm -f %{fbroot}/bin
ln -s %{fbroot}/UDF{-classic,}
fi
if /sbin/service xinetd status >& /dev/null; then
@@ -315,18 +343,15 @@ fi
%post superserver
-if test ! -e %{fbroot}/bin; then
+if [ "$(readlink %{fbroot}/bin 2> /dev/null)" \!= "%{fbroot}/bin-superserver" ]; then
+ [ -e %{fbroot}/bin ] && rm -f %{fbroot}/bin
ln -s %{fbroot}/bin{-superserver,}
fi
-if test ! -e %{fbroot}/UDF; then
+if [ "$(readlink %{fbroot}/UDF 2> /dev/null)" \!= "%{fbroot}/UDF-superserver" ]; then
+ [ -e %{fbroot}/UDF ] && rm -f %{fbroot}/bin
ln -s %{fbroot}/UDF{-superserver,}
fi
-if [ $1 -eq 2 ]; then
- if /sbin/service firebird status >& /dev/null; then
- /sbin/service firebird restart
- fi
-fi
if [ $1 -eq 1 ]; then
chkconfig firebird off
fi
@@ -353,7 +378,7 @@ fi
%pre
# Create the firebird group if it doesn't exist
getent group %{name} || /usr/sbin/groupadd -r %{name}
-getent passwd %{name} >/dev/null || /usr/sbin/useradd -d / -g %{name} -s /bin/sh -r %{name}
+getent passwd %{name} >/dev/null || /usr/sbin/useradd -d / -g %{name} -s /bin/nologin -r %{name}
# Add gds_db to /etc/services if needed
FileName=/etc/services
@@ -374,6 +399,7 @@ rm -Rf %{_var}/run/%{name}
%defattr(0644,root,root,0755)
%doc doc/license/IDPL.txt
%doc doc/license/README.license.usage.txt
+%doc doc/README.Fedora
%defattr(0644,root,root,0755)
%dir %attr(0755,root,root) %{_localstatedir}/lib/%{name}
%dir %attr(0770,%{name},%{name}) %{_localstatedir}/lib/%{name}/data
@@ -381,7 +407,7 @@ rm -Rf %{_var}/run/%{name}
%dir %{_localstatedir}/log/%{name}
%dir %{fbroot}/intl
%dir %{_sysconfdir}/%{name}
-%config(noreplace) %attr (0660,%{name},%{name}) %{_sysconfdir}/%{name}/security2.fdb
+%config(noreplace) %attr (0600,%{name},%{name}) %{_localstatedir}/lib/%{name}/system/security2.fdb
%{fbroot}/security2.fdb
%config(noreplace) %attr (0664,%{name},%{name}) %{_sysconfdir}/%{name}/fbintl.conf
%config(noreplace) %attr (0664,%{name},%{name}) %{_sysconfdir}/%{name}/aliases.conf
@@ -390,19 +416,16 @@ rm -Rf %{_var}/run/%{name}
%{fbroot}/firebird.conf
%{fbroot}/intl/fbintl.conf
%{fbroot}/firebird.log
-%attr(0664,%{name},%{name}) %{_localstatedir}/log/%{name}/%{name}.log
+%config(noreplace) %attr(0664,%{name},%{name}) %{_localstatedir}/log/%{name}/%{name}.log
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}
%{fbroot}/*.msg
%{fbroot}/help
%{_libdir}/libib_util.so
%{fbroot}/lib/libib_util.so
-%defattr(0644,root,root,0644)
-%config(noreplace) %{_sysconfdir}/profile.d/firebird.csh
-%config(noreplace) %{_sysconfdir}/profile.d/firebird.sh
%defattr(0755,root,root,0750)
%{fbroot}/intl/fbintl
%defattr(0755,root,root,0755)
-%{_bindir}/fbsql
+%{_bindir}/isql-fb
%{_bindir}/gbak
%{_bindir}/gsec
%{_bindir}/gfix
@@ -444,6 +467,7 @@ rm -Rf %{_var}/run/%{name}
%doc doc/license/IDPL.txt
%doc doc/license/README.license.usage.txt
%{_libdir}/libfbclient.so.*
+%{_libdir}/libgds.so.0
%{fbroot}/lib/libfbclient.so.*
@@ -485,6 +509,15 @@ rm -Rf %{_var}/run/%{name}
%changelog
+* Sat Jul 11 2009 Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.2.18118.0-9
+- change xinetd script (rh #506528)
+- add missing library (and header files) for build php4-interbase module (rh #506728)
+- update README.fedora
+- automatically created user now have /bin/nologin as shell to make things a little more secure
+
+* Tue May 12 2009 Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.2.18118.0-8
+- patch to fix gcc 4.4.0 and icu 4.2 build error
+
* Tue May 12 2009 Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.2.18118.0-7
- patch to change lock files location and avoid %%{fbroot} owned by firebird user (rh #500219)
- add README.fedora
--- firebird-profile.csh DELETED ---
--- firebird-profile.sh DELETED ---
More information about the fedora-extras-commits
mailing list