[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (056612f734045f9cfb39f3e1ce2d2c8f0a5130d3)

Treeve Jelbert scm at mail.sourcemage.org
Mon Nov 20 11:02:52 EST 2006


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

 archive/rpm/DETAILS                   |    4 ++--
 archive/rpm/HISTORY                   |    3 +++
 database/firebird/BUILD               |    9 ++++++++-
 database/firebird/CONFIGURE           |    4 ++++
 database/firebird/DETAILS             |    1 +
 database/firebird/FINAL               |   10 +++++-----
 database/firebird/HISTORY             |    9 +++++++++
 database/firebird/INSTALL             |   20 +++++++++++++++-----
 database/firebird/PREPARE             |   18 ++++++++++++------
 database/firebird/PRE_INSTALL         |   14 --------------
 database/firebird/REPAIR^none^configs |    2 ++
 database/firebird/configs             |    2 ++
 database/firebird/protected           |    1 +
 http/privoxy/DETAILS                  |   18 +++++++++++-------
 http/privoxy/HISTORY                  |    4 ++++
 http/privoxy/PRE_BUILD                |    4 ++--
 telephony/linphone/DEPENDS            |    6 +++---
 17 files changed, 84 insertions(+), 45 deletions(-)

New commits:
commit 70c2bad2f1fd928caa61c284ae9473b384978c4b
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    firebird - forgotten file

commit 07a689695e7b5a433786d496d95ec4a1399ba6f8
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    firebird - forgotten file

commit 2c26bfafa1d7c3d78b830b025d9f365660d579f5
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    firebird - misc improvements

commit aba7b347d4a2038075d38a1801f28c999d2e0fc8
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    privoxy-3.0.6

diff --git a/archive/rpm/DETAILS b/archive/rpm/DETAILS
index e66a9d9..dab35fb 100755
--- a/archive/rpm/DETAILS
+++ b/archive/rpm/DETAILS
@@ -1,6 +1,6 @@
            SPELL=rpm
-         VERSION=4.4.6
-     SOURCE_HASH=sha512:54b8fe773333ef071aeb6735d92e5b3d25f89349928eefd22f89efdf6c6782c0c7854fdf4c4db70fe0ed8e96e6edfb34d7b87f75105308c80161769e4586eb2b
+         VERSION=4.4.7
+     SOURCE_HASH=sha512:7148d7ccbc6ab57ae64c96346ae3abf7602e73a047343a17f414f56e0c92ed144b4da7f5fd07a86fdb19bceadafaebcdb21e6c8181565c0cc26d8986986ebd7f
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://jbj.org/pub/rpm-4.4.x/$SOURCE
diff --git a/archive/rpm/HISTORY b/archive/rpm/HISTORY
index 02e67ad..b9c4723 100644
--- a/archive/rpm/HISTORY
+++ b/archive/rpm/HISTORY
@@ -1,3 +1,6 @@
+2006-10-24 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 4.4.7
+
 2006-07-04 Treeve Jelbert <treeve01 at pi.be>
 	* DETAILS: remove GCC_VERSION
 	* DEPENDS, CONFIGURE: fix typos
diff --git a/database/firebird/BUILD b/database/firebird/BUILD
index fb7d6ea..b503dea 100755
--- a/database/firebird/BUILD
+++ b/database/firebird/BUILD
@@ -1,3 +1,4 @@
+  local LL                                      &&
   persistent_add FB_PREFIX                      &&
   FB_PREFIX=${INSTALL_ROOT}/usr/firebird        &&
   OPTS="${OPTS} ${FB_SS}"                       &&
@@ -8,13 +9,19 @@
   if spell_ok libedit; then
     LDFLAGS="$LDFLAGS -ledit"
   fi                                            &&
+# prepare optional language support
+  for LL in $FB_GPRE; do
+    if [ $LL != none ]; then
+      OPTS="${OPTS} --with-gpre-${LL}"
+    fi
+  done                                          &&
+  OPTS="${OPTS} ${FB_STAT}"                     &&
   LDFLAGS="$LDFLAGS -lpthread"                  &&
 
   ./configure 				\
 	--prefix=$FB_PREFIX 		\
 	$OPTS					&&
 if [ $FB_CLIENT == n ]; then
-
   make                                          &&
 # prepare an install image
   cd gen                                        &&
diff --git a/database/firebird/CONFIGURE b/database/firebird/CONFIGURE
index ce34f28..e53b3a7 100755
--- a/database/firebird/CONFIGURE
+++ b/database/firebird/CONFIGURE
@@ -1,4 +1,8 @@
+source $GRIMOIRE/FUNCTIONS  &&
 config_query FB_CLIENT "Build only client library?" n
 if [ $FB_CLIENT == n ]; then
+  config_query_multi  FB_GPRE "which additional GPRE languages to support?" \
+      none ada cobol pascal fortran  &&
+  config_query_option FB_STAT "build static libraries?" n "--enable-static"  "--disable-static" &&
   config_query_option FB_SS "Build Superserver?" y "--enable-superserver" ""
 fi
diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index ef427c6..4652c86 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -25,6 +25,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPEL
         WEB_SITE=http://www.firebirdsql.org
          LICENSE=IDPL
          ENTERED=20031111
+      PATCHLEVEL=1
 # 	    DOCS="doc/*"
         KEYWORDS="database engine"
            SHORT="a very powerful relational dbms"
diff --git a/database/firebird/FINAL b/database/firebird/FINAL
index b22c218..f1dfed2 100755
--- a/database/firebird/FINAL
+++ b/database/firebird/FINAL
@@ -22,11 +22,11 @@ cd $FB_PREFIX
   chown firebird:firebird security*.fdb         &&
   chmod 0600 security*.fdb                      &&
 # all database should be owned by firebird
-#  for DB in `ls examples/*.fdb`
-#    do 
-#      chmod ug+w $DB                            &&
-#      chown firebird:firebird $DB
-#    done                                        &&
+  for DB in `ls examples/empbuild/*.fdb`
+    do 
+      chmod ug+w $DB                            &&
+      chown firebird:firebird $DB
+    done                                        &&
 
 # create lock files
   LCK=$INSTALL_ROOT/var/lock/firebird            &&
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index 604db0f..9124e0a 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,12 @@
+2006-11-19 Treeve Jelbert <treeve at pi.be>
+	* protected, configs, REPAIR^none^*: added
+	* PREPARE: add a query
+	* PRE_INSTALL: delete
+	* INSTALL: include some stuff from old PRE_INSTALL
+	  use install_config_file
+	* CONFIGURE, BUILD: add support for gpre languages
+	* DETAILS: PATCHLEVEL++
+
 2006-11-17 Treeve Jelbert <treeve at pi.be>
 	* DETAILS: use sourceforge for all downloads
 	* BUILD: add a note to myself
diff --git a/database/firebird/INSTALL b/database/firebird/INSTALL
index e7d5bcd..7714ac1 100755
--- a/database/firebird/INSTALL
+++ b/database/firebird/INSTALL
@@ -1,7 +1,17 @@
-#if [ $FB_CLIENT == n ]; then
+if [ $FB_CLIENT == n ]; then
+local FF                                                     &&
+cd $SOURCE_DIRECTORY/gen/buildroot/$FB_PREFIX                &&
+install_config_file firebird.conf $FB_PREFIX/firebird.conf   &&
+install_config_file aliases.conf  $FB_PREFIX/aliases.conf    &&
+rm aliases.conf firebird.conf                                &&
+# preserve some existing files
+#  for FF in `ls security*.fdb firebird.conf aliases.conf`; do
+  for FF in `ls security*.fdb`; do
+    if [ -f $FB_PREFIX/$FF ];then
+      message preserving file $FF
+      rm $FF
+    fi
+   done
+fi                                                           &&
 # install prebuilt tree
 cp -ra $SOURCE_DIRECTORY/gen/buildroot/* /
-#else
-#  message only install client library, header files and message database
-
-#fi
diff --git a/database/firebird/PREPARE b/database/firebird/PREPARE
index 633a749..2897a42 100755
--- a/database/firebird/PREPARE
+++ b/database/firebird/PREPARE
@@ -15,15 +15,21 @@ if spell_ok firebird;then
   FB_PREV=`installed_version firebird | cut -d. -f-2`
   if [ $FB_PREV = 1.5 ] && [ $FB_VERX != old ];then
     cat <<EOF
-        Firebird 2 includes ODS changes. So, backup anything you want to keep, using gbak, 
-        before uninstalling a previous Firebird version
+       	Firebird 2 includes ODS changes, intended to improve database performance.
+        These improvements are only available in databases using the new ODS.
+        So, before uninstalling a previous Firebird version, make a backup using gbak.
+        Then, after installation, use the new gbak to recreate your database which will
+        then have the new ODS.
         
-        There are major changes regarding the security database in this new version
-        please make a copy of the existing security database /usr/firebird/security.fdb
-        before proceeding.
-        after installing firebird2, read the instructions in
+        There are major changes regarding the security database in this new version.
+        Please make a copy of the existing security database /usr/firebird/security.fdb
+        before casting this spell.
+        Then, after installing firebird2, read the instructions in
         /usr/firebird/upgrade/security_database.txt
 EOF
+    if ! query "do you really want to upgrade firebird?";then
+      return 1
+    fi
   fi
 fi
 
diff --git a/database/firebird/PRE_INSTALL b/database/firebird/PRE_INSTALL
deleted file mode 100755
index 899d373..0000000
--- a/database/firebird/PRE_INSTALL
+++ /dev/null
@@ -1,14 +0,0 @@
-default_pre_install                &&
-if [ $FB_CLIENT == n ]; then
-
-local FF                           &&
-
-cd $SOURCE_DIRECTORY/gen/buildroot/$FB_PREFIX   &&
-# preserve some existing files
-  for FF in `ls security*.fdb firebird.conf aliases.conf bin/*.sh`; do
-    if [ -f $FB_PREFIX/$FF ];then
-      message preserving file $FF
-      rm $FF
-    fi
-   done
-fi
diff --git a/database/firebird/REPAIR^none^configs b/database/firebird/REPAIR^none^configs
new file mode 100755
index 0000000..ad636c7
--- /dev/null
+++ b/database/firebird/REPAIR^none^configs
@@ -0,0 +1,2 @@
+^/usr/firebird/aliases.conf$
+^/usr/firebird/firebird.conf$
diff --git a/database/firebird/configs b/database/firebird/configs
new file mode 100644
index 0000000..ad636c7
--- /dev/null
+++ b/database/firebird/configs
@@ -0,0 +1,2 @@
+^/usr/firebird/aliases.conf$
+^/usr/firebird/firebird.conf$
diff --git a/database/firebird/protected b/database/firebird/protected
new file mode 100644
index 0000000..5f46212
--- /dev/null
+++ b/database/firebird/protected
@@ -0,0 +1 @@
+^/usr/firebird/security?\.fdb$
diff --git a/http/privoxy/DETAILS b/http/privoxy/DETAILS
index 18dfe25..751968f 100755
--- a/http/privoxy/DETAILS
+++ b/http/privoxy/DETAILS
@@ -1,13 +1,17 @@
            SPELL=privoxy
       SF_PROJECT=ijbswa
-         VERSION=3.0.5
-          SOURCE=$SPELL-$VERSION-beta-src.tar.gz
-     SOURCE_HASH=sha512:543ebaab4508472e10b7b73f6f16dc91fada480049f4b2a24c0f60da2d436b6715e2391ad53245a059fbeac7ff489859bbb8775351c8ac92ddd9da0e7a15e6bb
-         SOURCE2=default.action-2.0
-    SOURCE2_HASH=sha512:6bb755d08d0908d3982b6b16c614acf2b12874c72027073f9ce3d4cf8358990ff7acc96141d3917db5211be866722c85b892b69c8acd3287a4520e1b4bb4dd6d
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-BETA
+         VERSION=3.0.6
+          SOURCE=$SPELL-$VERSION-stable-src.tar.gz
+     SOURCE_HASH=sha512:45ac17063531abd80e9e5bae9f45fde75467cd75d56d5ad608acdc16568c38ca4b3381121406ded9ec1d3e485fb1596446232c8f3275722bbec9ea5efa884f9e
+#         SOURCE2=$SOURCE.asc
+#         SOURCE3=default.action-2.0
+#    SOURCE3_HASH=sha512:
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-stable
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SF_PROJECT/$SOURCE
-  SOURCE2_URL[0]=$SOURCEFORGE_URL/$SF_PROJECT/$SOURCE2
+#  SOURCE2_URL[0]=$SOURCEFORGE_URL/$SF_PROJECT/$SOURCE2
+#      SOURCE_GPG=privoxy.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
+#  SOURCE3_URL[0]=$SOURCEFORGE_URL/$SF_PROJECT/$SOURCE3
         WEB_SITE=http://www.privoxy.org/
      GATHER_DOCS=off
          ENTERED=20030403
diff --git a/http/privoxy/HISTORY b/http/privoxy/HISTORY
index 452cbaf..e4e5c19 100644
--- a/http/privoxy/HISTORY
+++ b/http/privoxy/HISTORY
@@ -1,3 +1,7 @@
+2006-11-20 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 3.0.6
+	* PRE_BUILD: don't update action file
+
 2006-10-23 Treeve Jelbert <treeve at pi.be>
 	* DETAILS: PATCHLEVEL=1
 	  download updated default.action file
diff --git a/http/privoxy/PRE_BUILD b/http/privoxy/PRE_BUILD
index fd34e75..c9aa5b9 100755
--- a/http/privoxy/PRE_BUILD
+++ b/http/privoxy/PRE_BUILD
@@ -1,8 +1,8 @@
 default_pre_build     &&
 cd $SOURCE_DIRECTORY  &&
 # add updated actions file
-verify_file 2         &&
-cp $SOURCE_CACHE/$SOURCE2 ./default.action &&
+#verify_file 3         &&
+#cp $SOURCE_CACHE/$SOURCE3 ./default.action &&
 # apply smgl patch
 patch -p1 <$SPELL_DIRECTORY/mk.patch &&
 autoheader &&
diff --git a/telephony/linphone/DEPENDS b/telephony/linphone/DEPENDS
index 815b856..ab98ad7 100755
--- a/telephony/linphone/DEPENDS
+++ b/telephony/linphone/DEPENDS
@@ -1,7 +1,7 @@
 depends  speex     &&
-depends  libosip2  &&
-depends  gtk-doc    &&
-depends  docbook-sgml-dtd &&
+depends  libosip2 "--with-osip=/usr" &&
+#depends  gtk-doc    &&
+#depends  docbook-sgml-dtd &&
 optional_depends ilbc-rfc3951 \
                  "--with-ilbc" \
                  "--without-ilbc" \



More information about the SM-Commit mailing list