[packages/Firebird] - updated to 2.5.2.26540 - updated noroot patch - removed obsolete svn patch
qboosh
qboosh at pld-linux.org
Sat Apr 13 19:59:23 CEST 2013
commit 19f3deaeccb1baa31d30ccc6f9f496c3571d9d56
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Apr 13 19:59:42 2013 +0200
- updated to 2.5.2.26540
- updated noroot patch
- removed obsolete svn patch
Firebird-noroot.patch | 34 +++++++++++++++++-----------------
Firebird.spec | 28 ++++++++++++----------------
firebird-2.5.1-svn-CORE-3610.patch | 32 --------------------------------
3 files changed, 29 insertions(+), 65 deletions(-)
---
diff --git a/Firebird.spec b/Firebird.spec
index 82b78f9..9e949aa 100644
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -13,12 +13,12 @@ Summary(de.UTF-8): Firebird - relationalen Open-Source- Datenbankmanagementsyste
Summary(pl.UTF-8): Firebird - serwer baz danych SQL oraz narzędzia klienckie
Name: Firebird
# FirebirdCS/FirebirdSS (Classic Server/Super Server)?
-Version: 2.5.1.26351
-Release: 2
+Version: 2.5.2.26540
+Release: 1
License: Interbase Public License 1.0, Initial Developer's Public License 1.0
Group: Applications/Databases
Source0: http://downloads.sourceforge.net/firebird/%{name}-%{version}-0.tar.bz2
-# Source0-md5: 1772fba4f09c8fc84d989282405f90fd
+# Source0-md5: 21154d2004e025c8a3666625b0357bb5
Source1: http://www.firebirdsql.org/pdfmanual/%{name}-2.5-QuickStart.pdf
# Source1-md5: a7776f1eae45ba0b2543c203cd5271ae
# distfiles refuses this, would require some audit to allow '('/')' chars
@@ -44,13 +44,11 @@ Source102: firebird.inetd
Patch0: %{name}-chmod.patch
Patch1: %{name}-editline.patch
Patch2: %{name}-va.patch
-Patch3: firebird-2.5.1-svn-CORE-3610.patch
-Patch4: %{name}-FHS.patch
-Patch5: %{name}-opt.patch
-Patch6: %{name}-gcc-icu.patch
-
-Patch9: %{name}-rpath.patch
-Patch10: %{name}-noroot.patch
+Patch3: %{name}-FHS.patch
+Patch4: %{name}-opt.patch
+Patch5: %{name}-gcc-icu.patch
+Patch6: %{name}-rpath.patch
+Patch7: %{name}-noroot.patch
URL: http://www.firebirdsql.org/
BuildRequires: autoconf >= 2.56
BuildRequires: automake
@@ -166,13 +164,11 @@ Obszerna dokumentacja do baz InterBase i Firebird.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p0
+%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p0
-
-%patch9 -p1
-%patch10 -p1
+%patch5 -p0
+%patch6 -p1
+%patch7 -p1
mkdir docs
cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} docs
diff --git a/Firebird-noroot.patch b/Firebird-noroot.patch
index a5a4473..e6e5e86 100644
--- a/Firebird-noroot.patch
+++ b/Firebird-noroot.patch
@@ -1,5 +1,5 @@
---- Firebird-2.5.0.26074-0/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in.orig 2010-09-08 10:41:27.000000000 +0200
-+++ Firebird-2.5.0.26074-0/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in 2010-10-28 20:58:38.779734339 +0200
+--- Firebird-2.5.2.26540-0/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in.orig 2013-03-19 09:37:35.000000000 +0100
++++ Firebird-2.5.2.26540-0/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in 2013-04-13 13:31:09.763259410 +0200
@@ -28,11 +28,6 @@
# This script builds an image of the installed system into
# the gen/buildroot directory.
@@ -12,7 +12,7 @@
# Making an assumption that this program is being run in the gen directory
BuildRootDir=..
BuiltFBDir=./firebird # Where the just build fb exists.
-@@ -113,7 +108,6 @@
+@@ -118,7 +113,6 @@
for d in $Dirs; do
Dir=${TargetDir}${d}
mkdir -p $Dir
@@ -20,7 +20,7 @@
chmod 0755 $Dir
done
}
-@@ -158,7 +152,6 @@
+@@ -163,7 +157,6 @@
cp $BuiltFBDir/bin/isql ${TargetDir}@FB_BINDIR@/isql
cp $BuiltFBDir/bin/qli ${TargetDir}@FB_BINDIR@/qli
@@ -28,7 +28,7 @@
chmod 0755 ${TargetDir}@FB_BINDIR@/*
#sbin
-@@ -177,7 +170,6 @@
+@@ -182,7 +175,6 @@
cp $BuiltFBDir/bin/createAliasDB.sh ${TargetDir}@FB_SBINDIR@
cp $BuiltFBDir/bin/fb_config ${TargetDir}@FB_SBINDIR@
@@ -36,7 +36,7 @@
chmod 0755 ${TargetDir}@FB_SBINDIR@/*
chmod 0700 ${TargetDir}@FB_SBINDIR@/*.sh
-@@ -201,19 +193,16 @@
+@@ -206,19 +198,16 @@
for i in `find ${TargetDir}@FB_SAMPLEDIR@ -type d -print`
do
@@ -56,13 +56,13 @@
chmod 0444 ${TargetDir}@FB_SAMPLEDBDIR@/*.fdb
fi
-@@ -221,13 +210,11 @@
+@@ -226,13 +215,11 @@
copyIfExists $BuiltFBDir/help/help.gbak ${TargetDir}@FB_HELPDIR@
cp $BuiltFBDir/help/help.fdb ${TargetDir}@FB_HELPDIR@
- chown root:root ${TargetDir}@FB_HELPDIR@/*.fdb
chmod 0444 ${TargetDir}@FB_HELPDIR@/*.fdb
-
+
#message file
cp $BuiltFBDir/*.msg ${TargetDir}@FB_MSGDIR@
@@ -70,7 +70,7 @@
chmod 0444 ${TargetDir}@FB_MSGDIR@/*.msg
#secureDB (access rights will be set at install time)
-@@ -236,7 +223,6 @@
+@@ -241,7 +228,6 @@
#.h files
cp $BuiltFBDir/include/*.h ${TargetDir}@FB_INCDIR@
@@ -78,7 +78,7 @@
chmod 0444 ${TargetDir}@FB_INCDIR@/*.h
#lib
-@@ -245,20 +231,17 @@
+@@ -250,20 +236,17 @@
cp -f $BuiltFBDir/lib/libib_util.so ${TargetDir}@FB_LIBDIR@/libib_util.so
copyIfExists $BuiltFBDir/lib/libicu*.so* ${TargetDir}@FB_LIBDIR@
@@ -99,25 +99,25 @@
chmod 0755 ${TargetDir}@FB_INTLDIR@/fbintl
chmod 0644 ${TargetDir}@FB_INTLDIR@/fbintl.conf
-@@ -271,7 +254,6 @@
+@@ -276,7 +259,6 @@
cp $BuildRootDir/src/extlib/ib_udf2.sql ${TargetDir}@FB_UDFDIR@
cp $BuildRootDir/src/extlib/fbudf/fbudf.sql ${TargetDir}@FB_UDFDIR@
- chown root:root ${TargetDir}@FB_UDFDIR@/*.so ${TargetDir}@FB_UDFDIR@/*.sql
chmod 0755 ${TargetDir}@FB_UDFDIR@/*.so
chmod 0644 ${TargetDir}@FB_UDFDIR@/*.sql
-
-@@ -282,9 +264,7 @@
+
+@@ -287,9 +269,7 @@
cp $BuildRootDir/doc/WhatsNew ${TargetDir}@FB_CONFDIR@/WhatsNew
cp $BuildRootDir/doc/README.user ${TargetDir}@FB_CONFDIR@/README
-
+
- chown -R root:root ${TargetDir}@FB_MISCDIR@
for i in `find ${TargetDir}@FB_MISCDIR@ -print`; do
- chown root:root $i
if [ -d $i ]; then
chmod 0755 $i
else
-@@ -301,7 +281,6 @@
+@@ -306,7 +286,6 @@
cp $BuildRootDir/gen/install/misc/firebird.init.d.* ${TargetDir}@FB_MISCDIR@
cp $BuildRootDir/gen/install/misc/rc.config.firebird ${TargetDir}@FB_MISCDIR@
@@ -125,11 +125,11 @@
chmod -R go-rwx ${TargetDir}@FB_MISCDIR@
#conf
-@@ -309,7 +288,6 @@
+@@ -314,7 +293,6 @@
cp $BuildRootDir/gen/install/misc/aliases.conf ${TargetDir}@FB_CONFDIR@
cp $BuildRootDir/gen/install/misc/fbtrace.conf ${TargetDir}@FB_CONFDIR@
- chown root:root ${TargetDir}@FB_CONFDIR@/*.conf
chmod 0644 ${TargetDir}@FB_CONFDIR@/*.conf
- # Create links from @libdir@ to install area.
+ #license
diff --git a/firebird-2.5.1-svn-CORE-3610.patch b/firebird-2.5.1-svn-CORE-3610.patch
deleted file mode 100644
index 075ad94..0000000
--- a/firebird-2.5.1-svn-CORE-3610.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/jrd/vio.cpp 2011/09/29 03:27:33 53487
-+++ jrd/vio.cpp 2011/09/29 07:45:12 53488
-@@ -1821,7 +1821,6 @@
-
-
- bool VIO_get_current(thread_db* tdbb,
-- //record_param* old_rpb,
- record_param* rpb,
- jrd_tra* transaction,
- MemoryPool* pool,
-@@ -2025,12 +2024,14 @@
- if (rpb->rpb_flags & rpb_deleted)
- return !foreign_key;
-
-- if (rpb->rpb_flags & rpb_uk_modified)
-- return !foreign_key;
--
-- // clear lock error from status vector
-- fb_utils::init_status(tdbb->tdbb_status_vector);
-- return true;
-+ if (foreign_key)
-+ {
-+ // clear lock error from status vector
-+ fb_utils::init_status(tdbb->tdbb_status_vector);
-+ return !(rpb->rpb_flags & rpb_uk_modified);
-+ }
-+
-+ return !foreign_key;
-
- case tra_dead:
- if (transaction->tra_attachment->att_flags & ATT_no_cleanup) {
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/Firebird.git/commitdiff/19f3deaeccb1baa31d30ccc6f9f496c3571d9d56
More information about the pld-cvs-commit
mailing list