Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (fc1b0333702bfa6c92f3255a74a52421d756762b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (fc1b0333702bfa6c92f3255a74a52421d756762b)
  • Date: Mon, 1 Jan 2007 14:00:05 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

database/firebird/DEPENDS | 8 ++++----
database/firebird/DETAILS | 4 ++--
database/firebird/HISTORY | 5 +++++
database/firebird/INSTALL | 1 +
database/firebird/PREPARE | 4 ++--
database/firebird/PRE_BUILD | 9 +--------
database/firebird/fb2.patch.bz2 |binary
utils/ntp/DETAILS | 4 ++--
utils/ntp/HISTORY | 3 +++
9 files changed, 20 insertions(+), 18 deletions(-)

New commits:
commit 2957edc6fbe8a3761ad3589a939dc5fc130da94d
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

firebird - missing PREPARE

commit cf2729e7a6d359b89886f9a23538c93ab3da9fbe
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

firebird - add amd64 support

commit 39107188d830c5076947906cdaaafc624b118c5f
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

ntp-4.2.4

diff --git a/database/firebird/DEPENDS b/database/firebird/DEPENDS
index 8d382d1..b7950fb 100755
--- a/database/firebird/DEPENDS
+++ b/database/firebird/DEPENDS
@@ -4,8 +4,8 @@ depends libtool &&
depends openssl &&
depends libmcrypt &&
depends ncurses &&
-if [ $FB_VERX != old ]; then
-#else
- depends icu
-fi &&
+case $FB_VER in
+ 1.5);;
+ *) depends icu
+esac &&
optional_depends libedit "--with-editline" "--without-editline" "for fancy
line editing"
diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index 4652c86..90dcc1f 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -1,5 +1,5 @@
SPELL=firebird
-case $FB_VERX in
+case $FB_VER in
# cvs)
# VERSION=snapshot
# SOURCE=${SPELL}-$VERSION.tar.bz2
@@ -8,7 +8,7 @@ case $FB_VERX in
# SOURCE_IGNORE=volatile
# FORCE_DOWNLOAD=on
#;;
- old)
+ 1.5)
VERSION=1.5.3.4870

SOURCE_HASH=sha512:368380d720f381247a706ec93b41e81b9dde71f22280c52059dcf286554c3bf587214fae9c9b40266770147217a76c816cec1da43fe6ed92332474a41448a2c9
SOURCE=${SPELL}-${VERSION}.tar.bz2
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index 9124e0a..7f22c95 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,8 @@
+2007-01-01 Treeve Jelbert <treeve AT pi.be>
+ * PRE_BUILD: simplify patching logic
+ * DETAILS, PREPARE, DEPENDS: change query variable for easier future
expansion
+ * fb2.patch.bz2: update for amd64
+
2006-11-19 Treeve Jelbert <treeve AT pi.be>
* protected, configs, REPAIR^none^*: added
* PREPARE: add a query
diff --git a/database/firebird/INSTALL b/database/firebird/INSTALL
index 7714ac1..e688c13 100755
--- a/database/firebird/INSTALL
+++ b/database/firebird/INSTALL
@@ -1,6 +1,7 @@
if [ $FB_CLIENT == n ]; then
local FF &&
cd $SOURCE_DIRECTORY/gen/buildroot/$FB_PREFIX &&
+# install config files first
install_config_file firebird.conf $FB_PREFIX/firebird.conf &&
install_config_file aliases.conf $FB_PREFIX/aliases.conf &&
rm aliases.conf firebird.conf &&
diff --git a/database/firebird/PREPARE b/database/firebird/PREPARE
index 2897a42..e3a7a85 100755
--- a/database/firebird/PREPARE
+++ b/database/firebird/PREPARE
@@ -7,13 +7,13 @@ cat <<EOF
After installing firebird, you should change the default password for the
SYSDBA user
by means of the script /usr/firebird/bin/changeDBAPassword.sh
EOF
-config_query_list FB_VERX "which version to build?" new old
+config_query_list FB_VER "which version to build?" 2.0 1.5

# warn of major changes
if spell_ok firebird;then
local FB_PREV
FB_PREV=`installed_version firebird | cut -d. -f-2`
- if [ $FB_PREV = 1.5 ] && [ $FB_VERX != old ];then
+ if [ $FB_PREV = 1.5 ] && [ $FB_VER != 1.5 ];then
cat <<EOF
Firebird 2 includes ODS changes, intended to improve database
performance.
These improvements are only available in databases using the new ODS.
diff --git a/database/firebird/PRE_BUILD b/database/firebird/PRE_BUILD
index 61137ff..68e2deb 100755
--- a/database/firebird/PRE_BUILD
+++ b/database/firebird/PRE_BUILD
@@ -9,14 +9,7 @@
rm -rf extern &&
# fix for gcc4 and smgl issues
local PATCH &&
- case "$FB_VERX" in
- old)
- PATCH=fb15.patch.bz2
- ;;
- *)
- PATCH=fb2.patch.bz2
- ;;
- esac &&
+ PATCH=fb${FB_VER//.*}.patch.bz2 &&
#apply patches
bzcat $SPELL_DIRECTORY/$PATCH | patch -p1 &&

diff --git a/database/firebird/fb2.patch.bz2 b/database/firebird/fb2.patch.bz2
index bdb9e7d..91d8c09 100644
Binary files a/database/firebird/fb2.patch.bz2 and
b/database/firebird/fb2.patch.bz2 differ
diff --git a/utils/ntp/DETAILS b/utils/ntp/DETAILS
index dbca396..069862c 100755
--- a/utils/ntp/DETAILS
+++ b/utils/ntp/DETAILS
@@ -1,6 +1,6 @@
SPELL=ntp
- VERSION=4.2.2p4
-
SOURCE_HASH=sha512:36958b2509c0b42193c86dcc71ddb15fc123d25869137b106c96943ed66541d7631ec7d02ac9cabb86d1dfbc2414fbfbc4f3ce824252918ed20c19db29e32db8
+ VERSION=4.2.4
+
SOURCE_HASH=sha512:3e280a8d14ed04e02d6a57b4073568726a2b0ebb2563056659b814debd48293cf96c05f842a057cd9ba4938032498a9b4210da0980ade2311fa3f86f04a1e213
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-4.2/$SOURCE
diff --git a/utils/ntp/HISTORY b/utils/ntp/HISTORY
index e75b168..d94f6b9 100644
--- a/utils/ntp/HISTORY
+++ b/utils/ntp/HISTORY
@@ -1,3 +1,6 @@
+2007-01-01 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: version 4.2.4
+
2006-10-29 Treeve Jelbert <treeve AT pi.be>
* DETAILS: version 4.2.2p4




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (fc1b0333702bfa6c92f3255a74a52421d756762b), Treeve Jelbert, 01/01/2007

Archive powered by MHonArc 2.6.24.

Top of Page